diff --git a/data/static/admin.js b/data/static/admin.js
index 1a92025..a428f6b 100644
--- a/data/static/admin.js
+++ b/data/static/admin.js
@@ -643,7 +643,7 @@ document.getElementById('openDefaultsWizard').onclick = function() {
                 }
                 let button = document.getElementById('openDefaultsWizard');
                 button.disabled = false;
-                button.innerHTML = 'New account defaults';
+                button.innerHTML = 'New User Defaults <i class="fa fa-user settingIcon"></i>';
                 let submitButton = document.getElementById('storeDefaults');
                 submitButton.disabled = false;
                 submitButton.textContent = 'Submit';
@@ -747,7 +747,7 @@ if (ombiEnabled) {
                     }
                     let button = document.getElementById('openOmbiDefaults');
                     button.disabled = false;
-                    button.innerHTML = 'Ombi user defaults';
+                    button.innerHTML = 'Ombi User Defaults <i class="fa fa-chain-broken settingIcon"></i>';
                     let submitButton = document.getElementById('storeOmbiDefaults');
                     submitButton.disabled = false;
                     submitButton.textContent = 'Submit';
diff --git a/data/templates/admin.html b/data/templates/admin.html
index 48f05bc..344f3e4 100644
--- a/data/templates/admin.html
+++ b/data/templates/admin.html
@@ -132,6 +132,10 @@
                 white-space: nowrap;
                 width: auto;
             }
+
+            .settingIcon {
+                margin-left: 0.2rem;
+            }
         </style>
         <title>Admin</title>
     </head>
@@ -168,20 +172,20 @@
                         </button>
                     </div>
                     <div class="modal-body">
-                        <ul class="list-group list-group-flush">
+                        <ul class="list-group list-group-flush" style="margin-bottom: 1rem;">
                             <p>Note: <sup class="text-danger">*</sup> Indicates required field, <sup class="text-danger">R</sup> Indicates changes require a restart.</p>
                             <button type="button" class="list-group-item list-group-item-action" id="openAbout">
-                            About <i class="fa fa-info-circle"></i>
+                            About <i class="fa fa-info-circle settingIcon"></i>
                             </button>
                             <button type="button" class="list-group-item list-group-item-action" id="openUsers">
-                            Users <i class="fa fa-user"></i>
+                                Email Addresses <i class="fa fa-envelope settingIcon"></i>
                             </button>
                             <button type="button" class="list-group-item list-group-item-action" id="openDefaultsWizard">
-                            New account defaults
+                                New User Defaults <i class="fa fa-user settingIcon"></i>
                             </button>
                             {{ if .ombiEnabled }}
                             <button type="button" class="list-group-item list-group-item-action" id="openOmbiDefaults">
-                                Ombi user defaults
+                                Ombi User Defaults <i class="fa fa-chain-broken settingIcon"></i>
                             </button>
                             {{ end }}
                         </ul>