diff --git a/public/popup.css b/public/popup.css
index 7096bbe4..737fa33a 100644
--- a/public/popup.css
+++ b/public/popup.css
@@ -475,7 +475,7 @@
   overflow: hidden;
   text-overflow: ellipsis;
   max-width: 130px;
-  margin-right: 8px;
+  margin: 0 8px 0 0;
 }
 
 /*
@@ -531,17 +531,13 @@
 }
 
 /*
- * Generic spacing classes
+ * Generic utilities
  */
 
-.u-mZ {
+ #sponsorBlockPopupBody .u-mZ {
   margin: 0 !important;
 }
 
-/*
- * Generic hide utility classes
- */
-
 #sponsorBlockPopupBody .hidden {
   display: none !important;
 }
diff --git a/public/popup.html b/public/popup.html
index 5f07649d..e50071db 100644
--- a/public/popup.html
+++ b/public/popup.html
@@ -84,7 +84,7 @@
           <div>
             <p class="u-mZ">__MSG_Username__:</p>
             <div id="setUsernameContainer">
-              <p id="usernameValue" class="u-mZ"></p>
+              <p id="usernameValue"></p>
               <button id="setUsernameButton" title="__MSG_setUsername__">
                 <img src="/icons/pencil.svg" alt="__MSG_setUsername__" width="16" height="16" id="sbPopupIconEdit">
               </button>