diff --git a/app/server-health/directives/remote-logging-server-modal.html b/app/server-health/directives/remote-logging-server-modal.html
index eba57af..89f8c75 100644
--- a/app/server-health/directives/remote-logging-server-modal.html
+++ b/app/server-health/directives/remote-logging-server-modal.html
@@ -1,5 +1,7 @@
 <div role="dialog" class="uib-modal__content  remote-logging-server__modal">
-  <button type="button" class="icon  icon__close  float-right" ng-click="$close()"></button>
+  <button type="button" class="btn  btn--close  float-right" ng-click="$close()">
+    <icon file="icon-close.svg"></icon>
+  </button>
   <div class="modal-header">
     <h2 class="modal-title" id="dialog_label">{{activeModalProps.title}}</h2>
   </div>
@@ -29,10 +31,10 @@
       {{remoteServer.hostname}}?</p>
     </div>
     <div class="modal-footer">
-      <button class="button btn-secondary" ng-click="$close()" type="button">
+      <button class="btn btn-secondary" ng-click="$close()" type="button">
         Cancel
       </button>
-      <button class="button btn-primary" type="submit"
+      <button class="btn btn-primary" type="submit"
         ng-click="$close(activeModal)" ng-disabled="form.$invalid"
         ng-class="{'disabled': form.$invalid}">
         {{activeModalProps.actionLabel}}
diff --git a/app/server-health/directives/remote-logging-server.html b/app/server-health/directives/remote-logging-server.html
index 28fc313..c0edf5a 100644
--- a/app/server-health/directives/remote-logging-server.html
+++ b/app/server-health/directives/remote-logging-server.html
@@ -1,7 +1,7 @@
 <p class="content-label">Remote Logging Server</p>
 <div ng-if="!loadError && !remoteServer">
-  <button ng-click="initModal(0)" class="modal__trigger">
-    <span class="icon  icon__plus"></span>
+  <button ng-click="initModal(0)" class="btn  btn-tertiary  modal__trigger">
+    <icon file="icon-plus.svg"></icon>
     Add server
   </button>
 </div>
@@ -9,11 +9,11 @@
   <p class="inline remote-logging-server__details">
     {{remoteServer.hostname}}
   </p>
-  <button ng-click="initModal(1)" class="modal__trigger">
-    <span class="icon icon__edit"></span>
+  <button ng-click="initModal(1)" class="btn  btn-tertiary  modal__trigger">
+    <icon file="icon-edit.svg"></icon>
   </button>
-  <button ng-click="initModal(2)" class="modal__trigger">
-    <span class="icon icon__delete"></span>
+  <button ng-click="initModal(2)" class="btn  btn-tertiary  modal__trigger">
+    <icon file="icon-trashcan.svg"></icon>
   </button>
 </div>
 <div class="text-right" ng-if="loadError">