diff --git a/interface/web/themes/default-v2/css/styles.css b/interface/web/themes/default-v2/css/styles.css
index 6c1c19a70ae5733ac60de689508bf171a84db751..b01116509c83a0f0f31e808cb84ca891908b3cbe 100644
--- a/interface/web/themes/default-v2/css/styles.css
+++ b/interface/web/themes/default-v2/css/styles.css
@@ -159,13 +159,14 @@ header span {
     padding-top:37px;
     text-align:center;
     text-decoration:none;
-    width:78px;
+    min-width:78px;
 }
 
 #topNav a:hover {
     background-color: #eeeeee;
     color: #000000;
 }
+
 #topNav #topNav_current a {
     font-weight: bold;
     color: black;
@@ -185,7 +186,9 @@ header span {
 .topnav-dashboard { background-position: 22px -1035px !important; }
 .topnav-client { background-position: 22px -1098px !important; }
 .topnav-billing { background-position: 22px -1162px !important; }
-
+#topNav a span {
+            padding: 0 3px;
+        }
 /* main
 -------------------------------------------------------------- */
 #main { 
diff --git a/interface/web/themes/default-v2/templates/topnav.tpl.htm b/interface/web/themes/default-v2/templates/topnav.tpl.htm
index b86b9ab4b9f1b8019268376352d3b9952ef58466..4c681960c054eca047593fd472f899eb1b46273e 100644
--- a/interface/web/themes/default-v2/templates/topnav.tpl.htm
+++ b/interface/web/themes/default-v2/templates/topnav.tpl.htm
@@ -1,9 +1,9 @@
 <ul id="topmenu">
     <tmpl_loop name="nav_top">
         <tmpl_if name="active">
-            <li id="topNav_current"><a href="#" class="topnav topnav-<tmpl_var name='module'>"><tmpl_var name="title"></a></li>
+            <li id="topNav_current"><a href="#" class="topnav topnav-<tmpl_var name='module'>"><span><tmpl_var name="title"></span></a></li>
         <tmpl_else>
-            <li><a href="#" onClick="capp('<tmpl_var name='module'>')" class="topnav topnav-<tmpl_var name='module'>"><tmpl_var name="title"></a></li>
+            <li><a href="#" onClick="capp('<tmpl_var name='module'>')" class="topnav topnav-<tmpl_var name='module'>"><span><tmpl_var name="title"></span></a></li>
         </tmpl_if>
     </tmpl_loop>
 </ul>
diff --git a/interface/web/themes/default/css/navigation/nav_top.css b/interface/web/themes/default/css/navigation/nav_top.css
index 3f4eb8b84609e73b41a79e693d989f3659d0376d..573ebc6dbfb3a8e27311c1c43dbccb1dfed137e6 100644
--- a/interface/web/themes/default/css/navigation/nav_top.css
+++ b/interface/web/themes/default/css/navigation/nav_top.css
@@ -38,14 +38,16 @@
 		padding-top:37px;
 		text-align:center;
 		text-decoration:none;
-		width:78px;
+		min-width:78px;
 	}
 	
 	#topNav a:hover {
 		background-color: #eeeeee;
 		color: #000000;
 	}
-	
+        #topNav a span {
+            padding: 0 3px;
+        }
 	#topNav #topNav_current {
 	}
 	
diff --git a/interface/web/themes/default/templates/topnav.tpl.htm b/interface/web/themes/default/templates/topnav.tpl.htm
index b86b9ab4b9f1b8019268376352d3b9952ef58466..4c681960c054eca047593fd472f899eb1b46273e 100644
--- a/interface/web/themes/default/templates/topnav.tpl.htm
+++ b/interface/web/themes/default/templates/topnav.tpl.htm
@@ -1,9 +1,9 @@
 <ul id="topmenu">
     <tmpl_loop name="nav_top">
         <tmpl_if name="active">
-            <li id="topNav_current"><a href="#" class="topnav topnav-<tmpl_var name='module'>"><tmpl_var name="title"></a></li>
+            <li id="topNav_current"><a href="#" class="topnav topnav-<tmpl_var name='module'>"><span><tmpl_var name="title"></span></a></li>
         <tmpl_else>
-            <li><a href="#" onClick="capp('<tmpl_var name='module'>')" class="topnav topnav-<tmpl_var name='module'>"><tmpl_var name="title"></a></li>
+            <li><a href="#" onClick="capp('<tmpl_var name='module'>')" class="topnav topnav-<tmpl_var name='module'>"><span><tmpl_var name="title"></span></a></li>
         </tmpl_if>
     </tmpl_loop>
 </ul>