diff --git a/app/server-health/controllers/inventory-overview-controller.html b/app/server-health/controllers/inventory-overview-controller.html
index c70c5da..24c70b0 100644
--- a/app/server-health/controllers/inventory-overview-controller.html
+++ b/app/server-health/controllers/inventory-overview-controller.html
@@ -6,7 +6,7 @@
   <div class="row column">
     <div class="page-header">
       <h2 class="inline">All hardware in the system</h2>
-      <a ng-href="data:text/json;charset=utf-8,{{originalData}}" class="inline btn-export float-right"  download="export_inventory.json" ng-show="hardwares.length">Export</a>
+      <a ng-href="data:text/json;charset=utf-8,{{originalData}}" class="btn  btn-tertiary float-right"  download="export_inventory.json" ng-show="hardwares.length"><icon file="icon-export.svg"></icon>Export</a>
     </div>
   </div>
   <div class="row column">
diff --git a/app/server-health/controllers/log-controller.html b/app/server-health/controllers/log-controller.html
index 34a2ec3..3b164bd 100644
--- a/app/server-health/controllers/log-controller.html
+++ b/app/server-health/controllers/log-controller.html
@@ -46,21 +46,21 @@
             </p>
           </div>
           <div class="inline__confirm-buttons">
-            <button class="btn-primary" ng-click="accept()">Yes</button>
-            <button class="btn-primary" ng-click="confirm = false">No</button>
+            <button class="btn  btn-primary" ng-click="accept()">Yes</button>
+            <button class="btn  btn-primary" ng-click="confirm = false">No</button>
           </div>
         </div>
         <p class="inline" ng-show="selectedEvents.length"><span class="event__select-count">{{selectedEvents.length}}</span> Events are selected</p>
         <p class="inline" ng-hide="selectedEvents.length"><span class="event__select-count">{{filteredLogs.length}}</span> Events are logged</p>
         <!-- when logs are selected, this text changes to show how many logs are checked -->
         <div class="event__actions">
-          <button class="inline btn-delete" ng-class="{'disabled': (!selectedEvents.length && !all)}" ng-disabled="!selectedEvents.length && !all" ng-click="confirm= ! confirm">
-            <img class="event__icon" src="../../assets/images/icon-trashcan-white.svg" alt="">Delete
+          <button class="btn  btn-tertiary" ng-class="{'disabled': (!selectedEvents.length && !all)}" ng-disabled="!selectedEvents.length && !all" ng-click="confirm= ! confirm">
+            <icon file="icon-trashcan.svg"></icon>Delete
           </button>
-          <button class="inline btn-resolve" ng-class="{'disabled': ((selectedEvents|unResolvedCount) == 0)}" ng-click="resolve()" ng-disabled="(selectedEvents|unResolvedCount) == 0">
-            <img class="event__icon" src="../../assets/images/icon-check-white.svg" alt="">Mark as resolved
+          <button class="btn  btn-tertiary" ng-class="{'disabled': ((selectedEvents|unResolvedCount) == 0)}" ng-click="resolve()" ng-disabled="(selectedEvents|unResolvedCount) == 0">
+            <icon file="icon-check.svg"></icon>Mark as resolved
           </button>
-          <a ng-href="data:text/json;charset=utf-8,{{export_data}}" class="inline btn-export"  ng-class="{'disabled': (!selectedEvents.length && !all)}" download="{{export_name}}">Export</a>
+          <a ng-href="data:text/json;charset=utf-8,{{export_data}}" class="btn  btn-tertiary"  ng-class="{'disabled': (!selectedEvents.length && !all)}" download="{{export_name}}"><icon file="icon-export.svg"></icon>Export</a>
         </div>
       </div>
     </div>
diff --git a/app/server-health/controllers/sensors-overview-controller.html b/app/server-health/controllers/sensors-overview-controller.html
index 5a6f95a..90bdcc2 100644
--- a/app/server-health/controllers/sensors-overview-controller.html
+++ b/app/server-health/controllers/sensors-overview-controller.html
@@ -6,7 +6,7 @@
   <section class="row column">
     <div class="page-header">
       <h2 class="inline">All sensors present in the system</h2>
-      <a ng-href="data:text/json;charset=utf-8,{{export_data}}" class="inline btn-export float-right" download="{{export_name}}">Export</a>
+      <a ng-href="data:text/json;charset=utf-8,{{export_data}}" class="btn btn-tertiary float-right" download="{{export_name}}"><icon file="icon-export.svg"></icon>Export</a>
     </div>
   </section>
   <section class="row column">
@@ -23,16 +23,16 @@
 
     <div class="toggle-filter">
       <p class="content-label">FILTER BY SEVERITY</p>
-      <button class="inline first btn-primary" ng-click="toggleSeverityAll()"
+      <button class="btn" ng-click="toggleSeverityAll()"
           ng-class="selectedSeverity.all ? 'btn-primary' : 'btn-secondary'">All
       </button>
-      <button class="inline " ng-click="toggleSeverity('critical')"
+      <button class="btn" ng-click="toggleSeverity('critical')"
           ng-class="selectedSeverity.critical ? 'btn-primary' : 'btn-secondary'">Critical
       </button>
-      <button class="inline" ng-click="toggleSeverity('warning')"
+      <button class="btn" ng-click="toggleSeverity('warning')"
           ng-class="selectedSeverity.warning ? 'btn-primary' : 'btn-secondary'">Warning
       </button>
-      <button class="inline" ng-click="toggleSeverity('normal')"
+      <button class="btn" ng-click="toggleSeverity('normal')"
           ng-class="selectedSeverity.normal ? 'btn-primary' : 'btn-secondary'">Normal
       </button>
     </div>