diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php
index d94ad75c1d..829ccbd6dc 100644
--- a/libraries/classes/Util.php
+++ b/libraries/classes/Util.php
@@ -2594,11 +2594,9 @@ class Util
                 'pma_theme_image' => $GLOBALS['pmaThemeImage'],
                 'text_dir'        => $GLOBALS['text_dir'],
                 'link_on'         => $link_on,
-                'toggle_on'       => str_replace(' ', ' ', htmlspecialchars(
-                                        $options[1]['label'])),
-                'toggle_off'      => str_replace(' ', ' ', htmlspecialchars(
-                                        $options[0]['label'])),
                 'link_off'        => $link_off,
+                'toggle_on'       => $options[1]['label'],
+                'toggle_off'      => $options[0]['label'],
                 'callback'        => $callback,
                 'state'           => $state
             ]);
diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php
index 0fd1dc5ac5..132e075b74 100644
--- a/themes/original/css/common.css.php
+++ b/themes/original/css/common.css.php
@@ -2012,9 +2012,10 @@ fieldset .disabled-field td {
 .toggleButton .container {
     position: absolute;
 }
-.toggleButton .container td {
+.toggleButton .container td,
+.toggleButton .container tr {
     background-image: none;
-    background: none;
+    background: none !important;
 }
 .toggleButton .toggleOn {
     color: #fff;
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index 68cc29761d..a4ea32b059 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -2529,9 +2529,10 @@ fieldset .disabled-field td {
 .toggleButton .container {
     position: absolute;
 }
-.toggleButton .container td {
+.toggleButton .container td,
+.toggleButton .container tr {
     background-image: none;
-    background: none;
+    background: none !important;
 }
 .toggleButton .toggleOn {
     color: #fff;