diff --git a/html/themes/default/setup.css b/html/themes/default/setup.css
index 2ab5109ede1bcb000ed8fa69dd6fdd58fe74af32..b36182590421af0af57565cfbea3bff2b3327929 100644
--- a/html/themes/default/setup.css
+++ b/html/themes/default/setup.css
@@ -66,15 +66,13 @@ vertical-align:middle;
 }
 
 /* Navigation col */
-div.setup_navigation {
+#menucell.setup_navigation {
 width:19%;
-background-color:#FFF;
-padding-left:2px;
-padding-right:2px;
-border:1px solid #AAA;
+}
+html.ltr #menucell.setup_navigation {
 float:left;
 }
-html.rtl div.setup_navigation {
+html.rtl #menucell.setup_navigation {
 float:right;
 }
 
@@ -104,18 +102,18 @@ margin:0;
 }
 
 /* An enabled setup step will use this style in navigation*/
-li.menuitem.menucurrent a.navigation_title {
+#menucell.setup_navigation li.menuitem.menucurrent a.navigation_title {
 cursor:default;
 }
 
 /* Disabled setup steps */
-li.menuitem.disabled a.navigation_title {
+#menucell.setup_navigation li.menuitem.disabled a.navigation_title {
 cursor:default;
 color:#AAA;
 }
 
 /* Disabled setup steps */
-li.menuitem a.navigation_title {
+#menucell.setup_navigation li.menuitem a.navigation_title {
 font-size:1.2em;
 font-weight:bold;
 text-decoration:none;
@@ -124,13 +122,18 @@ padding:3px;
 }
 
 /* The style for the info of an active setup */
-li.menuitem a.navigation_info {
+#menucell.setup_navigation li.menuitem a.navigation_info {
 font-size:1em;
 color:#000;
-padding:4px 4px 3px 23px;
 margin:0;
 cursor:default;
 }
+html.ltr #menucell.setup_navigation li.menuitem a.navigation_info {
+padding:4px 4px 3px 15px;
+}
+html.rtl #menucell.setup_navigation li.menuitem a.navigation_info {
+padding:4px 15px 3px 4px;
+}
 
 /*
   Setup step 2 styles
diff --git a/setup/setup_frame.tpl b/setup/setup_frame.tpl
index d6ca759bda2f26bdb9acb0486ae0bd07ea9dfdb7..71dfd1937c881714aafc4b04aea1df0231343109 100644
--- a/setup/setup_frame.tpl
+++ b/setup/setup_frame.tpl
@@ -10,7 +10,7 @@
 
   <div style="padding:10px;background-color:white;">
 
-    <div class='setup_navigation'>
+    <div class='setup_navigation' id='menucell'>
       {$navigation}
     </div>