diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index 80c07d5..e4a963b 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -3559,16 +3559,16 @@ GtkListBox .h4 {
   color: #BAC3CF;
   font: bold;
   box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); }
-  #panel_window .menubar,
-  #panel_window .menubar > .menuitem {
+  #panel_window menubar,
+  #panel_window menubar > menuitem {
     background-color: transparent;
     color: #BAC3CF;
     font: bold; }
-  #panel_window .menubar .menuitem:disabled {
+  #panel_window menubar menuitem:disabled {
     color: rgba(186, 195, 207, 0.5); }
-    #panel_window .menubar .menuitem:disabled label {
+    #panel_window menubar menuitem:disabled label {
       color: inherit; }
-  #panel_window .menubar .menu .menuitem {
+  #panel_window menubar menu > menuitem {
     font: normal; }
 
 #login_window,
@@ -3642,7 +3642,7 @@ GtkListBox .h4 {
 #login_window #user_combobox {
   color: #D3DAE3;
   font: 13px; }
-  #login_window #user_combobox .menu {
+  #login_window #user_combobox menu {
     font: normal; }
 
 #user_image {
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index b27a886..2eb46f4 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -3558,16 +3558,16 @@ GtkListBox .h4 {
   color: #BAC3CF;
   font: bold;
   box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); }
-  #panel_window .menubar,
-  #panel_window .menubar > .menuitem {
+  #panel_window menubar,
+  #panel_window menubar > menuitem {
     background-color: transparent;
     color: #BAC3CF;
     font: bold; }
-  #panel_window .menubar .menuitem:disabled {
+  #panel_window menubar menuitem:disabled {
     color: rgba(186, 195, 207, 0.5); }
-    #panel_window .menubar .menuitem:disabled label {
+    #panel_window menubar menuitem:disabled label {
       color: inherit; }
-  #panel_window .menubar .menu .menuitem {
+  #panel_window menubar menu > menuitem {
     font: normal; }
 
 #login_window,
@@ -3641,7 +3641,7 @@ GtkListBox .h4 {
 #login_window #user_combobox {
   color: #5c616c;
   font: 13px; }
-  #login_window #user_combobox .menu {
+  #login_window #user_combobox menu {
     font: normal; }
 
 #user_image {
diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css
index 88b4031..bbfb358 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -3559,16 +3559,16 @@ GtkListBox .h4 {
   color: #BAC3CF;
   font: bold;
   box-shadow: inset 0 -1px #1b1d23; }
-  #panel_window .menubar,
-  #panel_window .menubar > .menuitem {
+  #panel_window menubar,
+  #panel_window menubar > menuitem {
     background-color: transparent;
     color: #BAC3CF;
     font: bold; }
-  #panel_window .menubar .menuitem:disabled {
+  #panel_window menubar menuitem:disabled {
     color: rgba(186, 195, 207, 0.5); }
-    #panel_window .menubar .menuitem:disabled label {
+    #panel_window menubar menuitem:disabled label {
       color: inherit; }
-  #panel_window .menubar .menu .menuitem {
+  #panel_window menubar menu > menuitem {
     font: normal; }
 
 #login_window,
@@ -3642,7 +3642,7 @@ GtkListBox .h4 {
 #login_window #user_combobox {
   color: #D3DAE3;
   font: 13px; }
-  #login_window #user_combobox .menu {
+  #login_window #user_combobox menu {
     font: normal; }
 
 #user_image {
diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css
index 21e91da..2563f63 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -3558,16 +3558,16 @@ GtkListBox .h4 {
   color: #BAC3CF;
   font: bold;
   box-shadow: inset 0 -1px #1b1d23; }
-  #panel_window .menubar,
-  #panel_window .menubar > .menuitem {
+  #panel_window menubar,
+  #panel_window menubar > menuitem {
     background-color: transparent;
     color: #BAC3CF;
     font: bold; }
-  #panel_window .menubar .menuitem:disabled {
+  #panel_window menubar menuitem:disabled {
     color: rgba(186, 195, 207, 0.5); }
-    #panel_window .menubar .menuitem:disabled label {
+    #panel_window menubar menuitem:disabled label {
       color: inherit; }
-  #panel_window .menubar .menu .menuitem {
+  #panel_window menubar menu > menuitem {
     font: normal; }
 
 #login_window,
@@ -3641,7 +3641,7 @@ GtkListBox .h4 {
 #login_window #user_combobox {
   color: #5c616c;
   font: 13px; }
-  #login_window #user_combobox .menu {
+  #login_window #user_combobox menu {
     font: normal; }
 
 #user_image {
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index a6242a2..ef93309 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -3562,16 +3562,16 @@ GtkListBox .h4 {
   color: #BAC3CF;
   font: bold;
   box-shadow: inset 0 -1px #1b1d23; }
-  #panel_window .menubar,
-  #panel_window .menubar > .menuitem {
+  #panel_window menubar,
+  #panel_window menubar > menuitem {
     background-color: transparent;
     color: #BAC3CF;
     font: bold; }
-  #panel_window .menubar .menuitem:disabled {
+  #panel_window menubar menuitem:disabled {
     color: rgba(186, 195, 207, 0.5); }
-    #panel_window .menubar .menuitem:disabled label {
+    #panel_window menubar menuitem:disabled label {
       color: inherit; }
-  #panel_window .menubar .menu .menuitem {
+  #panel_window menubar menu > menuitem {
     font: normal; }
 
 #login_window,
@@ -3645,7 +3645,7 @@ GtkListBox .h4 {
 #login_window #user_combobox {
   color: #5c616c;
   font: 13px; }
-  #login_window #user_combobox .menu {
+  #login_window #user_combobox menu {
     font: normal; }
 
 #user_image {
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index 93c0d50..a5b1a2e 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -3562,16 +3562,16 @@ GtkListBox .h4 {
   color: #BAC3CF;
   font: bold;
   box-shadow: inset 0 -1px rgba(27, 29, 35, 0.95); }
-  #panel_window .menubar,
-  #panel_window .menubar > .menuitem {
+  #panel_window menubar,
+  #panel_window menubar > menuitem {
     background-color: transparent;
     color: #BAC3CF;
     font: bold; }
-  #panel_window .menubar .menuitem:disabled {
+  #panel_window menubar menuitem:disabled {
     color: rgba(186, 195, 207, 0.5); }
-    #panel_window .menubar .menuitem:disabled label {
+    #panel_window menubar menuitem:disabled label {
       color: inherit; }
-  #panel_window .menubar .menu .menuitem {
+  #panel_window menubar menu > menuitem {
     font: normal; }
 
 #login_window,
@@ -3645,7 +3645,7 @@ GtkListBox .h4 {
 #login_window #user_combobox {
   color: #5c616c;
   font: 13px; }
-  #login_window #user_combobox .menu {
+  #login_window #user_combobox menu {
     font: normal; }
 
 #user_image {
diff --git a/common/gtk-3.0/3.20/sass/_lightdm.scss b/common/gtk-3.0/3.20/sass/_lightdm.scss
index 527dc99..e5e5530 100644
--- a/common/gtk-3.0/3.20/sass/_lightdm.scss
+++ b/common/gtk-3.0/3.20/sass/_lightdm.scss
@@ -6,19 +6,19 @@
   box-shadow: inset 0 -1px darken($panel_bg, 7%);
 
   // the menubars/menus of the panel, i.e. indicators
-  .menubar,
-  .menubar > .menuitem {
+  menubar,
+  menubar > menuitem {
     background-color: transparent;
     color: $panel_fg;
     font: bold;
   }
 
-  .menubar .menuitem:disabled {
+  menubar menuitem:disabled {
     color: transparentize($panel_fg, 0.5);
 
     label { color: inherit; }
   }
-  .menubar .menu .menuitem { font: normal; }
+  menubar menu > menuitem { font: normal; }
 }
 
 // the login window
@@ -74,8 +74,7 @@
   color: $fg_color;
   font: 13px;
 
-  .menu { font: normal; }
-  .arrow {}
+  menu { font: normal; }
 }
 
 // the user's avatar box
@@ -84,9 +83,6 @@
   border-radius: 2px;
 }
 
-// the border around the user's avatar box
-#user_image_border {}
-
 // the shutdown button
 #shutdown_button.button {
   @include button(suggested_destructive, $destructive_color);