diff --git a/frontend/public/global.css b/frontend/public/global.css
index 4fcc834..b469971 100644
--- a/frontend/public/global.css
+++ b/frontend/public/global.css
@@ -360,15 +360,6 @@ body {
 	text-overflow: ellipsis;
 }
 
-.sidebar-button .sidebar-button-icon {
-	display: inline;
-	flex-shrink: 0;
-
-	/* TODO: HACK! */
-	width: 24px;
-	height: 24px;
-}
-
 .sidebar-button .icon-button {
 	display: none;
 }
diff --git a/frontend/src/components/PresenceSidebar.svelte b/frontend/src/components/PresenceSidebar.svelte
index a3bd9c9..919a8fd 100644
--- a/frontend/src/components/PresenceSidebar.svelte
+++ b/frontend/src/components/PresenceSidebar.svelte
@@ -15,14 +15,14 @@
     <div class="sidebar">
         {#each $presenceStore as entry (entry.user.id)}
             <button class="sidebar-button">
-                <div class="sidebar-button-icon material-icons-outlined">alternate_email</div>
-                <span>{ entry.user.username }</span>
+                <div class="material-icons-outlined">alternate_email</div>
+                <span class="sidebar-button-text">{ entry.user.username }</span>
             </button>
         {/each}
         {#if $smallViewport}
             <button on:click={ close } class="sidebar-button">
-                <div class="sidebar-button-icon material-icons-outlined">arrow_back</div>
-                <span>Back</span>
+                <div class="material-icons-outlined">arrow_back</div>
+                <span class="sidebar-button-text">Back</span>
             </button>
         {/if}
     </div>