--- a/browser/themes/shared/notification-icons.inc.css
+++ b/browser/themes/shared/notification-icons.inc.css
@@ -2,17 +2,18 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 %endif
 
 .popup-notification-control {
   margin-top: .5em;
   margin-inline-end: var(--panel-arrowcontent-spacing-size);
-  margin-inline-start: -33px;
+  /* Align with main icon center */
+  margin-inline-start: calc(var(--panel-arrowcontent-spacing-size) * 1.5);
 }
 
 .popup-notification-icon {
   width: calc(var(--panel-arrowcontent-spacing-size) * 2);
   height: calc(var(--panel-arrowcontent-spacing-size) * 2);
   margin-inline-end: 10px;
   margin-inline-start: var(--panel-arrowcontent-spacing-size);
   margin-block-start: var(--panel-arrowcontent-spacing-size);

--- a/toolkit/content/widgets/notification.xml
+++ b/toolkit/content/widgets/notification.xml
@@ -467,22 +467,21 @@
           ]]>
         </body>
       </method>
     </implementation>
   </binding>
 
   <binding id="popup-notification">
     <content>
-      <xul:vbox>
-        <xul:image class="popup-notification-icon"
-                   xbl:inherits="popupid,src=icon"/>
-      </xul:vbox>
       <xul:vbox class="popup-notification-body" xbl:inherits="popupid">
         <xul:hbox align="start">
+          <xul:image class="popup-notification-icon"
+                     align="top"
+                     xbl:inherits="popupid,src=icon"/>
           <xul:vbox flex="1">
             <xul:label class="popup-notification-origin header"
                        xbl:inherits="value=origin,tooltiptext=origin"
                        crop="center"/>
             <xul:description class="popup-notification-description"
                              xbl:inherits="xbl:text=label,popupid"/>
           </xul:vbox>
           <xul:toolbarbutton anonid="closebutton"

--- a/toolkit/themes/linux/global/notification.css
+++ b/toolkit/themes/linux/global/notification.css
@@ -73,17 +73,16 @@ notification[type="critical"] {
 }
 
 .popup-notification-menubutton {
   margin: 0;
 }
 
 .popup-notification-body hbox:first-of-type {
   margin: var(--panel-arrowcontent-spacing-size) var(--panel-arrowcontent-spacing-size) 0 0;
-  min-height: calc(var(--panel-arrowcontent-spacing-size) * 2);
 }
 
 .popup-notification-body .button-menubutton-button {
   --main-color: #5295e5;
   -moz-appearance: none;
   background: var(--main-color);
   border: 1px solid var(--main-color);
   padding: 2rem;

--- a/toolkit/themes/osx/global/notification.css
+++ b/toolkit/themes/osx/global/notification.css
@@ -110,17 +110,16 @@ notification[type="info"]:not([value="tr
 }
 
 .popup-notification-menubutton {
   margin: 0;
 }
 
 .popup-notification-body hbox:first-of-type {
   margin: var(--panel-arrowcontent-spacing-size) var(--panel-arrowcontent-spacing-size) 0 0;
-  min-height: calc(var(--panel-arrowcontent-spacing-size) * 2);
 }
 
 .popup-notification-origin:not([value]),
 .popup-notification-learnmore-link:not([href]) {
   display: none;
 }
 
 .popup-notification-origin {