diff --git a/data/theme/gnome-shell-high-contrast.css b/data/theme/gnome-shell-high-contrast.css
index 610afbee6..87b542dcc 100644
--- a/data/theme/gnome-shell-high-contrast.css
+++ b/data/theme/gnome-shell-high-contrast.css
@@ -787,7 +787,12 @@ StScrollBar {
     padding: 8px 8px 8px 0px; }
 
 .message-icon-bin > StIcon {
-  icon-size: 48px; }
+  icon-size: 32px; }
+
+.message-secondary-bin:ltr {
+  padding-left: 8px; }
+.message-secondary-bin:rtl {
+  padding-right: 8px; }
 
 .message-secondary-bin {
   color: #999999; }
@@ -796,10 +801,12 @@ StScrollBar {
   icon-size: 16px; }
 
 .message-title {
-  font-weight: bold; }
+  font-weight: bold;
+  font-size: 1.1em; }
 
 .message-content {
-  padding: 8px; }
+  padding: 8px;
+  font-size: .9em; }
 
 .system-switch-user-submenu-icon {
   icon-size: 24px;
diff --git a/data/theme/gnome-shell-sass b/data/theme/gnome-shell-sass
index e12b124a7..172666394 160000
--- a/data/theme/gnome-shell-sass
+++ b/data/theme/gnome-shell-sass
@@ -1 +1 @@
-Subproject commit e12b124a78a0aee58416a212567676c225506777
+Subproject commit 172666394146a88445811e86ce37a3f36775004c
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 5f4347ac2..edf2ae05f 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -787,7 +787,12 @@ StScrollBar {
     padding: 8px 8px 8px 0px; }
 
 .message-icon-bin > StIcon {
-  icon-size: 48px; }
+  icon-size: 32px; }
+
+.message-secondary-bin:ltr {
+  padding-left: 8px; }
+.message-secondary-bin:rtl {
+  padding-right: 8px; }
 
 .message-secondary-bin {
   color: #8e8e80; }
@@ -796,10 +801,12 @@ StScrollBar {
   icon-size: 16px; }
 
 .message-title {
-  font-weight: bold; }
+  font-weight: bold;
+  font-size: 1.1em; }
 
 .message-content {
-  padding: 8px; }
+  padding: 8px;
+  font-size: .9em; }
 
 .system-switch-user-submenu-icon {
   icon-size: 24px;
diff --git a/js/ui/calendar.js b/js/ui/calendar.js
index 291e808ae..b61424fc8 100644
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -24,7 +24,7 @@ const MSECS_IN_DAY = 24 * 60 * 60 * 1000;
 const SHOW_WEEKDATE_KEY = 'show-weekdate';
 const ELLIPSIS_CHAR = '\u2026';
 
-const MESSAGE_ICON_SIZE = 48;
+const MESSAGE_ICON_SIZE = 32;
 
 const MESSAGE_ANIMATION_TIME = 0.1;