diff --git a/gnome-shell/_common.scss b/gnome-shell/_common.scss
index 84d9047..ced7d51 100644
--- a/gnome-shell/_common.scss
+++ b/gnome-shell/_common.scss
@@ -524,12 +524,19 @@ StScrollBar {
     box-shadow: $depth6;
   }
 
-  .popup-menu-content { padding: 1em 0em; }
+  .popup-menu-content { padding: 15px 0; }
   .popup-menu-item {
-    spacing: 12px;
+    spacing: 5px;
+    padding: 5px;
 
-    &:ltr { padding: .4em 1.75em .4em 0em; }
-    &:rtl { padding: .4em 0em .4em 1.75em; }
+    &:ltr { padding-right: 1.75em; padding-left: 0; }
+    &:rtl { padding-right: 0; padding-left: 1.75em; }
+
+    // Fix overlaping text in 'opened windows' title
+    &:first-child:insensitive {
+      margin-bottom: 10px;
+      margin-left: 0;
+    }
     &:checked {
       @include gradient();
      // background-color: transparentize($selected_bg_color,0.1);
@@ -576,13 +583,20 @@ StScrollBar {
   }
 
   .popup-separator-menu-item {
-    //-margin-horizontal: 24px;
-    height: 1px; //not really the whole box
-    margin: 6px 64px;
-    background-color: transparent;
-    border-color: transparent;
-    border-bottom-width: 1px;
-    border-bottom-style: solid;
+
+    &, &-separator {
+      //-margin-horizontal: 24px;
+      height: 1px; //not really the whole box
+      margin: 6px 64px;
+      background-color: transparent;
+      border-color: transparent;
+      border-bottom-width: 1px;
+      border-bottom-style: solid;
+    }
+    .popup-sub-menu & &-separator { //submenu separators
+      margin: 0 64px 0 32px;
+      background: transparent;
+    }
   }
 
 
diff --git a/gnome-shell/gnome-shell.css b/gnome-shell/gnome-shell.css
index 0c6e2ca..fdbed72 100644
--- a/gnome-shell/gnome-shell.css
+++ b/gnome-shell/gnome-shell.css
@@ -500,13 +500,19 @@ StScrollBar {
     background-color: rgba(0, 0, 0, 0.2);
     box-shadow: 0 2px 4px 2px rgba(0, 0, 0, 0.2); }
   .popup-menu .popup-menu-content {
-    padding: 1em 0em; }
+    padding: 15px 0; }
   .popup-menu .popup-menu-item {
-    spacing: 12px; }
+    spacing: 5px;
+    padding: 5px; }
     .popup-menu .popup-menu-item:ltr {
-      padding: .4em 1.75em .4em 0em; }
+      padding-right: 1.75em;
+      padding-left: 0; }
     .popup-menu .popup-menu-item:rtl {
-      padding: .4em 0em .4em 1.75em; }
+      padding-right: 0;
+      padding-left: 1.75em; }
+    .popup-menu .popup-menu-item:first-child:insensitive {
+      margin-bottom: 10px;
+      margin-left: 0; }
     .popup-menu .popup-menu-item:checked {
       background-gradient-start: #eee90a;
       background-gradient-end: #f7b922;
@@ -547,7 +553,7 @@ StScrollBar {
   -arrow-rise: 11px;
   -arrow-box-shadow: 0 1px 3px black; }
 
-.popup-separator-menu-item {
+.popup-separator-menu-item, .popup-separator-menu-item-separator {
   height: 1px;
   margin: 6px 64px;
   background-color: transparent;
@@ -555,6 +561,10 @@ StScrollBar {
   border-bottom-width: 1px;
   border-bottom-style: solid; }
 
+.popup-sub-menu .popup-separator-menu-item .popup-separator-menu-item-separator {
+  margin: 0 64px 0 32px;
+  background: transparent; }
+
 .background-menu {
   -boxpointer-gap: 4px;
   -arrow-rise: 0px; }