diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index ec51be5ec..137e7d8ee 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -258,7 +258,7 @@
               <p class="sg-item-name"
                  ng-show="app.editMode != folder.path">
                 {{app.metadataForFolder(folder).name}}
-                <span ng-show="folder.unseenCount"> ({{folder.unseenCount}})</span>
+                <span class="sg-unread-badge" ng-show="folder.unseenCount">{{folder.unseenCount}}</span>
               </p>
               <md-input-container class="md-flex"
                                   ng-show="app.editMode == folder.path">
@@ -383,21 +383,21 @@
             <label class="pseudo-input-label"><var:string label:value="Add a Criteria"/></label>
           </div>
           <div layout="row">
-            <a class="sg-outline-button" href="#" ng-click="app.addSearchParam('subject')">
+            <span class="md-button sg-outline-button" ng-click="app.addSearchParam('subject')">
               <var:string label:value="Subject"/>
-            </a>
-            <a class="sg-outline-button" href="#" ng-click="app.addSearchParam('from')">
+            </span>
+            <span class="md-button sg-outline-button" ng-click="app.addSearchParam('from')">
               <var:string label:value="From"/>
-            </a>
-            <a class="sg-outline-button" href="#" ng-click="app.addSearchParam('to')">
+            </span>
+            <span class="md-button sg-outline-button" ng-click="app.addSearchParam('to')">
               <var:string label:value="To"/>
-            </a>
-            <a class="sg-outline-button" href="#" ng-click="app.addSearchParam('cc')">
+            </span>
+            <span class="md-button sg-outline-button" ng-click="app.addSearchParam('cc')">
               <var:string label:value="Cc"/>
-            </a>
-            <a class="sg-outline-button" href="#" ng-click="app.addSearchParam('body')">
+            </span>
+            <span class="md-button sg-outline-button" ng-click="app.addSearchParam('body')">
               <var:string label:value="Body"/>
-            </a>
+            </span>
           </div>
         </div>
       </div>
diff --git a/UI/WebServerResources/scss/components/button/button.scss b/UI/WebServerResources/scss/components/button/button.scss
index 328ed8bc7..1d54ce329 100644
--- a/UI/WebServerResources/scss/components/button/button.scss
+++ b/UI/WebServerResources/scss/components/button/button.scss
@@ -134,9 +134,12 @@ md-list md-list-item button.md-button.sg-icon-button {
   border-width: 1px;
   border-style: solid;
   border-radius: $button-border-radius;
-  margin: rem(0.500);
-  padding: rem(0.500);
+  margin: 0 0 0 rem(0.500);
+  padding: 0 rem(0.500);
+  min-width: initial;
+  min-height: initial;
   font-size: $sg-font-size-1;
   font-weight: $sg-font-medium;
+  line-height: $sg-font-size-1 * 2;
   text-transform: uppercase;
 }
\ No newline at end of file