diff --git a/res/css/views/avatars/_BaseAvatar.pcss b/res/css/views/avatars/_BaseAvatar.pcss
index 8545fa128a..c8e2360aaf 100644
--- a/res/css/views/avatars/_BaseAvatar.pcss
+++ b/res/css/views/avatars/_BaseAvatar.pcss
@@ -24,9 +24,9 @@ limitations under the License.
 }
 
 button.mx_BaseAvatar {
-    /* The user agent stylesheet overrides the font-size & line-height in this scenario
-       And that breaks the alignment, emojis, and all sorts of things
+    /* <button> is a form element and by default it uses the user agent (browser) styling.
+       We want it to inherit the font-family and line-height from its parent.
      */
-    font-size: inherit;
+    font-family: inherit;
     line-height: inherit;
 }
diff --git a/res/css/views/right_panel/_UserInfo.pcss b/res/css/views/right_panel/_UserInfo.pcss
index 13e64cb903..c0b8f16c6b 100644
--- a/res/css/views/right_panel/_UserInfo.pcss
+++ b/res/css/views/right_panel/_UserInfo.pcss
@@ -99,11 +99,6 @@ 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%;
@@ -255,11 +250,6 @@ 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;
-            }
         }
     }
 }