diff --git a/src/sunstone/public/js/plugins/acls-tab.js b/src/sunstone/public/js/plugins/acls-tab.js
index b1ace8da58..451b0cbf32 100644
--- a/src/sunstone/public/js/plugins/acls-tab.js
+++ b/src/sunstone/public/js/plugins/acls-tab.js
@@ -263,7 +263,7 @@ var acls_tab = {
     tabClass: 'subTab',
     parentTab: 'system-tab',
     search_input: '<input id="acl_search" type="text" placeholder="'+tr("Search")+'" />',
-    list_header: '<i class="fa fa-key"></i> '+tr("Access Control Lists"),
+    list_header: '<i class="fa fa-key"></i>&emsp;'+tr("Access Control Lists"),
     subheader: '<span/><small></small>&emsp;',
     table: '<table id="datatable_acls" class="dataTable">\
       <thead>\
diff --git a/src/sunstone/public/js/plugins/clusters-tab.js b/src/sunstone/public/js/plugins/clusters-tab.js
index 65d2dad60d..5c96a53bb1 100644
--- a/src/sunstone/public/js/plugins/clusters-tab.js
+++ b/src/sunstone/public/js/plugins/clusters-tab.js
@@ -1082,8 +1082,8 @@ var clusters_tab = {
     tabClass: "subTab",
     parentTab: "infra-tab",
     search_input: '<input id="cluster_search" type="text" placeholder="'+tr("Search")+'" />',
-    list_header: '<i class="fa fa-th"></i> '+tr("Clusters"),
-    info_header: '<i class="fa fa-th"></i> '+tr("Cluster"),
+    list_header: '<i class="fa fa-fw fa-th"></i>&emsp;'+tr("Clusters"),
+    info_header: '<i class="fa fa-fw fa-th"></i>&emsp;'+tr("Cluster"),
     subheader: '<span/> <small></small>&emsp;',
     table: '<table id="datatable_clusters" class="datatable twelve">\
       <thead>\
diff --git a/src/sunstone/public/js/plugins/dashboard-tab.js b/src/sunstone/public/js/plugins/dashboard-tab.js
index 6a25d6c030..43a337e464 100644
--- a/src/sunstone/public/js/plugins/dashboard-tab.js
+++ b/src/sunstone/public/js/plugins/dashboard-tab.js
@@ -28,7 +28,7 @@ var dashboard_tab_content = '<div>\
 
 var widgets = {
   "storage" : '<fieldset>\
-        <legend class="span-dashboard"><i class="fa fa-upload"></i> '+tr("Storage")+'</legend>\
+        <legend class="span-dashboard"><i class="fa fa-fw fa-lg fa-upload"></i> '+tr("Storage")+'</legend>\
         <div class="row totals-info">\
             <div class="small-6 large-6 columns text-right">\
               <h4 class="subheader">\
@@ -45,7 +45,7 @@ var widgets = {
         </div>\
       </fieldset>',
   "users" : '<fieldset>\
-        <legend class="span-dashboard"><i class="fa fa-user"></i> '+tr("Users")+'</legend>\
+        <legend class="span-dashboard"><i class="fa fa-fw fa-lg fa-user"></i> '+tr("Users")+'</legend>\
         <div class="row totals-info">\
             <div class="small-6 large-6 columns text-right">\
               <h4 class="subheader">\
@@ -62,7 +62,7 @@ var widgets = {
         </div>\
       </fieldset>',
   "network" : '<fieldset>\
-        <legend class="span-dashboard"><i class="fa fa-sitemap"></i> '+tr("Network")+'</legend>\
+        <legend class="span-dashboard"><i class="fa fa-fw fa-lg fa-sitemap"></i> '+tr("Network")+'</legend>\
         <div class="row totals-info">\
             <div class="small-6 large-6 columns text-right">\
               <h4 class="subheader">\
@@ -79,7 +79,7 @@ var widgets = {
         </div>\
       </fieldset>',
   "hosts" : '<fieldset class="dashboard-panel">\
-        <legend class="span-dashboard"><i class="fa fa-hdd-o"></i> '+tr("Hosts")+'</legend>\
+        <legend class="span-dashboard"><i class="fa fa-fw fa-lg fa-hdd-o"></i> '+tr("Hosts")+'</legend>\
         <div class="row  totals-info">\
           <div class="small-3 large-3 columns centered">\
             <div class="small-6 large-6 columns text-right">\
@@ -154,7 +154,7 @@ var widgets = {
         </div>\
       </fieldset>',
   "vms" : '<fieldset class="dashboard-panel">\
-        <legend class="span-dashboard"><i class="fa fa-cloud"></i> '+tr("Virtual Machines")+'</legend>\
+        <legend class="span-dashboard"><i class="fa fa-fw fa-lg fa-cloud"></i> '+tr("Virtual Machines")+'</legend>\
         <div class="row totals-info">\
           <div class="small-3 large-3 columns">\
             <div class="small-6 large-6 columns text-right">\
@@ -200,7 +200,7 @@ var widgets = {
         </div>\
       </fieldset>',
   "user_quotas" : '<fieldset>\
-      <legend class="span-dashboard"><i class="fa fa-align-left"></i> '+tr("User Quotas")+'</legend>\
+      <legend class="span-dashboard"><i class="fa fa-fw fa-lg fa-align-left"></i> '+tr("User Quotas")+'</legend>\
       <div class="row" id="quotas_tab_user">\
         <div class="large-12 columns">'+
           '<div class="row">'+
@@ -221,7 +221,7 @@ var widgets = {
       </div>\
     </fieldset>',
   "group_quotas" : '<fieldset>\
-      <legend class="span-dashboard"><i class="fa fa-align-left"></i> '+tr("Group Quotas")+'</legend>\
+      <legend class="span-dashboard"><i class="fa fa-fw fa-lg fa-align-left"></i> '+tr("Group Quotas")+'</legend>\
         <div id="quotas_tab_group_TabBody" class="row">\
           <div class="large-12 columns">'+
             '<div class="row">'+
@@ -300,7 +300,7 @@ var dashboard_tab = {
     buttons: quotas_tab_buttons,
     content: dashboard_tab_content,
     showOnTopMenu: false,
-    list_header: '<i class="fa fa-tachometer"></i> '+tr("Dashboard")
+    list_header: '<i class="fa fa-fw fa-tachometer"></i>&emsp;'+tr("Dashboard")
 }
 
 Sunstone.addActions(dashboard_tab_actions);
diff --git a/src/sunstone/public/js/plugins/datastores-tab.js b/src/sunstone/public/js/plugins/datastores-tab.js
index 594d38e762..59dd58ca75 100644
--- a/src/sunstone/public/js/plugins/datastores-tab.js
+++ b/src/sunstone/public/js/plugins/datastores-tab.js
@@ -512,8 +512,8 @@ var datastores_tab = {
     tabClass: "subTab",
     parentTab: "infra-tab",
     search_input: '<input id="datastore_search" type="text" placeholder="'+tr("Search")+'" />',
-    list_header: '<i class="fa fa-folder-open"></i> '+tr("Datastores"),
-    info_header: '<i class="fa fa-folder-open"></i> '+tr("Datastore"),
+    list_header: '<i class="fa fa-fw fa-folder-open"></i>&emsp;'+tr("Datastores"),
+    info_header: '<i class="fa fa-fw fa-folder-open"></i>&emsp;'+tr("Datastore"),
     subheader: '<span/> <small></small>&emsp;',
     table: '<table id="datatable_datastores" class="datatable twelve">\
       <thead>\
diff --git a/src/sunstone/public/js/plugins/files-tab.js b/src/sunstone/public/js/plugins/files-tab.js
index fff1bc183d..6787ecc41f 100644
--- a/src/sunstone/public/js/plugins/files-tab.js
+++ b/src/sunstone/public/js/plugins/files-tab.js
@@ -358,8 +358,8 @@ var files_tab = {
       <div id="files_upload_progress_bars"></div>\
     </div>',
     search_input: '<input id="file_search" type="text" placeholder="'+tr("Search")+'" />',
-    list_header: '<i class="fa fa-folder-open"></i> '+tr("Files & Kernels"),
-    info_header: '<i class="fa fa-folder-open"></i> '+tr("File"),
+    list_header: '<i class="fa fa-fw fa-folder-open"></i>&emsp;'+tr("Files & Kernels"),
+    info_header: '<i class="fa fa-fw fa-folder-open"></i>&emsp;'+tr("File"),
     subheader: '<span class="total_files"/> <small>'+tr("TOTAL")+'</small>&emsp;\
         <span class="size_files"/> <small>'+tr("SIZE")+'</small>',
     table: '<table id="datatable_files" class="datatable twelve">\
diff --git a/src/sunstone/public/js/plugins/groups-tab.js b/src/sunstone/public/js/plugins/groups-tab.js
index 1813e34c33..f0c12e0f14 100644
--- a/src/sunstone/public/js/plugins/groups-tab.js
+++ b/src/sunstone/public/js/plugins/groups-tab.js
@@ -411,8 +411,8 @@ var groups_tab = {
     tabClass: 'subTab',
     parentTab: 'system-tab',
     search_input: '<input id="group_search" type="text" placeholder="'+tr("Search")+'" />',
-    list_header: '<i class="fa fa-users"></i> '+tr("Groups"),
-    info_header: '<i class="fa fa-users"></i> '+tr("Group"),
+    list_header: '<i class="fa fa-fw fa-users"></i>&emsp;'+tr("Groups"),
+    info_header: '<i class="fa fa-fw fa-users"></i>&emsp;'+tr("Group"),
     subheader: '<span>\
         <span class="total_groups"/> <small>'+tr("TOTAL")+'</small>\
       </span>',
diff --git a/src/sunstone/public/js/plugins/hosts-tab.js b/src/sunstone/public/js/plugins/hosts-tab.js
index f0d41b63a8..d3c16c5750 100644
--- a/src/sunstone/public/js/plugins/hosts-tab.js
+++ b/src/sunstone/public/js/plugins/hosts-tab.js
@@ -342,8 +342,8 @@ var hosts_tab = {
     tabClass: "subTab",
     parentTab: "infra-tab",
     search_input: '<input id="hosts_search" type="text" placeholder="'+tr("Search")+'" />',
-    list_header: '<i class="fa fa-hdd-o "></i> '+tr("Hosts"),
-    info_header: '<i class="fa fa-hdd-o "></i> '+tr("Host"),
+    list_header: '<i class="fa fa-fw fa-hdd-o "></i>&emsp;'+tr("Hosts"),
+    info_header: '<i class="fa fa-fw fa-hdd-o "></i>&emsp;'+tr("Host"),
     subheader: '<span class="total_hosts"/> <small>'+tr("TOTAL")+'</small>&emsp;\
         <span class="on_hosts"/> <small>'+tr("ON")+'</small>&emsp;\
         <span class="off_hosts"/> <small>'+tr("OFF")+'</small>&emsp;\
diff --git a/src/sunstone/public/js/plugins/images-tab.js b/src/sunstone/public/js/plugins/images-tab.js
index 7241c1fcb4..b580f61e76 100644
--- a/src/sunstone/public/js/plugins/images-tab.js
+++ b/src/sunstone/public/js/plugins/images-tab.js
@@ -517,8 +517,8 @@ var images_tab = {
       <div id="upload_progress_bars"></div>\
     </div>',
     search_input: '<input id="image_search" type="text" placeholder="'+tr("Search")+'" />',
-    list_header: '<i class="fa fa-upload"></i> '+tr("Images"),
-    info_header: '<i class="fa fa-upload"></i> '+tr("Image"),
+    list_header: '<i class="fa fa-fw fa-upload"></i>&emsp;'+tr("Images"),
+    info_header: '<i class="fa fa-fw fa-upload"></i>&emsp;'+tr("Image"),
     subheader: '<span class="total_images"/> <small>'+tr("TOTAL")+'</small>&emsp;\
         <span class="size_images"/> <small>'+tr("USED")+'</small>',
     table: '<table id="datatable_images" class="datatable twelve">\
diff --git a/src/sunstone/public/js/plugins/marketplace-tab.js b/src/sunstone/public/js/plugins/marketplace-tab.js
index fcb34496b7..f44125a49e 100644
--- a/src/sunstone/public/js/plugins/marketplace-tab.js
+++ b/src/sunstone/public/js/plugins/marketplace-tab.js
@@ -227,8 +227,8 @@ var marketplace_tab = {
     title: '<i class="fa fa-lg fa-fw fa-shopping-cart"></i>&emsp;' + tr("Marketplace"),
     buttons: market_buttons,
     search_input: '<input id="marketplace_search" type="text" placeholder="'+tr("Search")+'" />',
-    list_header: '<i class="fa fa-shopping-cart"></i> '+tr("OpenNebula Marketplace"),
-    info_header: '<i class="fa fa-shopping-cart"></i> '+tr("Appliance"),
+    list_header: '<i class="fa fa-fw fa-shopping-cart"></i>&emsp;'+tr("OpenNebula Marketplace"),
+    info_header: '<i class="fa fa-fw fa-shopping-cart"></i>&emsp;'+tr("Appliance"),
     subheader: '<span/> <small></small>&emsp;',
     table: '<table id="datatable_marketplace" class="datatable twelve">\
       <thead>\
diff --git a/src/sunstone/public/js/plugins/oneflow-services.js b/src/sunstone/public/js/plugins/oneflow-services.js
index e8fe672717..2c43d98166 100644
--- a/src/sunstone/public/js/plugins/oneflow-services.js
+++ b/src/sunstone/public/js/plugins/oneflow-services.js
@@ -1051,8 +1051,8 @@ var services_tab = {
     tabClass: 'subTab',
     parentTab: 'oneflow-dashboard',
     search_input: '<input id="services_search" type="text" placeholder="'+tr("Search")+'" />',
-    list_header: '<i class="fa fa-code-fork fa fa-rotate-90"></i> '+tr("OneFlow - Services"),
-    info_header: '<i class="fa fa-code-fork fa fa-rotate-90"></i> '+tr("OneFlow - Service"),
+    list_header: '<i class="fa fa-fw fa-code-fork fa fa-rotate-90"></i>&emsp;'+tr("OneFlow - Services"),
+    info_header: '<i class="fa fa-fw fa-code-fork fa fa-rotate-90"></i>&emsp;'+tr("OneFlow - Service"),
     subheader: '<span/> <small></small>&emsp;',
     content:   '<div class="row" id="error_message" hidden>\
         <div class="small-6 columns small-centered text-center">\
diff --git a/src/sunstone/public/js/plugins/oneflow-templates.js b/src/sunstone/public/js/plugins/oneflow-templates.js
index 471e628d04..80e459277d 100644
--- a/src/sunstone/public/js/plugins/oneflow-templates.js
+++ b/src/sunstone/public/js/plugins/oneflow-templates.js
@@ -525,8 +525,8 @@ var service_templates_tab = {
     tabClass: 'subTab',
     parentTab: 'oneflow-dashboard',
     search_input: '<input id="service_templates_search" type="text" placeholder="'+tr("Search")+'" />',
-    list_header: '<i class="fa fa-file-o"></i> '+tr("OneFlow - Templates"),
-    info_header: '<i class="fa fa-file-o"></i> '+tr("OneFlow - Template"),
+    list_header: '<i class="fa fa-fw fa-file-o"></i>&emsp;'+tr("OneFlow - Templates"),
+    info_header: '<i class="fa fa-fw fa-file-o"></i>&emsp;'+tr("OneFlow - Template"),
     subheader: '<span/> <small></small>&emsp;',
     content:   '<div class="row" id="error_message" hidden>\
         <div class="small-6 columns small-centered text-center">\
diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js
index 4563b088b9..fb7f8fa2aa 100644
--- a/src/sunstone/public/js/plugins/templates-tab.js
+++ b/src/sunstone/public/js/plugins/templates-tab.js
@@ -526,8 +526,8 @@ var templates_tab = {
     tabClass: 'subTab',
     parentTab: 'vresources-tab',
     search_input: '<input id="template_search" type="text" placeholder="'+tr("Search")+'" />',
-    list_header: '<i class="fa fa-file-o"></i> '+tr("Templates"),
-    info_header: '<i class="fa fa-file-o"></i> '+tr("Template"),
+    list_header: '<i class="fa fa-fw fa-file-o"></i>&emsp;'+tr("Templates"),
+    info_header: '<i class="fa fa-fw fa-file-o"></i>&emsp;'+tr("Template"),
     subheader: '<span/> <small></small>&emsp;</span>',
     table: '<table id="datatable_templates" class="datatable twelve">\
         <thead>\
diff --git a/src/sunstone/public/js/plugins/users-tab.js b/src/sunstone/public/js/plugins/users-tab.js
index 66d0d3d015..98c98aeebe 100644
--- a/src/sunstone/public/js/plugins/users-tab.js
+++ b/src/sunstone/public/js/plugins/users-tab.js
@@ -514,8 +514,8 @@ var users_tab = {
     tabClass: 'subTab',
     parentTab: 'system-tab',
     search_input: ' <input id="user_search" type="text" placeholder="'+tr("Search")+'" />',
-    list_header: '<i class="fa fa-user"></i> '+tr("Users"),
-    info_header: '<i class="fa fa-user"></i> '+tr("User"),
+    list_header: '<i class="fa fa-fw fa-user"></i>&emsp;'+tr("Users"),
+    info_header: '<i class="fa fa-fw fa-user"></i>&emsp;'+tr("User"),
     subheader: '<span>\
         <span class="total_users"/> <small>'+tr("TOTAL")+'</small>\
       </span>',
diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js
index 54b48d0651..bce3483639 100644
--- a/src/sunstone/public/js/plugins/vms-tab.js
+++ b/src/sunstone/public/js/plugins/vms-tab.js
@@ -1132,8 +1132,8 @@ var vms_tab = {
     tabClass: 'subTab',
     parentTab: 'vresources-tab',
     search_input: '<input id="vms_search" type="text" placeholder="'+tr("Search")+'" />',
-    list_header: '<i class="fa fa-cloud"></i> '+tr("Virtual Machines"),
-    info_header: '<i class="fa fa-cloud"></i> '+tr("Virtual Machine"),
+    list_header: '<i class="fa fa-fw fa-cloud"></i>&emsp;'+tr("Virtual Machines"),
+    info_header: '<i class="fa fa-fw fa-cloud"></i>&emsp;'+tr("Virtual Machine"),
     subheader: '<span class="total_vms"/> <small>'+tr("TOTAL")+'</small>&emsp;\
         <span class="active_vms"/> <small>'+tr("ACTIVE")+'</small>&emsp;\
         <span class="off_vms"/> <small>'+tr("OFF")+'</small>&emsp;\
diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js
index 1b81e2f404..93b43b48b2 100644
--- a/src/sunstone/public/js/plugins/vnets-tab.js
+++ b/src/sunstone/public/js/plugins/vnets-tab.js
@@ -583,8 +583,8 @@ var vnets_tab = {
     tabClass: "subTab",
     parentTab: "infra-tab",
     search_input: '<input id="vnet_search" type="text" placeholder="'+tr("Search")+'" />',
-    list_header: '<i class="fa fa-globe"></i> '+tr("Virtual Networks"),
-    info_header: '<i class="fa fa-globe"></i> '+tr("Virtual Network"),
+    list_header: '<i class="fa fa-fw fa-globe"></i>&emsp;'+tr("Virtual Networks"),
+    info_header: '<i class="fa fa-fw fa-globe"></i>&emsp;'+tr("Virtual Network"),
     subheader: '<span class="total_vnets"/> <small>'+tr("TOTAL")+'</small>&emsp;\
         <span class="addresses_vnets"/> <small>'+tr("USED IPs")+'</small>',
     table: '<table id="datatable_vnetworks" class="datatable twelve">\
diff --git a/src/sunstone/public/js/plugins/zones-tab.js b/src/sunstone/public/js/plugins/zones-tab.js
index f521d4ac65..715e5a6c1b 100644
--- a/src/sunstone/public/js/plugins/zones-tab.js
+++ b/src/sunstone/public/js/plugins/zones-tab.js
@@ -221,8 +221,8 @@ var zones_tab = {
     tabClass: "subTab",
     parentTab: "infra-tab",
     search_input: '<input id="zone_search" type="text" placeholder="'+tr("Search")+'" />',
-    list_header: '<i class="fa fa-files-o"></i> '+tr("Zones"),
-    info_header: '<i class="fa fa-files-o"></i> '+tr("Zone"),
+    list_header: '<i class="fa fa-fw fa-files-o"></i>&emsp;'+tr("Zones"),
+    info_header: '<i class="fa fa-fw fa-files-o"></i>&emsp;'+tr("Zone"),
     subheader: '<span/> <small></small>&emsp;',
     table: '<table id="datatable_zones" class="datatable twelve">\
       <thead>\