diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 44bf764eb..76c50ef69 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -1220,17 +1220,17 @@ StButton.popup-menu-item:insensitive {
     padding-bottom: 12px;
 }
 
-#summary-notification-stack-scrollview {
+.summary-notification-stack-scrollview {
     max-height: 18em;
     padding-top: 6px;
     padding-bottom: 6px;
 }
 
-#summary-notification-stack-scrollview:ltr {
+.summary-notification-stack-scrollview:ltr {
     padding-right: 8px;
 }
 
-#summary-notification-stack-scrollview:rtl {
+.summary-notification-stack-scrollview:rtl {
     padding-left: 8px;
 }
 
@@ -2216,6 +2216,7 @@ StButton.popup-menu-item:insensitive {
     text-shadow: 0px 1px 2px rgba(0,0,0,0.6);
     font-weight: bold;
     text-align: center;
+    padding-bottom: 1.5em;
 }
 
 .screen-shield-clock-time {
@@ -2232,14 +2233,15 @@ StButton.popup-menu-item:insensitive {
     background-color: rgba(0.0, 0.0, 0.0, 0.9);
     border: 2px solid #868686;
     max-height: 500px;
+    padding: 12px 0;
 }
 
 .screen-shield-notifications-box {
-    spacing: 8px;
+    spacing: 12px;
 }
 
 .screen-shield-notification-source {
-    padding: 24px 8px;
+    padding: 0 24px;
     spacing: 5px;
 }
 
@@ -2254,3 +2256,12 @@ StButton.popup-menu-item:insensitive {
 .screen-shield-notifications-box .notification {
     background-color: transparent;
 }
+
+/* Override padding on resident notifications, since
+   the notifications box has its own spacing
+*/
+.screen-shield-notifications-box .summary-notification-stack-scrollview {
+    padding-top: 0px;
+    padding-bottom: 0px;
+}
+
diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index d7b764742..762f16864 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -1284,12 +1284,12 @@ const SummaryItem = new Lang.Class({
         this._sourceBox.add(this._sourceTitleBin, { expand: true, y_fill: false });
         this.actor.child = this._sourceBox;
 
-        this.notificationStackView = new St.ScrollView({ name: source.isChat ? '' : 'summary-notification-stack-scrollview',
+        this.notificationStackView = new St.ScrollView({ style_class: source.isChat ? '' : 'summary-notification-stack-scrollview',
                                                          vscrollbar_policy: source.isChat ? Gtk.PolicyType.NEVER : Gtk.PolicyType.AUTOMATIC,
-                                                         hscrollbar_policy: Gtk.PolicyType.NEVER,
-                                                         style_class: 'vfade' });
-        this.notificationStack = new St.BoxLayout({ name: 'summary-notification-stack',
-                                                     vertical: true });
+                                                         hscrollbar_policy: Gtk.PolicyType.NEVER });
+        this.notificationStackView.add_style_class_name('vfade');
+        this.notificationStack = new St.BoxLayout({ style_class: 'summary-notification-stack',
+                                                    vertical: true });
         this.notificationStackView.add_actor(this.notificationStack);
         this._stackedNotifications = [];
 
diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index d25445055..73e0676e7 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -136,7 +136,7 @@ const NotificationsBox = new Lang.Class({
         box.add(sourceActor.actor, { y_fill: true });
 
         let textBox = new St.BoxLayout({ vertical: true });
-        box.add(textBox, { y_fill: true, expand: true });
+        box.add(textBox);
 
         let label = new St.Label({ text: source.title,
                                    style_class: 'screen-shield-notification-label' });