diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index f25a6288a..e9c7fe55e 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -121,7 +121,7 @@ StTooltip {
  * override .popup-menu.font-size, everything else will scale with it.
  */
 .popup-menu-content {
-    padding: .5em 0px;
+    padding: 1em .5em;
 }
 
 .popup-menu-item {
@@ -151,7 +151,6 @@ StTooltip {
 /* Switches (to be used in menus) */
 .switch {
 	border-radius: 5px;
-	border: 1px solid #ffffff;
 	padding: 0px 0.2em;
 }
 .switch-label {
@@ -159,7 +158,6 @@ StTooltip {
 	padding: 2px 0.1em; /* account for border if checked */
 }
 .switch-label:checked {
-	border: 2px solid #ffffff;
 	border-radius: 4px;
 	padding: 0px 0.3em;
 }
diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index ca9a58012..491e50107 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -40,12 +40,12 @@ Switch.prototype = {
             this._on.remove_style_pseudo_class('checked');
             this._on.text = _("ON");
             this._off.add_style_pseudo_class('checked');
-            this._off.text = '|||';
+            this._off.text = '      ';
         } else {
             this._off.remove_style_pseudo_class('checked');
             this._off.text = _("OFF");
             this._on.add_style_pseudo_class('checked');
-            this._on.text = '|||';
+            this._on.text = '      ';
         }
         this.state = state;
     },