diff --git a/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss b/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
index 044b5e2240..e2454336b8 100644
--- a/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
@@ -30,7 +30,7 @@ limitations under the License.
     flex-direction: row;
     align-items: center;
     padding: 15px;
-    background: $font-slider-bg-color;
+    background: rgba($appearance-tab-border-color, 0.2);
     border-radius: 10px;
     font-size: 10px;
     margin-top: 24px;
@@ -38,7 +38,7 @@ limitations under the License.
 }
 
 .mx_AppearanceUserSettingsTab_fontSlider_preview {
-    border: 1px solid $input-darker-bg-color;
+    border: 1px solid $appearance-tab-border-color;
     border-radius: 10px;
     padding: 0 16px 9px 16px;
     pointer-events: none;
@@ -56,12 +56,14 @@ limitations under the License.
     font-size: 15px;
     padding-right: 20px;
     padding-left: 5px;
+    font-weight: 500;
 }
 
 .mx_AppearanceUserSettingsTab_fontSlider_largeText {
     font-size: 18px;
     padding-left: 20px;
     padding-right: 5px;
+    font-weight: 500;
 }
 
 .mx_AppearanceUserSettingsTab {
@@ -115,7 +117,8 @@ limitations under the License.
             }
 
             &.mx_ThemeSelector_dark {
-                background-color: #181b21;
+                // 5% lightened version of 181b21
+                background-color: #25282e;
                 color: #f3f8fd;
 
                 > input > div {
@@ -163,10 +166,11 @@ limitations under the License.
 
         width: 300px;
 
-        border: 1px solid $input-darker-bg-color;
+        border: 1px solid $appearance-tab-border-color;
         border-radius: 10px;
 
-        .mx_EventTile_msgOption {
+        .mx_EventTile_msgOption,
+        .mx_MessageActionBar {
             display: none;
         }
 
@@ -175,6 +179,7 @@ limitations under the License.
             display: flex;
             align-items: center;
             padding: 10px;
+            pointer-events: none;
         }
 
         .mx_RadioButton {
@@ -188,7 +193,7 @@ limitations under the License.
     }
 
     .mx_RadioButton {
-        border-top: 1px solid $input-darker-bg-color;
+        border-top: 1px solid $appearance-tab-border-color;
 
         > input + div {
             border-color: rgba($muted-fg-color, 0.2);
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index 50f3c08782..69fc91f222 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -198,8 +198,8 @@ $breadcrumb-placeholder-bg-color: #272c35;
 
 $user-tile-hover-bg-color: $header-panel-bg-color;
 
-// FontSlider colors
-$font-slider-bg-color: $room-highlight-color;
+// Appearance tab colors
+$appearance-tab-border-color: $room-highlight-color;
 
 // ***** Mixins! *****
 
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index 355cc1301c..57dc1fa5e0 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -327,7 +327,7 @@ $breadcrumb-placeholder-bg-color: #e8eef5;
 $user-tile-hover-bg-color: $header-panel-bg-color;
 
 // FontSlider colors
-$font-slider-bg-color: rgba($input-darker-bg-color, 0.2);
+$appearance-tab-border-color: $input-darker-bg-color;
 
 // ***** Mixins! *****
 
diff --git a/src/components/views/elements/EventTilePreview.tsx b/src/components/views/elements/EventTilePreview.tsx
index fa600196e5..7d8b774955 100644
--- a/src/components/views/elements/EventTilePreview.tsx
+++ b/src/components/views/elements/EventTilePreview.tsx
@@ -108,7 +108,7 @@ export default class EventTilePreview extends React.Component<IProps, IState> {
             },
         };
 
-
+        return event;
     }
 
     public render() {