diff --git a/data/theme/_common.scss b/data/theme/_common.scss
index e4bb88e13..4e83757f6 100644
--- a/data/theme/_common.scss
+++ b/data/theme/_common.scss
@@ -479,6 +479,77 @@ StScrollBar {
     &:rtl { -shell-close-overlap-x: -14px; }
   }
 
+/* NETWORK DIALOGS */
+// FIXME absolutely no cascading :(
+
+.nm-dialog {
+    max-height: 500px;
+    min-height: 450px;
+    min-width: 470px;
+}
+
+  .nm-dialog-content {
+      spacing: 20px;
+  }
+
+  .nm-dialog-header-hbox {
+      spacing: 10px;
+  }
+
+  .nm-dialog-airplane-box {
+      spacing: 12px;
+  }
+
+  .nm-dialog-airplane-headline {
+      font-size: 110%;
+      font-weight: bold;
+      text-align: center;
+  }
+
+  .nm-dialog-airplane-text {
+      color: $fg_color;
+  }
+
+  .nm-dialog-header-icon {
+      icon-size: 32px;
+  }
+
+  .nm-dialog-scroll-view {
+      border: 2px solid $borders_color;
+  }
+
+  .nm-dialog-header {
+      font-weight: bold;
+  }
+
+  .nm-dialog-item {
+      font-size: 110%;
+      border-bottom: 1px solid $borders_color;
+      padding: 12px;
+      spacing: 20px;
+  }
+
+  .nm-dialog-item:selected {
+      background-color: $selected_bg_color;
+      color: $selected_fg_color;
+  }
+
+  .nm-dialog-icons {
+      spacing: .5em;
+  }
+
+  .nm-dialog-icon {
+      icon-size: 16px;
+  }
+
+  .no-networks-label {
+      color: #999999;
+  }
+
+  .no-networks-box {
+      spacing: 12px;
+  }
+
 /* OVERVIEW */
 
 #overview {
diff --git a/data/theme/_gnome-shell-old.scss b/data/theme/_gnome-shell-old.scss
index 1588b310a..6ed364ed6 100644
--- a/data/theme/_gnome-shell-old.scss
+++ b/data/theme/_gnome-shell-old.scss
@@ -18,75 +18,7 @@
  */
 
 
-/* Network */
 
-.nm-dialog {
-    max-height: 500px;
-    min-height: 450px;
-    min-width: 470px;
-}
-
-.nm-dialog-content {
-    spacing: 20px;
-}
-
-.nm-dialog-header-hbox {
-    spacing: 10px;
-}
-
-.nm-dialog-airplane-box {
-    spacing: 12px;
-}
-
-.nm-dialog-airplane-headline {
-    font-size: 1.1em;
-    font-weight: bold;
-    text-align: center;
-}
-
-.nm-dialog-airplane-text {
-    color: #999999;
-}
-
-.nm-dialog-header-icon {
-    icon-size: 32px;
-}
-
-.nm-dialog-scroll-view {
-    border: 2px solid #666;
-    border-radius: 6px;
-}
-
-.nm-dialog-header {
-    font-weight: bold;
-}
-
-.nm-dialog-item {
-    font-size: 12pt;
-    border-bottom: 1px solid #666;
-    padding: 12px;
-    spacing: 20px;
-}
-
-.nm-dialog-item:selected {
-    background-color: #333;
-}
-
-.nm-dialog-icons {
-    spacing: .5em;
-}
-
-.nm-dialog-icon {
-    icon-size: 16px;
-}
-
-.no-networks-label {
-    color: #999999;
-}
-
-.no-networks-box {
-    spacing: 12px;
-}
 
 
 /* OSD */
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 4ec59c77c..e2c153c11 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -16,60 +16,6 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* Network */
-.nm-dialog {
-  max-height: 500px;
-  min-height: 450px;
-  min-width: 470px; }
-
-.nm-dialog-content {
-  spacing: 20px; }
-
-.nm-dialog-header-hbox {
-  spacing: 10px; }
-
-.nm-dialog-airplane-box {
-  spacing: 12px; }
-
-.nm-dialog-airplane-headline {
-  font-size: 1.1em;
-  font-weight: bold;
-  text-align: center; }
-
-.nm-dialog-airplane-text {
-  color: #999999; }
-
-.nm-dialog-header-icon {
-  icon-size: 32px; }
-
-.nm-dialog-scroll-view {
-  border: 2px solid #666;
-  border-radius: 6px; }
-
-.nm-dialog-header {
-  font-weight: bold; }
-
-.nm-dialog-item {
-  font-size: 12pt;
-  border-bottom: 1px solid #666;
-  padding: 12px;
-  spacing: 20px; }
-
-.nm-dialog-item:selected {
-  background-color: #333; }
-
-.nm-dialog-icons {
-  spacing: .5em; }
-
-.nm-dialog-icon {
-  icon-size: 16px; }
-
-.no-networks-label {
-  color: #999999; }
-
-.no-networks-box {
-  spacing: 12px; }
-
 /* OSD */
 .osd-window {
   text-align: center;
@@ -1223,6 +1169,60 @@ StScrollBar {
   .notification-close:rtl {
     -shell-close-overlap-x: -14px; }
 
+/* NETWORK DIALOGS */
+.nm-dialog {
+  max-height: 500px;
+  min-height: 450px;
+  min-width: 470px; }
+
+.nm-dialog-content {
+  spacing: 20px; }
+
+.nm-dialog-header-hbox {
+  spacing: 10px; }
+
+.nm-dialog-airplane-box {
+  spacing: 12px; }
+
+.nm-dialog-airplane-headline {
+  font-size: 110%;
+  font-weight: bold;
+  text-align: center; }
+
+.nm-dialog-airplane-text {
+  color: #eeeeec; }
+
+.nm-dialog-header-icon {
+  icon-size: 32px; }
+
+.nm-dialog-scroll-view {
+  border: 2px solid #1c1f1f; }
+
+.nm-dialog-header {
+  font-weight: bold; }
+
+.nm-dialog-item {
+  font-size: 110%;
+  border-bottom: 1px solid #1c1f1f;
+  padding: 12px;
+  spacing: 20px; }
+
+.nm-dialog-item:selected {
+  background-color: #215d9c;
+  color: #ffffff; }
+
+.nm-dialog-icons {
+  spacing: .5em; }
+
+.nm-dialog-icon {
+  icon-size: 16px; }
+
+.no-networks-label {
+  color: #999999; }
+
+.no-networks-box {
+  spacing: 12px; }
+
 /* OVERVIEW */
 #overview {
   spacing: 24px; }