diff --git a/data/theme/_common.scss b/data/theme/_common.scss
index c9296578c..038fcae7c 100644
--- a/data/theme/_common.scss
+++ b/data/theme/_common.scss
@@ -463,9 +463,9 @@ StScrollBar {
   }
   
   .popup-separator-menu-item {
-    -margin-horizontal: 24px;
+    //-margin-horizontal: 24px;
     height: 1px; //not really the whole box
-    padding: 0; //not really centered
+    margin: 6px 64px;
     background-color: transparent;
     border-color: lighten($borders_color,10%);
     border-bottom-width: 1px;
@@ -579,7 +579,7 @@ StScrollBar {
 
   .ws-switcher-box {
       height: 50px;
-      border: 1px solid transparentize($fg_color,0.5);
+      border: 1px solid transparentize($osd_fg_color,0.9);
       background: transparent;
       border-radius: 8px;
   }
diff --git a/data/theme/gnome-shell-high-contrast.css b/data/theme/gnome-shell-high-contrast.css
index 4f6f898d8..232745a76 100644
--- a/data/theme/gnome-shell-high-contrast.css
+++ b/data/theme/gnome-shell-high-contrast.css
@@ -418,9 +418,8 @@ StScrollBar {
   -arrow-box-shadow: 0 1px 3px red; }
 
 .popup-separator-menu-item {
-  -margin-horizontal: 24px;
   height: 1px;
-  padding: 0;
+  margin: 6px 64px;
   background-color: transparent;
   border-color: #1a1a1a;
   border-bottom-width: 1px;
@@ -508,7 +507,7 @@ StScrollBar {
 
 .ws-switcher-box {
   height: 50px;
-  border: 1px solid rgba(255, 255, 255, 0.5);
+  border: 1px solid rgba(238, 238, 236, 0.1);
   background: transparent;
   border-radius: 8px; }
 
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index ab2b1b50d..1f13eb6ce 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -418,9 +418,8 @@ StScrollBar {
   -arrow-box-shadow: 0 1px 3px red; }
 
 .popup-separator-menu-item {
-  -margin-horizontal: 24px;
   height: 1px;
-  padding: 0;
+  margin: 6px 64px;
   background-color: transparent;
   border-color: #343a3a;
   border-bottom-width: 1px;
@@ -508,7 +507,7 @@ StScrollBar {
 
 .ws-switcher-box {
   height: 50px;
-  border: 1px solid rgba(238, 238, 236, 0.5);
+  border: 1px solid rgba(238, 238, 236, 0.1);
   background: transparent;
   border-radius: 8px; }