diff --git a/themes/pmahomme/css/codemirror.css.php b/themes/pmahomme/css/codemirror.css.php
index a82d0713fb..d9e056d94b 100644
--- a/themes/pmahomme/css/codemirror.css.php
+++ b/themes/pmahomme/css/codemirror.css.php
@@ -76,7 +76,7 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
   z-index: 10;
   position: absolute;
   visibility: hidden;
-  border-left: 1px solid black !important;
+  border-<?php echo $left; ?>: 1px solid black !important;
 }
 
 .CodeMirror-focused .CodeMirror-cursor {
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index 1c56b678f6..48edcf7a94 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -64,7 +64,8 @@ h2 {
     font-size: 2em;
     font-weight: normal;
     text-shadow: 0 1px 0 #fff;
-    padding: 10px 0 10px 3px;
+    padding: 10px 0 10px;
+    padding-<?php echo $left; ?>: 3px;
     color: #777;
 }
 
@@ -79,7 +80,7 @@ h2 a img {
 
 .data,
 .data_full_width {
-    margin: 0 0 12px 0;
+    margin: 0 0 12px;
 }
 
 .data_full_width {
@@ -263,10 +264,10 @@ fieldset {
     border: #aaa solid 1px;
     padding: 1.5em;
     background: #eee;
-    text-shadow: 0 1px 0 #fff;
-    -moz-box-shadow: 1px 1px 2px #fff inset;
-    -webkit-box-shadow: 1px 1px 2px #fff inset;
-    box-shadow: 1px 1px 2px #fff inset;
+    text-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>1px 1px 2px #fff inset;
+    -moz-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>1px 1px 2px #fff inset;
+    -webkit-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>1px 1px 2px #fff inset;
+    box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>1px 1px 2px #fff inset;
 }
 
 fieldset fieldset {
@@ -286,9 +287,9 @@ fieldset legend {
     -webkit-border-radius: 2px;
     border: 1px solid #aaa;
     background-color: #fff;
-    -moz-box-shadow: 3px 3px 15px #bbb;
-    -webkit-box-shadow: 3px 3px 15px #bbb;
-    box-shadow: 3px 3px 15px #bbb;
+    -moz-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>3px 3px 15px #bbb;
+    -webkit-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>3px 3px 15px #bbb;
+    box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>3px 3px 15px #bbb;
 }
 
 .some-margin {
@@ -695,7 +696,7 @@ div.error h1 {
 div.success,
 div.notice,
 div.error {
-    margin: .5em 0 1.3em 0;
+    margin: .5em 0 1.3em;
     border: 1px solid;
     background-repeat: no-repeat;
         <?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
@@ -950,7 +951,8 @@ ul#topmenu2 li {
 
 ul#topmenu2 a {
     display: block;
-    margin: 7px 6px 7px 0;
+    margin: 7px 6px 7px;
+    margin-<?php echo $left; ?>: 0;
     padding: 4px 10px;
     white-space: nowrap;
     border: 1px solid #ddd;
@@ -980,9 +982,9 @@ fieldset.caution a:hover {
 }
 
 ul#topmenu ul {
-    -moz-box-shadow: 1px 1px 6px #ddd;
-    -webkit-box-shadow: 2px 2px 3px #666;
-    box-shadow: 2px 2px 3px #666;
+    -moz-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>1px 1px 6px #ddd;
+    -webkit-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>2px 2px 3px #666;
+    box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>2px 2px 3px #666;
 }
 
 ul#topmenu ul.only {
@@ -1135,7 +1137,7 @@ div#tablestatistics table {
 
 #goto_pagetop {
     position: fixed;
-    padding: .25em .25em .2em .25em;
+    padding: .25em .25em .2em;
     top: 0;
     <?php echo $right; ?>: 0;
     z-index: 900;
@@ -1149,7 +1151,8 @@ div#tablestatistics table {
 }
 
 #serverinfo img {
-    margin: 0 .1em 0 .2em;
+    margin: 0 .1em 0;
+    margin-<?php echo $left; ?>: .2em;
 }
 
 
@@ -1252,7 +1255,7 @@ h3#serverstatusqueries span {
 }
 
 img.sortableIcon {
-    float: right;
+    float: <?php echo $right; ?>;
     background-repeat: no-repeat;
     margin: 0;
 }
@@ -1345,9 +1348,9 @@ div#serverstatus div.tabLinks {
     border: 1px solid #CCC;
     margin: 0;
     padding: 3px;
-    -moz-box-shadow: 1px 1px 6px #ddd;
-    -webkit-box-shadow: 2px 2px 3px #666;
-    box-shadow: 2px 2px 3px #666;
+    -moz-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>2px 2px 3px #666;
+    -webkit-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>2px 2px 3px #666;
+    box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>2px 2px 3px #666;
     background-color: #fff;
     z-index: 2;
 }
@@ -1384,7 +1387,7 @@ div#queryAnalyzerDialog table.queryNums {
 }
 
 .smallIndent {
-    padding-left: 7px;
+    padding-<?php echo $left; ?>: 7px;
 }
 
 /* end serverstatus */
@@ -1513,7 +1516,7 @@ div#querywindowcontainer fieldset {
 div#profilingchart {
     width: 550px;
     height: 370px;
-    float: left;
+    float: <?php echo $left; ?>;
 }
 
 /* END profiling */
@@ -1560,7 +1563,7 @@ a.button {
     font-weight: bold;
     text-shadow: 0 1px 0 #fff;
     line-height: 35px;
-    margin-left: 7px;
+    margin-<?php echo $left; ?>: 7px;
     border: 1px solid #aaa;
     padding: 5px 10px;
     color: #111;
@@ -1570,10 +1573,10 @@ a.button {
     border-radius: 20px;
     -webkit-border-radius: 20px;
     -moz-border-radius: 20px;
-    box-shadow: 1px 1px 2px rgba(0,0,0,.5);
+    box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>1px 1px 2px rgba(0,0,0,.5);
     /*
-    -webkit-box-shadow: 1px 1px 2px rgba(0,0,0,.5);
-    -moz-box-shadow: 1px 1px 2px rgba(0,0,0,.5);
+    -webkit-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>1px 1px 2px rgba(0,0,0,.5);
+    -moz-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>1px 1px 2px rgba(0,0,0,.5);
     text-shadow: #fff 0 1px 0;
     */
     <?php echo $_SESSION['PMA_Theme']->getCssGradient('ffffff', 'cccccc'); ?>
@@ -1762,7 +1765,7 @@ li#li_user_preferences {
     margin-top: 1em;
     margin-bottom: 1em;
     width: 98%;
-    margin-left: 1%;
+    margin-<?php echo $left; ?>: 1%;
     border-top: .1em solid silver;
     text-align: <?php echo $right; ?>;
 }
@@ -1809,8 +1812,6 @@ div.sqlvalidate {
     padding: 1em;
     margin-top: 0;
     margin-bottom: 0;
-    border-top: 0;
-    border-bottom: 0;
     max-height: 10em;
     overflow: auto;
     background: <?php echo $GLOBALS['cfg']['BgOne']; ?>;
@@ -1835,9 +1836,9 @@ div.sqlvalidate {
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
     border-radius: 4px;
-    -moz-box-shadow: 2px 2px 5px #ccc;
-    -webkit-box-shadow: 2px 2px 5px #ccc;
-    box-shadow: 3px 3px 10px #ddd;
+    -moz-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>2px 2px 5px #ccc;
+    -webkit-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>2px 2px 5px #ccc;
+    box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>2px 2px 5px #ccc;
     margin-bottom: 1em;
     padding-bottom: 1em;
 }
@@ -1850,13 +1851,14 @@ div.sqlvalidate {
     font-size: 1.6em;
     font-weight: normal;
     text-shadow: 0 1px 0 #777;
-    -moz-box-shadow: 1px 1px 15px  #999 inset;
-    -webkit-box-shadow: 1px 1px 15px  #999 inset;
-    box-shadow: 1px 1px 15px  #999 inset;
+    -moz-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>1px 1px 15px #999 inset;
+    -webkit-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>1px 1px 15px #999 inset;
+    box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>1px 1px 15px #999 inset;
 }
 
 .group-cnt {
-    padding: 0 0 0 .5em;
+    padding: 0;
+    padding-<?php echo $left; ?>: .5em;
     display: inline-block;
     width: 98%;
 }
@@ -1913,14 +1915,14 @@ div.upload_progress_bar_outer div.percentage
 {
     position: absolute;
     top: 0;
-    left: 0;
+    <?php echo $left; ?>: 0;
     width: 202px;
 }
 
 div.upload_progress_bar_inner div.percentage
 {
     top: -1px;
-    left: -1px;
+    <?php echo $left; ?>: -1px;
 }
 
 div#statustext {
@@ -1931,7 +1933,7 @@ table#serverconnection_src_remote,
 table#serverconnection_trg_remote,
 table#serverconnection_src_local,
 table#serverconnection_trg_local  {
-  float: left;
+  float: <?php echo $left; ?>;
 }
 /**
   *  Validation error message styles
@@ -1950,7 +1952,7 @@ input[type=text].invalid_value,
     margin-top: 0;
     margin-right: auto;
     margin-bottom: 0;
-    margin-left: auto;
+    margin-<?php echo $left; ?>: auto;
     padding: 5px;   /** Keep a little space on the sides of the text */
     width: 350px;
 
@@ -1967,7 +1969,8 @@ input[type=text].invalid_value,
 
 /* additional styles */
 .ajax_notification {
-    margin-top: 200px;background: #ffe57e;
+    margin-top: 200px;
+    background: #ffe57e;
     border-radius: 5px;
     -moz-border-radius: 5px;
     -webkit-border-radius: 5px;
@@ -2014,19 +2017,20 @@ input[type=text].invalid_value,
 #ldi_options label.desc,
 #latex_options label.desc,
 #output label.desc {
-    float: left;
+    float: <?php echo $left; ?>;
     width: 15em;
 }
 
 .exportoptions,
 .importoptions {
-    margin: 20px 30px 30px 10px
+    margin: 20px 30px 30px;
+    margin-<?php echo $left; ?>: 10px;
 }
 
 .exportoptions #buttonGo,
 .importoptions #buttonGo {
     font-weight: bold;
-    margin-left: 14px;
+    margin-<?php echo $left; ?>: 14px;
     border: 1px solid #aaa;
     padding: 5px 12px;
     color: #111;
@@ -2047,7 +2051,8 @@ input[type=text].invalid_value,
 }
 
 .format_specific_options h3 {
-    margin: 10px 0 0 10px;
+    margin: 10px 0 0;
+    margin-<?php echo $left; ?>: 10px;
     border: 0;
 }
 
@@ -2070,7 +2075,8 @@ select#table_select {
 }
 
 .export_sub_options {
-    margin: 20px 0 0 30px;
+    margin: 20px 0 0;
+    margin-<?php echo $left; ?>: 30px;
 }
 
 .export_sub_options h4 {
@@ -2114,7 +2120,7 @@ input#input_import_file {
     width: 100%;
     height: 100%;
     top: 0;
-    left: 0;
+    <?php echo $left; ?>: 0;
     background: #000;
     z-index: 1000;
     overflow: hidden;
@@ -2157,7 +2163,7 @@ input#input_import_file {
 }
 
 #index_frm .index_info .label {
-    float: left;
+    float: <?php echo $left; ?>;
     min-width: 12em;
 }
 
@@ -2280,7 +2286,7 @@ table#index_columns select {
 }
 
 .config-form fieldset .errors { /* form error list */
-    margin: 0 -2px 1em -2px;
+    margin: 0 -2px 1em;
     padding: .5em 1.5em;
     background: #FBEAD9;
     border: 0 #C83838 solid;
@@ -2291,7 +2297,8 @@ table#index_columns select {
 }
 
 .config-form fieldset .inline_errors { /* field error list */
-    margin: .3em .3em .3em 0;
+    margin: .3em .3em .3em;
+    margin-<?php echo $left; ?>: 0;
     padding: 0;
     list-style: none;
     color: #9A0000;
@@ -2299,8 +2306,9 @@ table#index_columns select {
 }
 
 .config-form fieldset th {
-    padding: .3em .3em .3em .5em;
-    text-align: left;
+    padding: .3em .3em .3em;
+    padding-<?php echo $left; ?>: .5em;
+    text-align: <?php echo $left; ?>;
     vertical-align: top;
     width: 40%;
     background: transparent;
@@ -2309,7 +2317,7 @@ table#index_columns select {
 
 .config-form fieldset .doc,
 .config-form fieldset .disabled-notice {
-    margin-left: 1em;
+    margin-<?php echo $left; ?>: 1em;
 }
 
 .config-form fieldset .disabled-notice {
@@ -2336,7 +2344,7 @@ table#index_columns select {
 .config-form fieldset th,
 .config-form fieldset td {
     border-top: 1px <?php echo $GLOBALS['cfg']['BgTwo']; ?> solid;
-    border-right: none;
+    border-<?php echo $right; ?>: none;
 }
 
 fieldset .group-header th {
@@ -2349,16 +2357,16 @@ fieldset .group-header + tr th {
 
 fieldset .group-field-1 th,
 fieldset .group-header-2 th {
-    padding-left: 1.5em;
+    padding-<?php echo $left; ?>: 1.5em;
 }
 
 fieldset .group-field-2 th,
 fieldset .group-header-3 th {
-    padding-left: 3em;
+    padding-<?php echo $left; ?>: 3em;
 }
 
 fieldset .group-field-3 th {
-    padding-left: 4.5em;
+    padding-<?php echo $left; ?>: 4.5em;
 }
 
 fieldset .disabled-field th,
@@ -2432,7 +2440,7 @@ fieldset .disabled-field td {
 
 /* error list */
 .config-form dd {
-    margin-left: .5em;
+    margin-<?php echo $left; ?>: .5em;
 }
 
 .config-form dd:before {
@@ -2533,7 +2541,7 @@ fieldset .disabled-field td {
 #placeholder {
     position: relative;
     border: 1px solid #aaa;
-    float: right;
+    float: <?php echo $right; ?>;
     overflow: hidden;
 }
 
@@ -2583,13 +2591,13 @@ fieldset .disabled-field td {
 .colborder {
     cursor: col-resize;
     height: 100%;
-    margin-left: -6px;
+    margin-<?php echo $left; ?>: -6px;
     position: absolute;
     width: 5px;
 }
 
 .colborder_active {
-    border-right: 2px solid #a44;
+    border-<?php echo $right; ?>: 2px solid #a44;
 }
 
 .pma_table td {
@@ -2633,7 +2641,7 @@ fieldset .disabled-field td {
 .cPointer {
     background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('col_pointer.png');?>);
     height: 20px;
-    margin-left: -5px;  /* must be minus half of its width */
+    margin-<?php echo $left; ?>: -5px;  /* must be minus half of its width */
     margin-top: -10px;
     position: absolute;
     width: 10px;
@@ -2667,7 +2675,7 @@ fieldset .disabled-field td {
     background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('col_drop.png');?>);
     cursor: pointer;
     height: 16px;
-    margin-left: .3em;
+    margin-<?php echo $left; ?>: .3em;
     margin-top: .3em;
     position: absolute;
     width: 16px;
@@ -2688,7 +2696,8 @@ fieldset .disabled-field td {
 }
 
 .cList .lDiv div {
-    padding: .2em .5em .2em .2em;
+    padding: .2em .5em .2em;
+    padding-<?php echo $left; ?>: .2em;
 }
 
 .cList .lDiv div:hover {
@@ -2808,7 +2817,7 @@ fieldset .disabled-field td {
 
 .cEdit .edit_box_posting {
     background: #FFF url(<?php echo $_SESSION['PMA_Theme']->getImgPath('ajax_clock_small.gif');?>) no-repeat right center;
-    padding-right: 1.5em;
+    padding-<?php echo $right; ?>: 1.5em;
 }
 
 .cEdit .edit_area_loading {
@@ -2824,12 +2833,12 @@ fieldset .disabled-field td {
 
 .saving_edited_data {
     background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('ajax_clock_small.gif');?>) no-repeat left;
-    padding-left: 20px;
+    padding-<?php echo $left; ?>: 20px;
 }
 
 /* css for timepicker */
 .ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
-.ui-timepicker-div dl { text-align: left; }
+.ui-timepicker-div dl { text-align: <?php echo $left; ?>; }
 .ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
 .ui-timepicker-div dl dd { margin: 0 10px 10px 65px; }
 .ui-timepicker-div td { font-size: 90%; }
diff --git a/themes/pmahomme/css/enum_editor.css.php b/themes/pmahomme/css/enum_editor.css.php
index 2318ee58d6..da9bc07158 100644
--- a/themes/pmahomme/css/enum_editor.css.php
+++ b/themes/pmahomme/css/enum_editor.css.php
@@ -34,7 +34,8 @@ p.enum_notice {
 #enum_editor .add td {
     vertical-align: middle;
     width: 50%;
-    padding: 0 0 0 1em;
+    padding: 0 0 0;
+    padding-<?php echo $left; ?>: 1em;
 }
 
 #enum_editor .values td.drop {
@@ -45,7 +46,7 @@ p.enum_notice {
 
 #enum_editor .values input {
     margin: .1em 0;
-    padding-right: 2em;
+    padding-<?php echo $right; ?>: 2em;
     width: 100%;
 }
 
@@ -55,12 +56,13 @@ p.enum_notice {
 }
 
 #enum_editor input.add_value {
-    margin: 0 .4em 0 0;
+    margin: 0;
+    margin-<?php echo $right; ?>: 0.4em;
 }
 
 #enum_editor_output textarea {
     width: 100%;
-    float: right;
+    float: <?php echo $right; ?>;
     margin: 1em 0 0 0;
 }
 
@@ -73,6 +75,6 @@ p.enum_notice {
 
 .enum_hint a {
     position: absolute;
-    left: 81%;
+    <?php echo $left; ?>: 81%;
     bottom: .35em;
 }
diff --git a/themes/pmahomme/css/gis.css.php b/themes/pmahomme/css/gis.css.php
index 06ef963b4f..66348e344e 100644
--- a/themes/pmahomme/css/gis.css.php
+++ b/themes/pmahomme/css/gis.css.php
@@ -30,7 +30,7 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
  * GIS data editor styles
  */
 a.close_gis_editor {
-    float:  <?php echo $right; ?>;
+    float: <?php echo $right; ?>;
 }
 
 #gis_editor {
diff --git a/themes/pmahomme/css/jqplot.css.php b/themes/pmahomme/css/jqplot.css.php
index 4253cea801..e4c56bf961 100644
--- a/themes/pmahomme/css/jqplot.css.php
+++ b/themes/pmahomme/css/jqplot.css.php
@@ -40,7 +40,7 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
 }
 
 .jqplot-yaxis {
-    margin-right: 10px;
+    margin-<?php echo $right; ?>: 10px;
 }
 
 .jqplot-y2axis, .jqplot-y3axis, .jqplot-y4axis, .jqplot-y5axis, .jqplot-y6axis, .jqplot-y7axis, .jqplot-y8axis, .jqplot-y9axis, .jqplot-yMidAxis {
@@ -58,7 +58,7 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
 .jqplot-xaxis-tick {
     top: 0px;
     /* initial position untill tick is drawn in proper place */
-    left: 15px;
+    <?php echo $left; ?>: 15px;
 /*    padding-top: 10px;*/
     vertical-align: top;
 }
@@ -66,35 +66,35 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
 .jqplot-x2axis-tick {
     bottom: 0px;
     /* initial position untill tick is drawn in proper place */
-    left: 15px;
+    <?php echo $left; ?>: 15px;
 /*    padding-bottom: 10px;*/
     vertical-align: bottom;
 }
 
 .jqplot-yaxis-tick {
-    right: 0px;
+    <?php echo $right; ?>: 0px;
     /* initial position untill tick is drawn in proper place */
     top: 15px;
 /*    padding-right: 10px;*/
-    text-align: right;
+    text-align: <?php echo $right; ?>;
 }
 
 .jqplot-yaxis-tick.jqplot-breakTick {
-	right: -20px;
-	margin-right: 0px;
-	padding:1px 5px 1px 5px;
+	<?php echo $right; ?>: -20px;
+	margin-<?php echo $right; ?>: 0px;
+	padding:1px 5px 1px;
 /*	background-color: white;*/
 	z-index: 2;
 	font-size: 1.5em;
 }
 
 .jqplot-y2axis-tick, .jqplot-y3axis-tick, .jqplot-y4axis-tick, .jqplot-y5axis-tick, .jqplot-y6axis-tick, .jqplot-y7axis-tick, .jqplot-y8axis-tick, .jqplot-y9axis-tick {
-    left: 0px;
+    <?php echo $left; ?>: 0px;
     /* initial position untill tick is drawn in proper place */
     top: 15px;
 /*    padding-left: 10px;*/
 /*    padding-right: 15px;*/
-    text-align: left;
+    text-align: <?php echo $left; ?>;
 }
 
 .jqplot-yMidAxis-tick {
@@ -129,7 +129,7 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
 .jqplot-y2axis-label, .jqplot-y3axis-label, .jqplot-y4axis-label, .jqplot-y5axis-label, .jqplot-y6axis-label, .jqplot-y7axis-label, .jqplot-y8axis-label, .jqplot-y9axis-label {
 /*    text-align: center;*/
     font-size: 11pt;
-    margin-left: 10px;
+    margin-<?php echo $left; ?>: 10px;
     position: absolute;
 }
 
@@ -158,7 +158,7 @@ table.jqplot-table-legend, table.jqplot-cursor-legend {
 }
 
 td.jqplot-table-legend {
-    vertical-align:middle;
+    vertical-align: middle;
 }
 
 /*
@@ -187,12 +187,12 @@ td.jqplot-seriesToggle:hover, td.jqplot-seriesToggle:active {
 
 div.jqplot-table-legend-swatch-outline {
     border: 1px solid #cccccc;
-    padding:1px;
+    padding: 1px;
 }
 
 div.jqplot-table-legend-swatch {
-    width:0px;
-    height:0px;
+    width: 0;
+    height: 0;
     border-top-width: 5px;
     border-bottom-width: 5px;
     border-left-width: 6px;
@@ -205,7 +205,7 @@ div.jqplot-table-legend-swatch {
 
 .jqplot-title {
     top: 0px;
-    left: 0px;
+    <?php echo $left; ?>: 0px;
     padding-bottom: 0.5em;
     font-size: 1.2em;
 }
diff --git a/themes/pmahomme/css/navigation.css.php b/themes/pmahomme/css/navigation.css.php
index 7382c4d853..a90941c17e 100644
--- a/themes/pmahomme/css/navigation.css.php
+++ b/themes/pmahomme/css/navigation.css.php
@@ -56,8 +56,9 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
 
 #pma_navigation div.pageselector {
     text-align: center;
-    margin: 0 0 0 0.75em;
-    border-left: 1px solid #666;
+    margin: 0;
+    margin-<?php echo $left; ?>: 0.75em;
+    border-<?php echo $left; ?>: 1px solid #666;
 }
 
 #pma_navigation div#pmalogo {
@@ -71,7 +72,7 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
 #pma_navigation #databaseList,
 #pma_navigation div.pageselector.dbselector {
     text-align: center;
-    margin: 5px 10px 0px 10px;
+    margin: 5px 10px 0px;
     border: 0;
 }
 
@@ -83,7 +84,8 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
 
 /* Navigation tree*/
 #pma_navigation_tree {
-    margin: 5px 0 0 10px;
+    margin: 5px 0 0;
+    margin-<?php echo $left; ?>: 10px;
     color: #444;
 }
 #pma_navigation_tree a {
@@ -115,8 +117,8 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
 }
 #pma_navigation_tree div.block {
     position: relative;
-    width:1.5em;
-    height:1.5em;
+    width: 1.5em;
+    height: 1.5em;
     min-width: 16px;
     min-height: 16px;
     float: <?php echo $left; ?>;
@@ -144,25 +146,25 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
     display: block;
     height: 0.75em;
     bottom: 0;
-    left: 0.75em;
+    <?php echo $left; ?>: 0.75em;
     border-<?php echo $left; ?>: 1px solid #666;
 }
 #pma_navigation_tree div.block a,
 #pma_navigation_tree div.block u {
     position: absolute;
-    left: 50%;
+    <?php echo $left; ?>: 50%;
     top: 50%;
     z-index: 10;
 }
 #pma_navigation_tree div.block img {
     position: relative;
     top: -0.6em;
-    left: 0;
-    margin-left: -7px;
+    <?php echo $left; ?>: 0;
+    margin-<?php echo $left; ?>: -7px;
 }
 #pma_navigation_tree div.throbber img {
     top: 2px;
-    left: 2px;
+    <?php echo $left; ?>: 2px;
 }
 #pma_navigation_tree li.last > ul {
     background: none;
diff --git a/themes/pmahomme/css/pmd.css.php b/themes/pmahomme/css/pmd.css.php
index 130049fd73..97b175f146 100644
--- a/themes/pmahomme/css/pmd.css.php
+++ b/themes/pmahomme/css/pmd.css.php
@@ -20,7 +20,7 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
 }
 
 .content_fullscreen {
-    position : relative;
+    position: relative;
     overflow: auto;
 }
 
@@ -94,7 +94,7 @@ canvas.pmd * {
     position: absolute;
     background-color: #99FF99;
     color: #000;
-    left: 200px;
+    <?php echo $left; ?>: 200px;
     top: 50px;
     z-index: 3;
     border: #00CC66 solid 1px;
@@ -115,7 +115,7 @@ canvas.pmd * {
     text-indent: 3px;
     font-weight: bold;
     margin-left: 2px;
-    text-align: left;
+    text-align: <?php echo $left; ?>;
     background-color: #fff;
     background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/left_panel_butt.png'); ?>);
     border: #ccc solid 1px;
@@ -130,7 +130,7 @@ canvas.pmd * {
     white-space: nowrap;
     text-decoration: none;
     border: #9999FF solid 1px;
-    text-align: left;
+    text-align: <?php echo $left; ?>;
 }
 
 .owner {
@@ -290,15 +290,15 @@ canvas.pmd * {
 
 .pmd_header a {
     display: block;
-    float: left;
-    margin: 3px 1px 4px 1px;
+    float: <?php echo $left; ?>;
+    margin: 3px 1px 4px;
     height: 20px;
     border: 1px dotted #fff;
 }
 
 .pmd_header .M_bord {
     display: block;
-    float: left;
+    float: <?php echo $left; ?>;
     margin: 4px;
     height: 20px;
     width: 2px;
@@ -330,21 +330,21 @@ a.M_butt:hover {
 #layer_menu {
     z-index: 100;
     position: absolute;
-    left: 0;
+    <?php echo $left; ?>: 0;
     background-color: #EAEEF0;
     border: #999 solid 1px;
 }
 
 #layer_upd_relation {
     position: absolute;
-    left: 637px;
+    <?php echo $left; ?>: 637px;
     top: 224px;
     z-index: 100;
 }
 
 #layer_new_relation {
     position: absolute;
-    left: 636px;
+    <?php echo $left; ?>: 636px;
     top: 85px;
     z-index: 100;
     width: 153px;
@@ -352,7 +352,7 @@ a.M_butt:hover {
 
 #pmd_optionse {
     position: absolute;
-    left: 636px;
+    <?php echo $left; ?>: 636px;
     top: 85px;
     z-index: 100;
     width: 153px;
@@ -368,13 +368,14 @@ a.M_butt:hover {
 .panel {
     position: fixed;
     top: 60px;
-    right: 0;
+    <?php echo $right; ?>: 0;
     display: none;
     background: #FFF;
     border: 1px solid gray;
     width: 350 px;
     height: auto;
-    padding: 30px 170px 30px 30px;
+    padding: 30px 170px 30px;
+    padding-<?php echo $left; ?>: 30px;
     color: #FFF;
     z-index: 102;
 }
@@ -382,7 +383,8 @@ a.M_butt:hover {
 a.trigger {
     position: fixed;
     text-decoration: none;
-    top: 60px; right: 0;
+    top: 60px;
+    <?php echo $right; ?>: 0;
     color: #fff;
     padding: 10px 40px 10px 15px;
     background: #333 url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/plus.png'); ?>) 85% 55% no-repeat;
@@ -410,10 +412,10 @@ h2.tiger {
     background-repeat: repeat-x;
     padding: 1px;
     font-weight: bold;
-    padding: 50 20 50 20px;
+    padding: 50px 20px 50px;
     margin: 0 0 5px 0;
     width: 250px;
-    float: left;
+    float: <?php echo $left; ?>;
     color : #333;
     text-align: center;
 }
@@ -442,7 +444,7 @@ h2.active {
     margin: 0 0 5px;
     padding: 0;
     border-top: 1px solid #d6d6d6;
-    background: #FFF ;
+    background: #FFF;
     width: 250px;
     overflow: hidden;
     font-size: 1.2em;
@@ -451,7 +453,7 @@ h2.active {
 
 .toggle_container .block {
     background-color: #DBE4E8;
-    padding: 40 15 40 15px; /*--Padding of Container--*/
+    padding: 40px 15px 40px 15px; /*--Padding of Container--*/
     border:1px solid #999;
     color: #000;
 }
@@ -483,7 +485,7 @@ h2.active {
     display: none;
     position: absolute;
     top: 20%;
-    left: 30%;
+    <?php echo $left; ?>: 30%;
     width: 500px;
     height: 220px;
     padding: 48px;
@@ -498,31 +500,30 @@ h2.active {
     position: absolute;
     float: center;
     top: 0;
-    left: 0;
+    <?php echo $left; ?>: 0;
     width: 593px;
     height: 20px;
     padding: 0;
     padding-top: 4px;
-    left-padding: 8px;
     margin: 0;
     border-bottom: 4px solid #3CF;
     background-color: #D0DCE0;
     color: black;
     font-weight: bold;
-    padding-left: 2px;
-    text-align: left;
+    padding-<?php echo $left; ?>: 2px;
+    text-align: <?php echo $left; ?>;
 }
 
 #tblfooter {
     background-color: #D3DCE3;
-    float: right;
+    float: <?php echo $right; ?>;
     padding-top: 10px;
     color: black;
     font-weight: normal;
 }
 
 #foreignkeychk {
-    align:left;
-    position:absolute;
-    cursor:pointer;
+    text-align: <?php echo $left; ?>;
+    position: absolute;
+    cursor: pointer;
 }