diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index af3960b5..7ad98a26 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -42,9 +42,10 @@
 </script>
 <div class="gBlock">
   <a href="<?= url::site("admin/users/add_user_form") ?>"
-     class="gDialogLink gButtonLink right"
-     title="<?= t("Create a new user") ?>">
-     <?= t("Add a new user") ?>
+      class="gDialogLink gButtonLink right ui-icon-left ui-state-default ui-corner-all"
+      title="<?= t("Create a new user") ?>">
+    <span class="ui-icon ui-icon-circle-plus"></span>
+    <?= t("Add a new user") ?>
   </a>
 
   <h2>
@@ -96,21 +97,21 @@
       </tr>
       <? endforeach ?>
     </table>
-    <p>
-      <a href="<?= url::site("admin/users/add_user_form") ?>"
-         class="gDialogLink gButtonLink"
-         title="<?= t("Create a new user") ?>">
-         <?= t("Add a new user") ?>
-      </a>
-    </p>
+    <a href="<?= url::site("admin/users/add_user_form") ?>"
+        class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all"
+        title="<?= t("Create a new user") ?>">
+      <span class="ui-icon ui-icon-circle-plus"></span>
+      <?= t("Add a new user") ?>
+    </a>
   </div>
 </div>
 
 <div id="gGroupAdmin" class="gBlock">
   <a href="<?= url::site("admin/users/add_group_form") ?>"
-     class="gDialogLink gButtonLink right"
-     title="<?= t("Create a new group") ?>">
-     <?= t("Add a new group") ?>
+      class="gDialogLink gButtonLink right ui-icon-left ui-state-default ui-corner-all"
+      title="<?= t("Create a new group") ?>">
+    <span class="ui-icon ui-icon-circle-plus"></span>
+    <?= t("Add a new group") ?>
   </a>
 
   <h2>
diff --git a/themes/admin_default/js/ui.init.js b/themes/admin_default/js/ui.init.js
index c8e21c9c..efc2af04 100644
--- a/themes/admin_default/js/ui.init.js
+++ b/themes/admin_default/js/ui.init.js
@@ -14,9 +14,6 @@ $(document).ready(function(){
     speed: 'fast'
   });
 
-  $(".gButtonLink").addClass("fg-button fg-button-icon-left ui-state-default ui-corner-all");
-  $(".gButtonLink").prepend('<span class="ui-icon ui-icon-circle-plus"></span>');
-
   // Apply modal dialogs
   var dialogLinks = $(".gDialogLink");
   for (var i=0; i < dialogLinks.length; i++) {
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index d1900a7a..cf557cfe 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -682,7 +682,8 @@ form p.gError {
 #gSiteMenu:after,
 #gBreadcrumbs:after,
 #gAlbumGrid:after,
-#gPager:after {
+#gPager:after,
+.gButtonLink:after {
   clear: both;
   content: ".";
   display: block;
@@ -752,6 +753,22 @@ form p.gError {
   display: none;
 }
 
+/* jQuery UI ThemeRoller butttons */
+
+.gButtonLink {
+  padding: .1em .6em;
+}
+
+.ui-icon-left .ui-icon {
+  float: left;
+  margin-right: .4em;
+}
+
+.ui-icon-right .ui-icon {
+  float: right;
+  margin-left: .4em;
+}
+
 /* STUFF THAT NEEDS A HOME */
 
 #gMove ul {