diff --git a/html/themes/default/plugin.css b/html/themes/default/plugin.css
index e1b11844cb67145c13ee36188a5db1fbfe2306b3..8d8e03fbb596708dddeb4a4f92700ff31ca9f783 100644
--- a/html/themes/default/plugin.css
+++ b/html/themes/default/plugin.css
@@ -144,10 +144,10 @@ padding-bottom:5px;
 text-align:center;
 display:block;
 }
-html.ltr fieldset.plugin_section legend span, .plugin_section > span.legend {
+html.ltr fieldset.plugin_section legend span, html.ltr .plugin_section > span.legend {
 margin-left:-1px;
 }
-html.rtl fieldset.plugin_section legend span, .plugin_section > span.legend {
+html.rtl fieldset.plugin_section legend span, html.rtl .plugin_section > span.legend {
 margin-right:-1px;
 }
 
@@ -170,10 +170,10 @@ margin-top:-26px;
 fieldset.plugin_section legend img, .plugin_section span.legend img {
 vertical-align:middle;
 }
-html.ltr fieldset.plugin_section legend img, .plugin_section span.legend img {
+html.ltr fieldset.plugin_section legend img, html.ltr .plugin_section span.legend img {
 margin-right:3px;
 }
-html.rtl fieldset.plugin_section legend img, .plugin_section span.legend img {
+html.rtl fieldset.plugin_section legend img, html.rtl .plugin_section span.legend img {
 margin-left:3px;
 }
 
@@ -252,10 +252,10 @@ background-color:#DFEFFF;
   position:relative;
   top:1px;
   }
-  html.ltr .plugbottom input[type=submit]:active, .plugbottom input[type=button]:active {
+  html.ltr .plugbottom input[type=submit]:active, html.ltr .plugbottom input[type=button]:active {
   left:1px;
   }
-  html.rtl .plugbottom input[type=submit]:active, .plugbottom input[type=button]:active {
+  html.rtl .plugbottom input[type=submit]:active, html.rtl .plugbottom input[type=button]:active {
   right:1px;
   }
 }
diff --git a/html/themes/default/setup.css b/html/themes/default/setup.css
index c22207971649d8255722e80d9c08bf42eb612762..fbdbed8e3e8001df7475cc153b3554faed8ea60f 100644
--- a/html/themes/default/setup.css
+++ b/html/themes/default/setup.css
@@ -254,20 +254,24 @@ padding-right:25px;
   Setup step 4 styles
 */
 li.step4_name,div.step4_name {
-float:left;
 width:33%;
 height:2em;
 }
-html.rtl li.step4_name,div.step4_name {
+html.ltr li.step4_name, html.ltr div.step4_name {
+float:left;
+}
+html.rtl li.step4_name, html.rtl div.step4_name {
 float:right;
 }
 
 li.step4_value,div.step4_value {
-float:left;
 width:50%;
 height:2em;
 }
-html.rtl li.step4_value,div.step4_value {
+html.ltr li.step4_value, html.ltr div.step4_value {
+float:left;
+}
+html.rtl li.step4_value, html.rtl div.step4_value {
 float:right;
 }
 
diff --git a/setup/setup_frame.tpl b/setup/setup_frame.tpl
index 10112c1c4c556f98df477f9cd9b7bf970cc56b7b..5c555f37ec1e434d9dd53b6a4acab570d331577f 100644
--- a/setup/setup_frame.tpl
+++ b/setup/setup_frame.tpl
@@ -2,7 +2,6 @@
 {$php_errors}
 <form action='setup.php' name='mainform' method='post' enctype='multipart/form-data'>
   {$msg_dialogs}
-<input id='focus' name='focus' type='image' src='images/empty.png' style='width:0px; height:0px;' >
 <div class='setup_dialog'>
   {include file={filePath file="setup_header.tpl"}}
   <div class='setup_menu'>
@@ -36,9 +35,5 @@
 
 <input type='hidden' name='setup_goto_step' value=''>
 </form>
-
-<script type='javascript'>
-  document.getElementById('focus').focus();
-</script>
 </body>
 </html>