diff --git a/src/app/components/editor/database/database.component.html b/src/app/components/editor/database/database.component.html
index 4ffdeb4..a2a0f56 100644
--- a/src/app/components/editor/database/database.component.html
+++ b/src/app/components/editor/database/database.component.html
@@ -9,7 +9,7 @@
       ></ion-input>
       <button
         class="clear-btn"
-        style="padding: 0 20px; color: white;"
+        style="padding: 0 20px;"
         *ngIf="fullPage && (editorService.isSaving || editorService.willSave)"
         title="Saving..."
       >
@@ -17,14 +17,14 @@
       </button>
       <button
         class="clear-btn"
-        style="padding: 0 20px; color: white;"
+        style="padding: 0 20px;"
         *ngIf="fullPage && !(editorService.isSaving || editorService.willSave)"
         title="Changes saved."
         (click)="editorService.triggerSave()"
       >
         <i class="fa fa-check-circle"></i>
       </button>
-      <button style="padding: 0 20px; color: white;" *ngIf="fullPage" (click)="dismiss()"><i class="fa fa-times"></i></button>
+      <button style="padding: 0 20px;" *ngIf="fullPage" (click)="dismiss()" class="clear-btn"><i class="fa fa-times"></i></button>
     </div>
     <ion-buttons *ngIf="!readonly" style="flex-wrap: wrap;">
       <ion-button (click)="onManageColumns()"><ion-icon name="build" color="primary"></ion-icon>&nbsp;Manage Columns</ion-button>
diff --git a/src/app/pages/editor/editor.page.html b/src/app/pages/editor/editor.page.html
index c15ce19..dacf9a0 100644
--- a/src/app/pages/editor/editor.page.html
+++ b/src/app/pages/editor/editor.page.html
@@ -26,14 +26,15 @@
           <i *ngIf="!(editorService.isSaving || editorService.willSave)" class="fa fa-check-circle"></i>
           {{ (editorService.isSaving || editorService.willSave) ? 'Saving...' : 'Saved!' }}
         </button>
-        <ion-button
+        <button
           *ngIf="editorService.isEditing && editorService.canEdit()"
           title="More page options"
           (click)="onPageMenuClick($event)"
-          fill="clear"
+          class="clear-btn"
+          style="padding: 10px;"
         >
           <i class="fa fa-ellipsis-v"></i>
-        </ion-button>
+        </button>
       </ion-buttons>
     </ion-toolbar>
   </ion-header>
@@ -53,7 +54,7 @@
         >
           <div class="host-icons">
             <i class="type-icon fa" [ngClass]="typeIcons[(node.isNorm() ? 'node' : node.type)] + ' ' + (node.isNorm() ? 'node' : (node.isForm() ? 'form-input ' + node.type : node.type))"></i>
-            <button (click)="onOptionsClick($event, node)" *ngIf="editorService.canEdit()">
+            <button (click)="onOptionsClick($event, node)" *ngIf="editorService.canEdit()" class="clear-btn">
               <i class="fa fa-ellipsis-v" title="Node options"></i>
             </button>
           </div>
diff --git a/src/global.scss b/src/global.scss
index 680c277..d3a5abf 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -194,4 +194,8 @@ body.dark {
     background-color: #313131;
     border-radius: 4px;
   }
+
+  .clear-btn {
+    color: white;
+  }
 }