diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 7ad98a26..b096ddb3 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -85,13 +85,17 @@
           <?= ($user->last_login == 0) ? "" : date("j-M-y", $user->last_login) ?>
         </td>
         <td class="gActions">
-          <a href="<?= url::site("admin/users/edit_user_form/$user->id") ?>" class="gPanelLink"><?= t("edit") ?></a>
+          <a href="<?= url::site("admin/users/edit_user_form/$user->id") ?>"
+              class="gPanelLink gButtonLink ui-state-default ui-corner-all ui-icon-left">
+            <span class="ui-icon ui-icon-pencil"></span><?= t("edit") ?></a>
           <? if (user::active()->id != $user->id && !$user->guest): ?>
-          <a href="<?= url::site("admin/users/delete_user_form/$user->id") ?>" class="gDialogLink"><?= t("delete") ?></a>
+          <a href="<?= url::site("admin/users/delete_user_form/$user->id") ?>"
+              class="gDialogLink gButtonLink ui-state-default ui-corner-all ui-icon-left">
+            <span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></a>
           <? else: ?>
-          <span class="inactive" title="<?= t("This user cannot be deleted") ?>">
-            <?= t("delete") ?>
-          </span>
+          <a title="<?= t("This user cannot be deleted") ?>"
+              class="gDialogLink gButtonLink ui-state-disabled ui-corner-all ui-icon-left">
+            <span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></a>
           <? endif ?>
         </td>
       </tr>
diff --git a/modules/user/views/admin_users_group.html.php b/modules/user/views/admin_users_group.html.php
index 09ca5f08..79fcad13 100644
--- a/modules/user/views/admin_users_group.html.php
+++ b/modules/user/views/admin_users_group.html.php
@@ -1,18 +1,23 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<strong><?= $group->name?></strong>
+<strong><?= $group->name ?></strong>
 <? if (!$group->special): ?>
-<a href="<?= url::site("admin/users/delete_group_form/$group->id") ?>" class="gDialogLink"><?= t("delete") ?></a>
+<a href="<?= url::site("admin/users/delete_group_form/$group->id") ?>"
+    title="<?= t("Delete " . $group->name) ?>" 
+    class="gDialogLink gButtonLink ui-state-default ui-corner-all">
+  <span class="ui-icon ui-icon-trash"><?= t("delete") ?></span></a>
 <? else: ?>
-<span class="inactive" title="<?= t("This group cannot be deleted") ?>">
-  <?= t("delete") ?>
-</span>
+<a title="<?= t("This group cannot be deleted") ?>"
+    class="gDialogLink gButtonLink ui-state-disabled ui-corner-all ui-icon-left">
+  <span class="ui-icon ui-icon-trash"><?= t("delete") ?></span></a>
 <? endif ?>
 <ul>
   <? foreach ($group->users as $i => $user): ?>
   <li class="gUser">
     <?= $user->name ?>
     <? if (!$group->special): ?>
-    <a href="javascript:remove_user(<?= $user->id ?>, <?= $group->id ?>)">X</a>
+    <a href="javascript:remove_user(<?= $user->id ?>, <?= $group->id ?>)" 
+        class="gButtonLink ui-state-default ui-corner-all ui-icon-left">
+      <span class="ui-icon ui-icon-closethick">Remove <?= $user->name ?> from <?= $group->name ?></span></a>
     <? endif ?>
   </li>
   <? endforeach ?>
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 2c8d4627..bd33aed5 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -683,8 +683,7 @@ form p.gError {
 #gSiteMenu:after,
 #gBreadcrumbs:after,
 #gAlbumGrid:after,
-#gPager:after,
-.gButtonLink:after {
+#gPager:after {
   clear: both;
   content: ".";
   display: block;