diff --git a/public/message/output/popup/templates/notification_popover.mustache b/public/message/output/popup/templates/notification_popover.mustache
index ec931985510..b54eaab7a2a 100644
--- a/public/message/output/popup/templates/notification_popover.mustache
+++ b/public/message/output/popup/templates/notification_popover.mustache
@@ -65,7 +65,7 @@
 
     {{$headertext}}{{#str}} notifications, message {{/str}}{{/headertext}}
     {{$headeractions}}
-        <a class="mark-all-read-button"
+        <a class="mark-all-read-button btn btn-sm btn-link m-0 py-0 icon-no-margin"
            href="#"
            title="{{#str}} markallread {{/str}}"
            data-action="mark-all-read"
@@ -79,7 +79,8 @@
         {{# urls.preferences }}
             <a href="{{{ . }}}"
                title="{{#str}} notificationpreferences, message {{/str}}"
-               aria-label="{{#str}} notificationpreferences, message {{/str}}">
+               aria-label="{{#str}} notificationpreferences, message {{/str}}"
+               class="btn btn-sm btn-link m-0 py-0 icon-no-margin" >
                 {{#pix}} i/settings, core {{/pix}}</a>
         {{/ urls.preferences }}
         <button type="button" class="btn btn-sm btn-link m-0 py-0 icon-no-margin" aria-label="{{#str}}closebuttontitle{{/str}}" title="{{#str}}closebuttontitle{{/str}}" data-action="close-notification-popover">