diff --git a/data/theme/_common.scss b/data/theme/_common.scss
index 915284669..8055e7675 100644
--- a/data/theme/_common.scss
+++ b/data/theme/_common.scss
@@ -148,6 +148,7 @@ StScrollBar {
 
 /* Modal Dialogs */
 
+.headline { font-size: 110%; }
 .lightbox { background-color: black; } //FIXME where is this?
 .flashspot { background-color: white; } //FIXME where is this?
 
@@ -260,6 +261,157 @@ StScrollBar {
     font-size: 10pt;
   }
 
+/* ShellMountOperation Dialogs */
+.shell-mount-operation-icon { icon-size: 48px; }
+
+  .show-processes-dialog,
+  .mount-question-dialog {
+    spacing: 24px;
+  }
+
+  .show-processes-dialog-subject,
+  .mount-question-dialog-subject {
+    padding-top: 10px;
+    padding-left: 17px;
+    padding-bottom: 6px;
+  }
+
+  .mount-question-dialog-subject {
+      max-width: 500px;
+  }
+
+  .show-processes-dialog-subject:rtl,
+  .mount-question-dialog-subject:rtl {
+    padding-left: 0px;
+    padding-right: 17px;
+  }
+
+  .show-processes-dialog-description,
+  .mount-question-dialog-description {
+    padding-left: 17px;
+    width: 28em;
+  }
+
+  .show-processes-dialog-description:rtl,
+  .mount-question-dialog-description:rtl {
+    padding-right: 17px;
+  }
+
+  .show-processes-dialog-app-list {
+    max-height: 200px;
+    padding-top: 24px;
+    padding-left: 49px;
+    padding-right: 32px;
+  }
+
+  .show-processes-dialog-app-list:rtl {
+    padding-right: 49px;
+    padding-left: 32px;
+  }
+
+  .show-processes-dialog-app-list-item {
+    color: darken($fg_color,10%);
+    &:hover { color: $fg_color; }
+    &:ltr { padding-right: 1em; }
+    &:rtl { padding-left: 1em; }
+  }
+
+  .show-processes-dialog-app-list-item-icon {
+    &:ltr { padding-right: 17px; }
+    &:rtl { padding-left: 17px; }
+  }
+  
+  .show-processes-dialog-app-list-item-name {
+    font-size: 10pt;
+  }
+
+
+/* Password or Authentication Dialog */
+
+.prompt-dialog {
+  //this is the width of the entire modal popup
+  width: 500px;
+  border: 3px solid transparentize($fg_color,0.8);
+}
+
+  .prompt-dialog-main-layout {
+    spacing: 24px;
+    padding: 10px;
+  }
+
+  .prompt-dialog-message-layout {
+    spacing: 16px;
+  }
+
+  .prompt-dialog-headline {
+    font-weight: bold;
+    color: darken($fg_color,30%);
+  }
+
+  .prompt-dialog-description:rtl {
+    text-align: right;
+  }
+
+  .prompt-dialog-password-box {
+    spacing: 1em;
+    padding-bottom: 1em;
+  }
+
+  .prompt-dialog-error-label {
+    font-size: 10pt;
+    color: $error_color;
+    padding-bottom: 8px;
+  }
+
+  .prompt-dialog-info-label {
+    font-size: 10pt;
+    padding-bottom: 8px;
+  }
+
+  .hidden {
+    color: rgba(0,0,0,0);
+  }
+
+  .prompt-dialog-null-label {
+    font-size: 10pt;
+    padding-bottom: 8px;
+  }
+
+
+/* Polkit Dialog */
+
+.polkit-dialog-user-layout {
+  padding-left: 10px;
+  spacing: 10px;
+  &:rtl {
+    padding-left: 0px;
+    padding-right: 10px;
+  }
+}
+
+  .polkit-dialog-user-root-label {
+      color: $warning_color;
+  }
+
+  .polkit-dialog-user-icon {
+      border-radius: 5px;
+      background-size: contain;
+      width: 48px;
+      height: 48px;
+  }
+
+/* Network Agent Dialog */
+
+.network-dialog-secret-table {
+  spacing-rows: 15px;
+  spacing-columns: 1em;
+}
+
+.keyring-dialog-control-table {
+  spacing-rows: 15px;
+  spacing-columns: 1em;
+}
+
 /* Popvers/Menus */
 
 .popup-menu {
@@ -730,7 +882,6 @@ StScrollBar {
   }
 
   .nm-dialog-airplane-headline {
-      font-size: 110%;
       font-weight: bold;
       text-align: center;
   }
diff --git a/data/theme/_gnome-shell-old.scss b/data/theme/_gnome-shell-old.scss
index 0d70b94d5..217820af1 100644
--- a/data/theme/_gnome-shell-old.scss
+++ b/data/theme/_gnome-shell-old.scss
@@ -18,184 +18,6 @@
  */
 
 
-
-
-
-
-
-
-
-
-/* Restart message */
-.restart-message {
-    font-size: 14pt;
-}
-
-/* ShellMountOperation Dialogs */
-.shell-mount-operation-icon {
-    icon-size: 48px;
-}
-
-.show-processes-dialog,
-.mount-question-dialog {
-    spacing: 24px;
-}
-
-.show-processes-dialog-subject,
-.mount-question-dialog-subject {
-    padding-top: 10px;
-    padding-left: 17px;
-    padding-bottom: 6px;
-}
-
-.mount-question-dialog-subject {
-    max-width: 500px;
-}
-
-.show-processes-dialog-subject:rtl,
-.mount-question-dialog-subject:rtl {
-    padding-left: 0px;
-    padding-right: 17px;
-}
-
-.show-processes-dialog-description,
-.mount-question-dialog-description {
-    padding-left: 17px;
-    width: 28em;
-}
-
-.show-processes-dialog-description:rtl,
-.mount-question-dialog-description:rtl {
-    padding-right: 17px;
-}
-
-.show-processes-dialog-app-list {
-    font-size: 10pt;
-    max-height: 200px;
-    padding-top: 24px;
-    padding-left: 49px;
-    padding-right: 32px;
-}
-
-.show-processes-dialog-app-list:rtl {
-    padding-right: 49px;
-    padding-left: 32px;
-}
-
-.show-processes-dialog-app-list-item {
-    color: #ccc;
-}
-
-.show-processes-dialog-app-list-item:hover {
-    color: white;
-}
-
-.show-processes-dialog-app-list-item:ltr {
-    padding-right: 1em;
-}
-
-.show-processes-dialog-app-list-item:rtl {
-    padding-left: 1em;
-}
-
-.show-processes-dialog-app-list-item-icon:ltr {
-    padding-right: 17px;
-}
-
-.show-processes-dialog-app-list-item-icon:rtl {
-    padding-left: 17px;
-}
-
-.show-processes-dialog-app-list-item-name {
-    font-size: 10pt;
-}
-
-/* Password or Authentication Dialog */
-.prompt-dialog {
-    /* this is the width of the entire modal popup */
-    width: 500px;
-}
-
-.prompt-dialog-main-layout {
-    spacing: 24px;
-    padding: 10px;
-}
-
-.prompt-dialog-message-layout {
-    spacing: 16px;
-}
-
-.prompt-dialog-headline {
-    font-size: 12pt;
-    font-weight: bold;
-    color: #666666;
-}
-
-.prompt-dialog-description:rtl {
-    text-align: right;
-}
-
-.prompt-dialog-password-box {
-    spacing: 1em;
-    padding-bottom: 1em;
-}
-
-.prompt-dialog-error-label {
-    font-size: 10pt;
-    color: #ffff00;
-    padding-bottom: 8px;
-}
-
-.prompt-dialog-info-label {
-    font-size: 10pt;
-    padding-bottom: 8px;
-}
-
-.hidden {
-    color: rgba(0,0,0,0);
-}
-
-.prompt-dialog-null-label {
-    font-size: 10pt;
-    padding-bottom: 8px;
-}
-
-/* Polkit Dialog */
-
-.polkit-dialog-user-layout {
-    padding-left: 10px;
-    spacing: 10px;
-}
-
-.polkit-dialog-user-layout:rtl {
-    padding-left: 0px;
-    padding-right: 10px;
-}
-
-.polkit-dialog-user-root-label {
-    color: #ff0000;
-}
-
-.polkit-dialog-user-icon {
-    border: 2px solid #8b8b8b;
-    border-radius: 5px;
-    background-size: contain;
-    width: 48px;
-    height: 48px;
-}
-
-/* Network Agent Dialog */
-
-.network-dialog-secret-table {
-    spacing-rows: 15px;
-    spacing-columns: 1em;
-}
-
-.keyring-dialog-control-table {
-    spacing-rows: 15px;
-    spacing-columns: 1em;
-}
-
 /* Magnifier */
 
 .magnifier-zoom-region {
diff --git a/data/theme/gnome-shell-high-contrast.css b/data/theme/gnome-shell-high-contrast.css
index c36f88d91..7b2308ef3 100644
--- a/data/theme/gnome-shell-high-contrast.css
+++ b/data/theme/gnome-shell-high-contrast.css
@@ -16,141 +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.
  */
-/* Restart message */
-.restart-message {
-  font-size: 14pt; }
-
-/* ShellMountOperation Dialogs */
-.shell-mount-operation-icon {
-  icon-size: 48px; }
-
-.show-processes-dialog,
-.mount-question-dialog {
-  spacing: 24px; }
-
-.show-processes-dialog-subject,
-.mount-question-dialog-subject {
-  padding-top: 10px;
-  padding-left: 17px;
-  padding-bottom: 6px; }
-
-.mount-question-dialog-subject {
-  max-width: 500px; }
-
-.show-processes-dialog-subject:rtl,
-.mount-question-dialog-subject:rtl {
-  padding-left: 0px;
-  padding-right: 17px; }
-
-.show-processes-dialog-description,
-.mount-question-dialog-description {
-  padding-left: 17px;
-  width: 28em; }
-
-.show-processes-dialog-description:rtl,
-.mount-question-dialog-description:rtl {
-  padding-right: 17px; }
-
-.show-processes-dialog-app-list {
-  font-size: 10pt;
-  max-height: 200px;
-  padding-top: 24px;
-  padding-left: 49px;
-  padding-right: 32px; }
-
-.show-processes-dialog-app-list:rtl {
-  padding-right: 49px;
-  padding-left: 32px; }
-
-.show-processes-dialog-app-list-item {
-  color: #ccc; }
-
-.show-processes-dialog-app-list-item:hover {
-  color: white; }
-
-.show-processes-dialog-app-list-item:ltr {
-  padding-right: 1em; }
-
-.show-processes-dialog-app-list-item:rtl {
-  padding-left: 1em; }
-
-.show-processes-dialog-app-list-item-icon:ltr {
-  padding-right: 17px; }
-
-.show-processes-dialog-app-list-item-icon:rtl {
-  padding-left: 17px; }
-
-.show-processes-dialog-app-list-item-name {
-  font-size: 10pt; }
-
-/* Password or Authentication Dialog */
-.prompt-dialog {
-  /* this is the width of the entire modal popup */
-  width: 500px; }
-
-.prompt-dialog-main-layout {
-  spacing: 24px;
-  padding: 10px; }
-
-.prompt-dialog-message-layout {
-  spacing: 16px; }
-
-.prompt-dialog-headline {
-  font-size: 12pt;
-  font-weight: bold;
-  color: #666666; }
-
-.prompt-dialog-description:rtl {
-  text-align: right; }
-
-.prompt-dialog-password-box {
-  spacing: 1em;
-  padding-bottom: 1em; }
-
-.prompt-dialog-error-label {
-  font-size: 10pt;
-  color: #ffff00;
-  padding-bottom: 8px; }
-
-.prompt-dialog-info-label {
-  font-size: 10pt;
-  padding-bottom: 8px; }
-
-.hidden {
-  color: transparent; }
-
-.prompt-dialog-null-label {
-  font-size: 10pt;
-  padding-bottom: 8px; }
-
-/* Polkit Dialog */
-.polkit-dialog-user-layout {
-  padding-left: 10px;
-  spacing: 10px; }
-
-.polkit-dialog-user-layout:rtl {
-  padding-left: 0px;
-  padding-right: 10px; }
-
-.polkit-dialog-user-root-label {
-  color: #ff0000; }
-
-.polkit-dialog-user-icon {
-  border: 2px solid #8b8b8b;
-  border-radius: 5px;
-  background-size: contain;
-  width: 48px;
-  height: 48px; }
-
-/* Network Agent Dialog */
-.network-dialog-secret-table {
-  spacing-rows: 15px;
-  spacing-columns: 1em; }
-
-.keyring-dialog-control-table {
-  spacing-rows: 15px;
-  spacing-columns: 1em; }
-
 /* Magnifier */
 .magnifier-zoom-region {
   border: 2px solid maroon; }
@@ -687,6 +552,9 @@ StScrollBar {
     color: #74aae2; }
 
 /* Modal Dialogs */
+.headline {
+  font-size: 110%; }
+
 .lightbox {
   background-color: black; }
 
@@ -784,6 +652,129 @@ StScrollBar {
   color: #f2f2f2;
   font-size: 10pt; }
 
+/* ShellMountOperation Dialogs */
+.shell-mount-operation-icon {
+  icon-size: 48px; }
+
+.show-processes-dialog,
+.mount-question-dialog {
+  spacing: 24px; }
+
+.show-processes-dialog-subject,
+.mount-question-dialog-subject {
+  padding-top: 10px;
+  padding-left: 17px;
+  padding-bottom: 6px; }
+
+.mount-question-dialog-subject {
+  max-width: 500px; }
+
+.show-processes-dialog-subject:rtl,
+.mount-question-dialog-subject:rtl {
+  padding-left: 0px;
+  padding-right: 17px; }
+
+.show-processes-dialog-description,
+.mount-question-dialog-description {
+  padding-left: 17px;
+  width: 28em; }
+
+.show-processes-dialog-description:rtl,
+.mount-question-dialog-description:rtl {
+  padding-right: 17px; }
+
+.show-processes-dialog-app-list {
+  max-height: 200px;
+  padding-top: 24px;
+  padding-left: 49px;
+  padding-right: 32px; }
+
+.show-processes-dialog-app-list:rtl {
+  padding-right: 49px;
+  padding-left: 32px; }
+
+.show-processes-dialog-app-list-item {
+  color: #e6e6e6; }
+  .show-processes-dialog-app-list-item:hover {
+    color: #fff; }
+  .show-processes-dialog-app-list-item:ltr {
+    padding-right: 1em; }
+  .show-processes-dialog-app-list-item:rtl {
+    padding-left: 1em; }
+
+.show-processes-dialog-app-list-item-icon:ltr {
+  padding-right: 17px; }
+.show-processes-dialog-app-list-item-icon:rtl {
+  padding-left: 17px; }
+
+.show-processes-dialog-app-list-item-name {
+  font-size: 10pt; }
+
+/* Password or Authentication Dialog */
+.prompt-dialog {
+  width: 500px;
+  border: 3px solid rgba(255, 255, 255, 0.2); }
+
+.prompt-dialog-main-layout {
+  spacing: 24px;
+  padding: 10px; }
+
+.prompt-dialog-message-layout {
+  spacing: 16px; }
+
+.prompt-dialog-headline {
+  font-weight: bold;
+  color: #b3b3b3; }
+
+.prompt-dialog-description:rtl {
+  text-align: right; }
+
+.prompt-dialog-password-box {
+  spacing: 1em;
+  padding-bottom: 1em; }
+
+.prompt-dialog-error-label {
+  font-size: 10pt;
+  color: #cc0000;
+  padding-bottom: 8px; }
+
+.prompt-dialog-info-label {
+  font-size: 10pt;
+  padding-bottom: 8px; }
+
+.hidden {
+  color: transparent; }
+
+.prompt-dialog-null-label {
+  font-size: 10pt;
+  padding-bottom: 8px; }
+
+/* Polkit Dialog */
+.polkit-dialog-user-layout {
+  padding-left: 10px;
+  spacing: 10px; }
+  .polkit-dialog-user-layout:rtl {
+    padding-left: 0px;
+    padding-right: 10px; }
+
+.polkit-dialog-user-root-label {
+  color: #f57900; }
+
+.polkit-dialog-user-icon {
+  border-radius: 5px;
+  background-size: contain;
+  width: 48px;
+  height: 48px; }
+
+/* Network Agent Dialog */
+.network-dialog-secret-table {
+  spacing-rows: 15px;
+  spacing-columns: 1em; }
+
+.keyring-dialog-control-table {
+  spacing-rows: 15px;
+  spacing-columns: 1em; }
+
 /* Popvers/Menus */
 .popup-menu {
   min-width: 200px; }
@@ -1184,7 +1175,6 @@ StScrollBar {
   spacing: 12px; }
 
 .nm-dialog-airplane-headline {
-  font-size: 110%;
   font-weight: bold;
   text-align: center; }
 
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index a7be3f1cb..4bb3f2d57 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -16,141 +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.
  */
-/* Restart message */
-.restart-message {
-  font-size: 14pt; }
-
-/* ShellMountOperation Dialogs */
-.shell-mount-operation-icon {
-  icon-size: 48px; }
-
-.show-processes-dialog,
-.mount-question-dialog {
-  spacing: 24px; }
-
-.show-processes-dialog-subject,
-.mount-question-dialog-subject {
-  padding-top: 10px;
-  padding-left: 17px;
-  padding-bottom: 6px; }
-
-.mount-question-dialog-subject {
-  max-width: 500px; }
-
-.show-processes-dialog-subject:rtl,
-.mount-question-dialog-subject:rtl {
-  padding-left: 0px;
-  padding-right: 17px; }
-
-.show-processes-dialog-description,
-.mount-question-dialog-description {
-  padding-left: 17px;
-  width: 28em; }
-
-.show-processes-dialog-description:rtl,
-.mount-question-dialog-description:rtl {
-  padding-right: 17px; }
-
-.show-processes-dialog-app-list {
-  font-size: 10pt;
-  max-height: 200px;
-  padding-top: 24px;
-  padding-left: 49px;
-  padding-right: 32px; }
-
-.show-processes-dialog-app-list:rtl {
-  padding-right: 49px;
-  padding-left: 32px; }
-
-.show-processes-dialog-app-list-item {
-  color: #ccc; }
-
-.show-processes-dialog-app-list-item:hover {
-  color: white; }
-
-.show-processes-dialog-app-list-item:ltr {
-  padding-right: 1em; }
-
-.show-processes-dialog-app-list-item:rtl {
-  padding-left: 1em; }
-
-.show-processes-dialog-app-list-item-icon:ltr {
-  padding-right: 17px; }
-
-.show-processes-dialog-app-list-item-icon:rtl {
-  padding-left: 17px; }
-
-.show-processes-dialog-app-list-item-name {
-  font-size: 10pt; }
-
-/* Password or Authentication Dialog */
-.prompt-dialog {
-  /* this is the width of the entire modal popup */
-  width: 500px; }
-
-.prompt-dialog-main-layout {
-  spacing: 24px;
-  padding: 10px; }
-
-.prompt-dialog-message-layout {
-  spacing: 16px; }
-
-.prompt-dialog-headline {
-  font-size: 12pt;
-  font-weight: bold;
-  color: #666666; }
-
-.prompt-dialog-description:rtl {
-  text-align: right; }
-
-.prompt-dialog-password-box {
-  spacing: 1em;
-  padding-bottom: 1em; }
-
-.prompt-dialog-error-label {
-  font-size: 10pt;
-  color: #ffff00;
-  padding-bottom: 8px; }
-
-.prompt-dialog-info-label {
-  font-size: 10pt;
-  padding-bottom: 8px; }
-
-.hidden {
-  color: transparent; }
-
-.prompt-dialog-null-label {
-  font-size: 10pt;
-  padding-bottom: 8px; }
-
-/* Polkit Dialog */
-.polkit-dialog-user-layout {
-  padding-left: 10px;
-  spacing: 10px; }
-
-.polkit-dialog-user-layout:rtl {
-  padding-left: 0px;
-  padding-right: 10px; }
-
-.polkit-dialog-user-root-label {
-  color: #ff0000; }
-
-.polkit-dialog-user-icon {
-  border: 2px solid #8b8b8b;
-  border-radius: 5px;
-  background-size: contain;
-  width: 48px;
-  height: 48px; }
-
-/* Network Agent Dialog */
-.network-dialog-secret-table {
-  spacing-rows: 15px;
-  spacing-columns: 1em; }
-
-.keyring-dialog-control-table {
-  spacing-rows: 15px;
-  spacing-columns: 1em; }
-
 /* Magnifier */
 .magnifier-zoom-region {
   border: 2px solid maroon; }
@@ -687,6 +552,9 @@ StScrollBar {
     color: #74aae2; }
 
 /* Modal Dialogs */
+.headline {
+  font-size: 110%; }
+
 .lightbox {
   background-color: black; }
 
@@ -784,6 +652,129 @@ StScrollBar {
   color: #e2e2df;
   font-size: 10pt; }
 
+/* ShellMountOperation Dialogs */
+.shell-mount-operation-icon {
+  icon-size: 48px; }
+
+.show-processes-dialog,
+.mount-question-dialog {
+  spacing: 24px; }
+
+.show-processes-dialog-subject,
+.mount-question-dialog-subject {
+  padding-top: 10px;
+  padding-left: 17px;
+  padding-bottom: 6px; }
+
+.mount-question-dialog-subject {
+  max-width: 500px; }
+
+.show-processes-dialog-subject:rtl,
+.mount-question-dialog-subject:rtl {
+  padding-left: 0px;
+  padding-right: 17px; }
+
+.show-processes-dialog-description,
+.mount-question-dialog-description {
+  padding-left: 17px;
+  width: 28em; }
+
+.show-processes-dialog-description:rtl,
+.mount-question-dialog-description:rtl {
+  padding-right: 17px; }
+
+.show-processes-dialog-app-list {
+  max-height: 200px;
+  padding-top: 24px;
+  padding-left: 49px;
+  padding-right: 32px; }
+
+.show-processes-dialog-app-list:rtl {
+  padding-right: 49px;
+  padding-left: 32px; }
+
+.show-processes-dialog-app-list-item {
+  color: #d6d6d1; }
+  .show-processes-dialog-app-list-item:hover {
+    color: #eeeeec; }
+  .show-processes-dialog-app-list-item:ltr {
+    padding-right: 1em; }
+  .show-processes-dialog-app-list-item:rtl {
+    padding-left: 1em; }
+
+.show-processes-dialog-app-list-item-icon:ltr {
+  padding-right: 17px; }
+.show-processes-dialog-app-list-item-icon:rtl {
+  padding-left: 17px; }
+
+.show-processes-dialog-app-list-item-name {
+  font-size: 10pt; }
+
+/* Password or Authentication Dialog */
+.prompt-dialog {
+  width: 500px;
+  border: 3px solid rgba(238, 238, 236, 0.2); }
+
+.prompt-dialog-main-layout {
+  spacing: 24px;
+  padding: 10px; }
+
+.prompt-dialog-message-layout {
+  spacing: 16px; }
+
+.prompt-dialog-headline {
+  font-weight: bold;
+  color: #a6a69b; }
+
+.prompt-dialog-description:rtl {
+  text-align: right; }
+
+.prompt-dialog-password-box {
+  spacing: 1em;
+  padding-bottom: 1em; }
+
+.prompt-dialog-error-label {
+  font-size: 10pt;
+  color: #cc0000;
+  padding-bottom: 8px; }
+
+.prompt-dialog-info-label {
+  font-size: 10pt;
+  padding-bottom: 8px; }
+
+.hidden {
+  color: transparent; }
+
+.prompt-dialog-null-label {
+  font-size: 10pt;
+  padding-bottom: 8px; }
+
+/* Polkit Dialog */
+.polkit-dialog-user-layout {
+  padding-left: 10px;
+  spacing: 10px; }
+  .polkit-dialog-user-layout:rtl {
+    padding-left: 0px;
+    padding-right: 10px; }
+
+.polkit-dialog-user-root-label {
+  color: #f57900; }
+
+.polkit-dialog-user-icon {
+  border-radius: 5px;
+  background-size: contain;
+  width: 48px;
+  height: 48px; }
+
+/* Network Agent Dialog */
+.network-dialog-secret-table {
+  spacing-rows: 15px;
+  spacing-columns: 1em; }
+
+.keyring-dialog-control-table {
+  spacing-rows: 15px;
+  spacing-columns: 1em; }
+
 /* Popvers/Menus */
 .popup-menu {
   min-width: 200px; }
@@ -1184,7 +1175,6 @@ StScrollBar {
   spacing: 12px; }
 
 .nm-dialog-airplane-headline {
-  font-size: 110%;
   font-weight: bold;
   text-align: center; }
 
diff --git a/js/ui/components/keyring.js b/js/ui/components/keyring.js
index 0d99cf046..ed9936011 100644
--- a/js/ui/components/keyring.js
+++ b/js/ui/components/keyring.js
@@ -41,7 +41,7 @@ const KeyringDialog = new Lang.Class({
         mainContentBox.add(this._messageBox,
                            { y_align: St.Align.START, expand: true, x_fill: true, y_fill: true });
 
-        let subject = new St.Label({ style_class: 'prompt-dialog-headline' });
+        let subject = new St.Label({ style_class: 'prompt-dialog-headline headline' });
         this.prompt.bind_property('message', subject, 'text', GObject.BindingFlags.SYNC_CREATE);
 
         this._messageBox.add(subject,
diff --git a/js/ui/components/networkAgent.js b/js/ui/components/networkAgent.js
index 2a3412d45..2df5ddf2b 100644
--- a/js/ui/components/networkAgent.js
+++ b/js/ui/components/networkAgent.js
@@ -54,7 +54,7 @@ const NetworkSecretDialog = new Lang.Class({
         mainContentBox.add(messageBox,
                            { y_align: St.Align.START });
 
-        let subjectLabel = new St.Label({ style_class: 'prompt-dialog-headline',
+        let subjectLabel = new St.Label({ style_class: 'prompt-dialog-headline headline',
                                             text: this._content.title });
         messageBox.add(subjectLabel,
                        { y_fill:  false,
diff --git a/js/ui/components/polkitAgent.js b/js/ui/components/polkitAgent.js
index 85558d386..038bf9ccd 100644
--- a/js/ui/components/polkitAgent.js
+++ b/js/ui/components/polkitAgent.js
@@ -50,7 +50,7 @@ const AuthenticationDialog = new Lang.Class({
         mainContentBox.add(messageBox,
                            { expand: true, y_align: St.Align.START });
 
-        this._subjectLabel = new St.Label({ style_class: 'prompt-dialog-headline',
+        this._subjectLabel = new St.Label({ style_class: 'prompt-dialog-headline headline',
                                             text: _("Authentication Required") });
 
         messageBox.add(this._subjectLabel,
diff --git a/js/ui/main.js b/js/ui/main.js
index 385a73d34..2fb674c87 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -653,7 +653,7 @@ const RestartMessage = new Lang.Class({
 
     _init : function(message) {
         this.parent({ shellReactive: true,
-                      styleClass: 'restart-message',
+                      styleClass: 'restart-message headline',
                       shouldFadeIn: false,
                       destroyOnClose: true });
 
diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 459d51dd5..dffd69d96 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -888,7 +888,7 @@ const NMWirelessDialog = new Lang.Class({
                                                x_align: Clutter.ActorAlign.CENTER,
                                                y_align: Clutter.ActorAlign.CENTER });
         this._airplaneIcon = new St.Icon({ icon_size: 48 });
-        this._airplaneHeadline = new St.Label({ style_class: 'nm-dialog-airplane-headline' });
+        this._airplaneHeadline = new St.Label({ style_class: 'nm-dialog-airplane-headline headline' });
         this._airplaneText = new St.Label({ style_class: 'nm-dialog-airplane-text' });
 
         let airplaneSubStack = new St.Widget({ layout_manager: new Clutter.BinLayout });