diff --git a/data/theme/gnome-shell-high-contrast.css b/data/theme/gnome-shell-high-contrast.css
index 1a65e1549..51477e713 100644
--- a/data/theme/gnome-shell-high-contrast.css
+++ b/data/theme/gnome-shell-high-contrast.css
@@ -918,17 +918,17 @@ StScrollBar {
     background-color: #0d0d0d; }
 
 .message-icon-bin {
-  padding: 10px 3px 10px 10px; }
+  padding: 0.68em 0.2em 0.68em 0.68em; }
   .message-icon-bin:rtl {
-    padding: 10px 10px 10px 3px; }
+    padding: 0.68em 0.68em 0.68em 0.2em; }
 
 .message-icon-bin > StIcon {
   color: #cccccc;
-  icon-size: 16px;
+  icon-size: 1.09em;
   -st-icon-style: symbolic; }
 
 .message-secondary-bin {
-  padding: 0 12px; }
+  padding: 0 0.82em; }
 
 .message-secondary-bin > .event-time {
   color: #999999;
@@ -938,7 +938,7 @@ StScrollBar {
   padding-bottom: 0.13em; }
 
 .message-secondary-bin > StIcon {
-  icon-size: 16px; }
+  icon-size: 1.09em; }
 
 .message-title {
   color: #f2f2f2; }
diff --git a/data/theme/gnome-shell-sass b/data/theme/gnome-shell-sass
index 594ec0b5c..336c2d5ad 160000
--- a/data/theme/gnome-shell-sass
+++ b/data/theme/gnome-shell-sass
@@ -1 +1 @@
-Subproject commit 594ec0b5ccf2d4e92e234c708c0d5b31882e0f97
+Subproject commit 336c2d5ad6b165f586330ec7e1fdc23ff220638a
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 89ceb6cbd..6aab70867 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -918,17 +918,17 @@ StScrollBar {
     background-color: #454c4c; }
 
 .message-icon-bin {
-  padding: 10px 3px 10px 10px; }
+  padding: 0.68em 0.2em 0.68em 0.68em; }
   .message-icon-bin:rtl {
-    padding: 10px 10px 10px 3px; }
+    padding: 0.68em 0.68em 0.68em 0.2em; }
 
 .message-icon-bin > StIcon {
   color: #bebeb6;
-  icon-size: 16px;
+  icon-size: 1.09em;
   -st-icon-style: symbolic; }
 
 .message-secondary-bin {
-  padding: 0 12px; }
+  padding: 0 0.82em; }
 
 .message-secondary-bin > .event-time {
   color: #8e8e80;
@@ -938,7 +938,7 @@ StScrollBar {
   padding-bottom: 0.13em; }
 
 .message-secondary-bin > StIcon {
-  icon-size: 16px; }
+  icon-size: 1.09em; }
 
 .message-title {
   color: #e2e2df; }
diff --git a/js/ui/calendar.js b/js/ui/calendar.js
index bb42d72f3..3db612f22 100644
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -20,7 +20,7 @@ var MSECS_IN_DAY = 24 * 60 * 60 * 1000;
 var SHOW_WEEKDATE_KEY = 'show-weekdate';
 var ELLIPSIS_CHAR = '\u2026';
 
-var MESSAGE_ICON_SIZE = 16;
+var MESSAGE_ICON_SIZE = -1; // pick up from CSS
 
 // alias to prevent xgettext from picking up strings translated in GTK+
 const gtk30_ = Gettext_gtk30.gettext;