diff --git a/data/theme/gnome-shell-high-contrast.css b/data/theme/gnome-shell-high-contrast.css
index ab7528ea2..d260af137 100644
--- a/data/theme/gnome-shell-high-contrast.css
+++ b/data/theme/gnome-shell-high-contrast.css
@@ -151,7 +151,8 @@ StScrollBar {
 
 /* Modal Dialogs */
 .headline {
-  font-size: 110%; }
+  font-size: 110%;
+  color: #d6d6d1; }
 
 .lightbox {
   background-color: black; }
@@ -323,8 +324,7 @@ StScrollBar {
   spacing: 16px; }
 
 .prompt-dialog-headline {
-  font-weight: bold;
-  color: #bebeb6; }
+  font-weight: bold; }
 
 .prompt-dialog-description:rtl {
   text-align: right; }
@@ -553,9 +553,7 @@ StScrollBar {
   font-weight: bold;
   height: 1.86em; }
   #panel.unlock-screen, #panel.login-screen, #panel.lock-screen {
-    background-color: transparent;
-    background-gradient-start: transparent;
-    background-gradient-end: transparent; }
+    background-color: transparent; }
   #panel #panelLeft, #panel #panelCenter {
     spacing: 4px; }
   #panel .panel-corner {
@@ -565,7 +563,7 @@ StScrollBar {
     -panel-corner-border-color: transparent; }
     #panel .panel-corner:active, #panel .panel-corner:overview, #panel .panel-corner:focus {
       -panel-corner-border-color: #256ab1; }
-    #panel .panel-corner.lock-screen, #panel .panel-corner.login-screen, #panel .panel-corner.unlock-screen {
+    #panel .panel-corner.lock-screen, #panel .panel-corner.login-screen, #panel .panel-cornerunlock-screen {
       -panel-corner-radius: 0;
       -panel-corner-background-color: transparent;
       -panel-corner-border-color: transparent; }
diff --git a/data/theme/gnome-shell-sass b/data/theme/gnome-shell-sass
index 52dbed90a..36b871035 160000
--- a/data/theme/gnome-shell-sass
+++ b/data/theme/gnome-shell-sass
@@ -1 +1 @@
-Subproject commit 52dbed90aea05fc8a3ce6ec39de4a64fb949518c
+Subproject commit 36b87103582b87e30a8b36afe15aa5a9aa1df769
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 28270b872..5ea258f8d 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -151,7 +151,8 @@ StScrollBar {
 
 /* Modal Dialogs */
 .headline {
-  font-size: 110%; }
+  font-size: 110%;
+  color: #d6d6d1; }
 
 .lightbox {
   background-color: black; }
@@ -323,8 +324,7 @@ StScrollBar {
   spacing: 16px; }
 
 .prompt-dialog-headline {
-  font-weight: bold;
-  color: #bebeb6; }
+  font-weight: bold; }
 
 .prompt-dialog-description:rtl {
   text-align: right; }
@@ -553,9 +553,7 @@ StScrollBar {
   font-weight: bold;
   height: 1.86em; }
   #panel.unlock-screen, #panel.login-screen, #panel.lock-screen {
-    background-color: transparent;
-    background-gradient-start: transparent;
-    background-gradient-end: transparent; }
+    background-color: transparent; }
   #panel #panelLeft, #panel #panelCenter {
     spacing: 4px; }
   #panel .panel-corner {
@@ -565,7 +563,7 @@ StScrollBar {
     -panel-corner-border-color: transparent; }
     #panel .panel-corner:active, #panel .panel-corner:overview, #panel .panel-corner:focus {
       -panel-corner-border-color: #256ab1; }
-    #panel .panel-corner.lock-screen, #panel .panel-corner.login-screen, #panel .panel-corner.unlock-screen {
+    #panel .panel-corner.lock-screen, #panel .panel-corner.login-screen, #panel .panel-cornerunlock-screen {
       -panel-corner-radius: 0;
       -panel-corner-background-color: transparent;
       -panel-corner-border-color: transparent; }
diff --git a/js/ui/extensionDownloader.js b/js/ui/extensionDownloader.js
index 6102eb15c..602b49684 100644
--- a/js/ui/extensionDownloader.js
+++ b/js/ui/extensionDownloader.js
@@ -211,7 +211,7 @@ const InstallExtensionDialog = new Lang.Class({
         let icon = new St.Icon({ gicon: gicon });
         box.add(icon);
 
-        let label = new St.Label({ style_class: 'prompt-dialog-headline',
+        let label = new St.Label({ style_class: 'prompt-dialog-headline headline',
                                    text: message });
         box.add(label);
     },
diff --git a/js/ui/shellMountOperation.js b/js/ui/shellMountOperation.js
index 522ae0856..413f196b2 100644
--- a/js/ui/shellMountOperation.js
+++ b/js/ui/shellMountOperation.js
@@ -347,7 +347,7 @@ const ShellMountPasswordDialog = 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._messageBox.add(subject,
                              { y_fill:  false,
                                y_align: St.Align.START });
diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index d04455b9f..dc1667786 100644
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -61,7 +61,7 @@ const DisplayChangeDialog = new Lang.Class({
         mainContentBox.add(messageBox,
                            { expand: true, 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: _("Do you want to keep these display settings?") });
         messageBox.add(subjectLabel,
                        { y_fill:  false,