diff --git a/data/theme/_common.scss b/data/theme/_common.scss
index 4c00f013a..4c14e8803 100644
--- a/data/theme/_common.scss
+++ b/data/theme/_common.scss
@@ -182,6 +182,84 @@ StScrollBar {
     font-size: fontsize($font-size * 1.3);
   }
 
+/* End Session Dialog */
+.end-session-dialog {
+    spacing: 42px;
+    border: 3px solid transparentize($fg_color,0.8);
+}
+
+  .end-session-dialog-list {
+      padding-top: 20px;
+  }
+
+  .end-session-dialog-layout {
+    padding-left: 17px;
+    &:rtl { padding-right: 17px; }
+  }
+
+  .end-session-dialog-description {
+    width: 28em;
+    padding-bottom: 10px;
+    &:rtl {
+      text-align: right;
+    }
+  }
+
+  .end-session-dialog-warning {
+    width: 28em;
+    color: $warning_color;
+    padding-top: 6px;
+    &:rtl {
+      text-align: right;
+    }
+  }
+
+  .end-session-dialog-logout-icon {
+    //border: 2px solid #8b8b8b;
+    border-radius: 5px;
+    width: 48px;
+    height: 48px;
+    background-size: contain;
+  }
+
+  .end-session-dialog-shutdown-icon {
+    color: $fg_color;
+    width: 48px;
+    height: 48px;
+  }
+
+  .end-session-dialog-inhibitor-layout {
+    spacing: 16px;
+    max-height: 200px;
+    padding-right: 65px;
+    padding-left: 65px;
+  }
+
+  .end-session-dialog-session-list,
+  .end-session-dialog-app-list {
+    spacing: 1em;
+  }
+
+  .end-session-dialog-list-header {
+    font-weight: bold;
+    &:rtl { text-align: right; }
+  }
+
+  .end-session-dialog-app-list-item,
+  .end-session-dialog-session-list-item {
+    spacing: 1em;
+  }
+
+  .end-session-dialog-app-list-item-name,
+  .end-session-dialog-session-list-item-name {
+    font-weight: bold;
+  }
+
+  .end-session-dialog-app-list-item-description {
+    color: darken($fg_color,5%);
+    font-size: 10pt;
+  }
+
 /* Popvers/Menus */
 
 .popup-menu {
diff --git a/data/theme/_gnome-shell-old.scss b/data/theme/_gnome-shell-old.scss
index 0fb18cb59..0d70b94d5 100644
--- a/data/theme/_gnome-shell-old.scss
+++ b/data/theme/_gnome-shell-old.scss
@@ -24,95 +24,7 @@
 
 
 
-/* End Session Dialog */
-.end-session-dialog {
-    spacing: 42px;
-}
 
-.end-session-dialog-list {
-    padding-top: 20px;
-}
-
-.end-session-dialog-layout {
-    padding-left: 17px;
-}
-
-.end-session-dialog-layout:rtl {
-    padding-right: 17px;
-}
-
-.end-session-dialog-description {
-    width: 28em;
-    padding-bottom: 10px;
-}
-
-.end-session-dialog-description:rtl {
-    width: 28em;
-    padding-bottom: 10px;
-    text-align: right;
-}
-
-.end-session-dialog-warning {
-    width: 28em;
-    color: #f57900;
-    padding-top: 6px;
-}
-
-.end-session-dialog-warning:rtl {
-    width: 28em;
-    color: #f57900;
-    padding-top: 6px;
-    text-align: right;
-}
-
-.end-session-dialog-logout-icon {
-    border: 2px solid #8b8b8b;
-    border-radius: 5px;
-    width: 48px;
-    height: 48px;
-    background-size: contain;
-}
-
-.end-session-dialog-shutdown-icon {
-    color: #bebebe;
-    width: 48px;
-    height: 48px;
-}
-
-.end-session-dialog-inhibitor-layout {
-    spacing: 16px;
-    max-height: 200px;
-    padding-right: 65px;
-    padding-left: 65px;
-}
-
-.end-session-dialog-session-list,
-.end-session-dialog-app-list {
-    spacing: 1em;
-}
-
-.end-session-dialog-list-header {
-    font-weight: bold;
-}
-
-.end-session-dialog-list-header:rtl {
-    text-align: right;
-}
-
-.end-session-dialog-app-list-item,
-.end-session-dialog-session-list-item {
-    spacing: 1em;
-}
-
-.end-session-dialog-app-list-item-name,
-.end-session-dialog-session-list-item-name {
-    font-weight: bold;
-}
-
-.end-session-dialog-app-list-item-description {
-    color: #cccccc;
-    font-size: 10pt;
-}
 
 /* Restart message */
 .restart-message {
diff --git a/data/theme/gnome-shell-high-contrast.css b/data/theme/gnome-shell-high-contrast.css
index 763ac216b..c83f6ec3f 100644
--- a/data/theme/gnome-shell-high-contrast.css
+++ b/data/theme/gnome-shell-high-contrast.css
@@ -16,79 +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.
  */
-/* End Session Dialog */
-.end-session-dialog {
-  spacing: 42px; }
-
-.end-session-dialog-list {
-  padding-top: 20px; }
-
-.end-session-dialog-layout {
-  padding-left: 17px; }
-
-.end-session-dialog-layout:rtl {
-  padding-right: 17px; }
-
-.end-session-dialog-description {
-  width: 28em;
-  padding-bottom: 10px; }
-
-.end-session-dialog-description:rtl {
-  width: 28em;
-  padding-bottom: 10px;
-  text-align: right; }
-
-.end-session-dialog-warning {
-  width: 28em;
-  color: #f57900;
-  padding-top: 6px; }
-
-.end-session-dialog-warning:rtl {
-  width: 28em;
-  color: #f57900;
-  padding-top: 6px;
-  text-align: right; }
-
-.end-session-dialog-logout-icon {
-  border: 2px solid #8b8b8b;
-  border-radius: 5px;
-  width: 48px;
-  height: 48px;
-  background-size: contain; }
-
-.end-session-dialog-shutdown-icon {
-  color: #bebebe;
-  width: 48px;
-  height: 48px; }
-
-.end-session-dialog-inhibitor-layout {
-  spacing: 16px;
-  max-height: 200px;
-  padding-right: 65px;
-  padding-left: 65px; }
-
-.end-session-dialog-session-list,
-.end-session-dialog-app-list {
-  spacing: 1em; }
-
-.end-session-dialog-list-header {
-  font-weight: bold; }
-
-.end-session-dialog-list-header:rtl {
-  text-align: right; }
-
-.end-session-dialog-app-list-item,
-.end-session-dialog-session-list-item {
-  spacing: 1em; }
-
-.end-session-dialog-app-list-item-name,
-.end-session-dialog-session-list-item-name {
-  font-weight: bold; }
-
-.end-session-dialog-app-list-item-description {
-  color: #cccccc;
-  font-size: 10pt; }
-
 /* Restart message */
 .restart-message {
   font-size: 14pt; }
@@ -793,6 +720,70 @@ StScrollBar {
 .end-session-dialog-subject {
   font-size: fontsize(14.3); }
 
+/* End Session Dialog */
+.end-session-dialog {
+  spacing: 42px;
+  border: 3px solid rgba(255, 255, 255, 0.2); }
+
+.end-session-dialog-list {
+  padding-top: 20px; }
+
+.end-session-dialog-layout {
+  padding-left: 17px; }
+  .end-session-dialog-layout:rtl {
+    padding-right: 17px; }
+
+.end-session-dialog-description {
+  width: 28em;
+  padding-bottom: 10px; }
+  .end-session-dialog-description:rtl {
+    text-align: right; }
+
+.end-session-dialog-warning {
+  width: 28em;
+  color: #f57900;
+  padding-top: 6px; }
+  .end-session-dialog-warning:rtl {
+    text-align: right; }
+
+.end-session-dialog-logout-icon {
+  border-radius: 5px;
+  width: 48px;
+  height: 48px;
+  background-size: contain; }
+
+.end-session-dialog-shutdown-icon {
+  color: #fff;
+  width: 48px;
+  height: 48px; }
+
+.end-session-dialog-inhibitor-layout {
+  spacing: 16px;
+  max-height: 200px;
+  padding-right: 65px;
+  padding-left: 65px; }
+
+.end-session-dialog-session-list,
+.end-session-dialog-app-list {
+  spacing: 1em; }
+
+.end-session-dialog-list-header {
+  font-weight: bold; }
+  .end-session-dialog-list-header:rtl {
+    text-align: right; }
+
+.end-session-dialog-app-list-item,
+.end-session-dialog-session-list-item {
+  spacing: 1em; }
+
+.end-session-dialog-app-list-item-name,
+.end-session-dialog-session-list-item-name {
+  font-weight: bold; }
+
+.end-session-dialog-app-list-item-description {
+  color: #f2f2f2;
+  font-size: 10pt; }
+
 /* Popvers/Menus */
 .popup-menu {
   min-width: 200px; }
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index b8b599808..c6581de99 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -16,79 +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.
  */
-/* End Session Dialog */
-.end-session-dialog {
-  spacing: 42px; }
-
-.end-session-dialog-list {
-  padding-top: 20px; }
-
-.end-session-dialog-layout {
-  padding-left: 17px; }
-
-.end-session-dialog-layout:rtl {
-  padding-right: 17px; }
-
-.end-session-dialog-description {
-  width: 28em;
-  padding-bottom: 10px; }
-
-.end-session-dialog-description:rtl {
-  width: 28em;
-  padding-bottom: 10px;
-  text-align: right; }
-
-.end-session-dialog-warning {
-  width: 28em;
-  color: #f57900;
-  padding-top: 6px; }
-
-.end-session-dialog-warning:rtl {
-  width: 28em;
-  color: #f57900;
-  padding-top: 6px;
-  text-align: right; }
-
-.end-session-dialog-logout-icon {
-  border: 2px solid #8b8b8b;
-  border-radius: 5px;
-  width: 48px;
-  height: 48px;
-  background-size: contain; }
-
-.end-session-dialog-shutdown-icon {
-  color: #bebebe;
-  width: 48px;
-  height: 48px; }
-
-.end-session-dialog-inhibitor-layout {
-  spacing: 16px;
-  max-height: 200px;
-  padding-right: 65px;
-  padding-left: 65px; }
-
-.end-session-dialog-session-list,
-.end-session-dialog-app-list {
-  spacing: 1em; }
-
-.end-session-dialog-list-header {
-  font-weight: bold; }
-
-.end-session-dialog-list-header:rtl {
-  text-align: right; }
-
-.end-session-dialog-app-list-item,
-.end-session-dialog-session-list-item {
-  spacing: 1em; }
-
-.end-session-dialog-app-list-item-name,
-.end-session-dialog-session-list-item-name {
-  font-weight: bold; }
-
-.end-session-dialog-app-list-item-description {
-  color: #cccccc;
-  font-size: 10pt; }
-
 /* Restart message */
 .restart-message {
   font-size: 14pt; }
@@ -793,6 +720,70 @@ StScrollBar {
 .end-session-dialog-subject {
   font-size: fontsize(14.3); }
 
+/* End Session Dialog */
+.end-session-dialog {
+  spacing: 42px;
+  border: 3px solid rgba(238, 238, 236, 0.2); }
+
+.end-session-dialog-list {
+  padding-top: 20px; }
+
+.end-session-dialog-layout {
+  padding-left: 17px; }
+  .end-session-dialog-layout:rtl {
+    padding-right: 17px; }
+
+.end-session-dialog-description {
+  width: 28em;
+  padding-bottom: 10px; }
+  .end-session-dialog-description:rtl {
+    text-align: right; }
+
+.end-session-dialog-warning {
+  width: 28em;
+  color: #f57900;
+  padding-top: 6px; }
+  .end-session-dialog-warning:rtl {
+    text-align: right; }
+
+.end-session-dialog-logout-icon {
+  border-radius: 5px;
+  width: 48px;
+  height: 48px;
+  background-size: contain; }
+
+.end-session-dialog-shutdown-icon {
+  color: #eeeeec;
+  width: 48px;
+  height: 48px; }
+
+.end-session-dialog-inhibitor-layout {
+  spacing: 16px;
+  max-height: 200px;
+  padding-right: 65px;
+  padding-left: 65px; }
+
+.end-session-dialog-session-list,
+.end-session-dialog-app-list {
+  spacing: 1em; }
+
+.end-session-dialog-list-header {
+  font-weight: bold; }
+  .end-session-dialog-list-header:rtl {
+    text-align: right; }
+
+.end-session-dialog-app-list-item,
+.end-session-dialog-session-list-item {
+  spacing: 1em; }
+
+.end-session-dialog-app-list-item-name,
+.end-session-dialog-session-list-item-name {
+  font-weight: bold; }
+
+.end-session-dialog-app-list-item-description {
+  color: #e2e2df;
+  font-size: 10pt; }
+
 /* Popvers/Menus */
 .popup-menu {
   min-width: 200px; }