diff --git a/data/theme/_common.scss b/data/theme/_common.scss
index afa4c8625..72234b6ce 100644
--- a/data/theme/_common.scss
+++ b/data/theme/_common.scss
@@ -31,7 +31,7 @@ $font-size: 11;
 $font-family: Cantarell, Sans-Serif;
 $_bubble_bg_color: transparentize($osd_borders_color,.2);
 $_bubble_fg_color: $osd_fg_color;
-$_bubble_border_color: $osd_outer_borders_color;
+$_bubble_border_color: opacify($osd_outer_borders_color, 0.1);
 
 stage {
   font-family: $font-family;
@@ -1670,33 +1670,25 @@ StScrollBar {
 .screen-shield-clock-date { font-size: 28pt; }
 
 .screen-shield-notifications-container {
-  spacing: 20px;
+  spacing: 6px;
   width: 30em;
   background-color: transparent;
   max-height: 500px;
   .summary-notification-stack-scrollview {
     padding-top: 0;
     padding-bottom: 0;
-  }
-  .notification-button, .notification-icon-button { border: 1px solid transparentize($fg_color,0.5); }
-  .notification, .screen-shield-notifications-box {
-    background-color: transparentize($_bubble_bg_color,0.5);
-    color: $fg_color;
+  }  
+
+  .screen-shield-notification-source {
+    padding: 12px 6px;
     border: 1px solid $_bubble_border_color;
-    margin: 6px 0;
-    padding: 12px;
-    spacing: 24px; //FIXME I need a proper margin so the items are spaced with transparency
+    background-color: $_bubble_bg_color;
+    color: $_bubble_fg_color;
+    border-radius: 4px;
   }
+
 }
 
-.screen-shield-notification-source {
-  padding: 12px 6px;
-  border-width: 2px;
-  border-radius: 5px;
-  border-color: white;
-  background-color: transparentize($bg_color,0.7);
-  spacing: 5px;
-}
 
 .screen-shield-notification-label {
   font-weight: bold;
diff --git a/data/theme/gnome-shell-high-contrast.css b/data/theme/gnome-shell-high-contrast.css
index 1781bc4f3..0a1e48780 100644
--- a/data/theme/gnome-shell-high-contrast.css
+++ b/data/theme/gnome-shell-high-contrast.css
@@ -185,7 +185,7 @@ StScrollBar {
 /* End Session Dialog */
 .end-session-dialog {
   spacing: 42px;
-  border: 3px solid rgba(255, 255, 255, 0.1); }
+  border: 3px solid rgba(255, 255, 255, 0.2); }
 
 .end-session-dialog-list {
   padding-top: 20px; }
@@ -307,7 +307,7 @@ StScrollBar {
 /* Password or Authentication Dialog */
 .prompt-dialog {
   width: 500px;
-  border: 3px solid rgba(255, 255, 255, 0.1); }
+  border: 3px solid rgba(255, 255, 255, 0.2); }
 
 .prompt-dialog-main-layout {
   spacing: 24px;
@@ -515,7 +515,7 @@ StScrollBar {
 .switcher-list, .workspace-switcher-container {
   color: #eeeeec;
   background-color: rgba(0, 0, 0, 0.5);
-  border: 1px solid rgba(255, 255, 255, 0.1);
+  border: 1px solid rgba(255, 255, 255, 0.2);
   border-radius: 12px;
   padding: 12px; }
 
@@ -601,7 +601,7 @@ StScrollBar {
 .calendar-vertical-separator {
   width: .3em;
   -stipple-width: 1px;
-  -stipple-color: rgba(255, 255, 255, 0.1); }
+  -stipple-color: rgba(255, 255, 255, 0.2); }
 
 .calendar-month-label {
   color: #f2f2f2;
@@ -1090,7 +1090,7 @@ StScrollBar {
 #dash, .workspace-thumbnails {
   color: #eeeeec;
   background-color: rgba(0, 0, 0, 0.5);
-  border: 1px solid rgba(255, 255, 255, 0.1); }
+  border: 1px solid rgba(255, 255, 255, 0.2); }
 
 .search-statustext, .no-frequent-applications-label {
   font-size: 2em;
@@ -1356,7 +1356,7 @@ StScrollBar {
   -arrow-border-radius: 10px;
   -arrow-background-color: rgba(46, 52, 54, 0.7);
   -arrow-border-width: 2px;
-  -arrow-border-color: rgba(255, 255, 255, 0.1);
+  -arrow-border-color: rgba(255, 255, 255, 0.2);
   -arrow-base: 20px;
   -arrow-rise: 10px;
   -boxpointer-gap: 5px; }
@@ -1558,30 +1558,19 @@ StScrollBar {
   font-size: 28pt; }
 
 .screen-shield-notifications-container {
-  spacing: 20px;
+  spacing: 6px;
   width: 30em;
   background-color: transparent;
   max-height: 500px; }
   .screen-shield-notifications-container .summary-notification-stack-scrollview {
     padding-top: 0;
     padding-bottom: 0; }
-  .screen-shield-notifications-container .notification-button, .screen-shield-notifications-container .notification-icon-button {
-    border: 1px solid rgba(255, 255, 255, 0.5); }
-  .screen-shield-notifications-container .notification, .screen-shield-notifications-container .screen-shield-notifications-box {
-    background-color: transparent;
-    color: #fff;
-    border: 1px solid rgba(255, 255, 255, 0.1);
-    margin: 6px 0;
-    padding: 12px;
-    spacing: 24px; }
-
-.screen-shield-notification-source {
-  padding: 12px 6px;
-  border-width: 2px;
-  border-radius: 5px;
-  border-color: white;
-  background-color: rgba(0, 0, 0, 0.3);
-  spacing: 5px; }
+  .screen-shield-notifications-container .screen-shield-notification-source {
+    padding: 12px 6px;
+    border: 1px solid rgba(255, 255, 255, 0.2);
+    background-color: rgba(0, 0, 0, 0.5);
+    color: #eeeeec;
+    border-radius: 4px; }
 
 .screen-shield-notification-label {
   font-weight: bold;
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 340640c9c..c14e09b69 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -185,7 +185,7 @@ StScrollBar {
 /* End Session Dialog */
 .end-session-dialog {
   spacing: 42px;
-  border: 3px solid rgba(255, 255, 255, 0.1); }
+  border: 3px solid rgba(255, 255, 255, 0.2); }
 
 .end-session-dialog-list {
   padding-top: 20px; }
@@ -307,7 +307,7 @@ StScrollBar {
 /* Password or Authentication Dialog */
 .prompt-dialog {
   width: 500px;
-  border: 3px solid rgba(255, 255, 255, 0.1); }
+  border: 3px solid rgba(255, 255, 255, 0.2); }
 
 .prompt-dialog-main-layout {
   spacing: 24px;
@@ -515,7 +515,7 @@ StScrollBar {
 .switcher-list, .workspace-switcher-container {
   color: #eeeeec;
   background-color: rgba(0, 0, 0, 0.5);
-  border: 1px solid rgba(255, 255, 255, 0.1);
+  border: 1px solid rgba(255, 255, 255, 0.2);
   border-radius: 12px;
   padding: 12px; }
 
@@ -601,7 +601,7 @@ StScrollBar {
 .calendar-vertical-separator {
   width: .3em;
   -stipple-width: 1px;
-  -stipple-color: rgba(255, 255, 255, 0.1); }
+  -stipple-color: rgba(255, 255, 255, 0.2); }
 
 .calendar-month-label {
   color: #e2e2df;
@@ -1082,7 +1082,7 @@ StScrollBar {
 #dash, .workspace-thumbnails {
   color: #eeeeec;
   background-color: rgba(0, 0, 0, 0.5);
-  border: 1px solid rgba(255, 255, 255, 0.1); }
+  border: 1px solid rgba(255, 255, 255, 0.2); }
 
 .search-statustext, .no-frequent-applications-label {
   font-size: 2em;
@@ -1348,7 +1348,7 @@ StScrollBar {
   -arrow-border-radius: 10px;
   -arrow-background-color: rgba(46, 52, 54, 0.7);
   -arrow-border-width: 2px;
-  -arrow-border-color: rgba(255, 255, 255, 0.1);
+  -arrow-border-color: rgba(255, 255, 255, 0.2);
   -arrow-base: 20px;
   -arrow-rise: 10px;
   -boxpointer-gap: 5px; }
@@ -1550,30 +1550,19 @@ StScrollBar {
   font-size: 28pt; }
 
 .screen-shield-notifications-container {
-  spacing: 20px;
+  spacing: 6px;
   width: 30em;
   background-color: transparent;
   max-height: 500px; }
   .screen-shield-notifications-container .summary-notification-stack-scrollview {
     padding-top: 0;
     padding-bottom: 0; }
-  .screen-shield-notifications-container .notification-button, .screen-shield-notifications-container .notification-icon-button {
-    border: 1px solid rgba(238, 238, 236, 0.5); }
-  .screen-shield-notifications-container .notification, .screen-shield-notifications-container .screen-shield-notifications-box {
-    background-color: transparent;
+  .screen-shield-notifications-container .screen-shield-notification-source {
+    padding: 12px 6px;
+    border: 1px solid rgba(255, 255, 255, 0.2);
+    background-color: rgba(0, 0, 0, 0.5);
     color: #eeeeec;
-    border: 1px solid rgba(255, 255, 255, 0.1);
-    margin: 6px 0;
-    padding: 12px;
-    spacing: 24px; }
-
-.screen-shield-notification-source {
-  padding: 12px 6px;
-  border-width: 2px;
-  border-radius: 5px;
-  border-color: white;
-  background-color: rgba(57, 63, 63, 0.3);
-  spacing: 5px; }
+    border-radius: 4px; }
 
 .screen-shield-notification-label {
   font-weight: bold;