diff --git a/data/theme/gnome-shell-high-contrast.css b/data/theme/gnome-shell-high-contrast.css
index feb2b5008..dcb2ce810 100644
--- a/data/theme/gnome-shell-high-contrast.css
+++ b/data/theme/gnome-shell-high-contrast.css
@@ -408,9 +408,9 @@ StScrollBar {
   spacing-rows: 15px;
   spacing-columns: 1em; }
 
-/* Popvers/Menus */
+/* Popovers/Menus */
 .popup-menu {
-  min-width: 200px; }
+  min-width: 15em; }
   .popup-menu .popup-sub-menu {
     background-color: black;
     box-shadow: inset 0 -1px 0px #0d0d0d; }
@@ -752,7 +752,7 @@ StScrollBar {
 
 /* Message list */
 .message-list {
-  width: 420px; }
+  width: 31.5em; }
 
 .message-list-sections {
   spacing: 1.5em; }
@@ -823,7 +823,7 @@ StScrollBar {
     color: transparent; }
 
 .aggregate-menu {
-  min-width: 280px; }
+  min-width: 21em; }
   .aggregate-menu .popup-menu-icon {
     padding: 0 4px; }
 
diff --git a/data/theme/gnome-shell-sass b/data/theme/gnome-shell-sass
index 83b896b0e..d85e53fbd 160000
--- a/data/theme/gnome-shell-sass
+++ b/data/theme/gnome-shell-sass
@@ -1 +1 @@
-Subproject commit 83b896b0e13725d7045ba3708265f6689952586c
+Subproject commit d85e53fbd9cd2d80aed543cf4a436413d6985ebe
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 6ae2302f6..7c7a27144 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -408,9 +408,9 @@ StScrollBar {
   spacing-rows: 15px;
   spacing-columns: 1em; }
 
-/* Popvers/Menus */
+/* Popovers/Menus */
 .popup-menu {
-  min-width: 200px; }
+  min-width: 15em; }
   .popup-menu .popup-sub-menu {
     background-color: #343a3a;
     box-shadow: inset 0 -1px 0px #282c2c; }
@@ -752,7 +752,7 @@ StScrollBar {
 
 /* Message list */
 .message-list {
-  width: 420px; }
+  width: 31.5em; }
 
 .message-list-sections {
   spacing: 1.5em; }
@@ -823,7 +823,7 @@ StScrollBar {
     color: transparent; }
 
 .aggregate-menu {
-  min-width: 280px; }
+  min-width: 21em; }
   .aggregate-menu .popup-menu-icon {
     padding: 0 4px; }