diff --git a/res/css/views/avatars/_BaseAvatar.pcss b/res/css/views/avatars/_BaseAvatar.pcss
index dd643ebfb58..8545fa128ae 100644
--- a/res/css/views/avatars/_BaseAvatar.pcss
+++ b/res/css/views/avatars/_BaseAvatar.pcss
@@ -24,8 +24,9 @@ limitations under the License.
 }
 
 button.mx_BaseAvatar {
-    /* The user agent stylesheet overrides the font-size in this scenario
+    /* The user agent stylesheet overrides the font-size & line-height in this scenario
        And that breaks the alignment, emojis, and all sorts of things
      */
     font-size: inherit;
+    line-height: inherit;
 }
diff --git a/res/css/views/right_panel/_UserInfo.pcss b/res/css/views/right_panel/_UserInfo.pcss
index c0b8f16c6b6..13e64cb9037 100644
--- a/res/css/views/right_panel/_UserInfo.pcss
+++ b/res/css/views/right_panel/_UserInfo.pcss
@@ -99,6 +99,11 @@ limitations under the License.
             margin: 0 auto;
             transition: 0.5s;
 
+            .mx_BaseAvatar {
+                /* Override the calculated font-size so that the letter isn't tiny */
+                font-size: 4rem;
+            }
+
             .mx_BaseAvatar,
             .mx_BaseAvatar img {
                 width: 100%;
@@ -250,6 +255,11 @@ limitations under the License.
                 max-width: 72px;
                 margin: 0 auto;
             }
+
+            .mx_BaseAvatar {
+                /* Override the calculated font-size so that the letter isn't tiny */
+                font-size: 2rem;
+            }
         }
     }
 }