diff --git a/core/views/admin_maintenance.html.php b/core/views/admin_maintenance.html.php
index 21638c6b..8d067a65 100644
--- a/core/views/admin_maintenance.html.php
+++ b/core/views/admin_maintenance.html.php
@@ -92,7 +92,7 @@
         </td>
         <td>
           <? if ($task->state == "stalled"): ?>
-          <a href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>" class="gDialogLink">
+          <a href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>">
             <?= t("resume") ?>
           </a>
           <? endif ?>
@@ -108,9 +108,11 @@
 
   <? if ($finished_tasks->count()): ?>
   <div id="gFinishedTasks">
-    <h2> <?= t("Finished Tasks") ?> </h2>
-    <a href="<?= url::site("admin/maintenance/remove_finished_tasks?csrf=$csrf") ?>"><?= t("remove all") ?></a>
+    <a href="<?= url::site("admin/maintenance/remove_finished_tasks?csrf=$csrf") ?>"
+         class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
+       <span class="ui-icon ui-icon-trash"></span><?= t("remove all finished") ?></a>
 
+    <h2> <?= t("Finished Tasks") ?> </h2>
     <table>
       <tr>
         <th>
diff --git a/core/views/admin_maintenance_task.html.php b/core/views/admin_maintenance_task.html.php
index b0360b6c..1b64ffb3 100644
--- a/core/views/admin_maintenance_task.html.php
+++ b/core/views/admin_maintenance_task.html.php
@@ -26,7 +26,7 @@
   <div id="gProgressBar"></div>
   <div id="gStatus"></div>
   <div>
-    <button id="gPauseButton" onclick="dismiss()"><?= t("Pause") ?></button>
-    <button id="gDoneButton" style="display: none" onclick="dismiss()"><?= t("Done") ?></button>
+    <button id="gPauseButton" class="ui-state-default ui-corner-all" onclick="dismiss()"><?= t("Pause") ?></button>
+    <button id="gDoneButton" class="ui-state-default ui-corner-all" style="display: none" onclick="dismiss()"><?= t("Done") ?></button>
   </div>
 </div>
diff --git a/core/views/simple_uploader.html.php b/core/views/simple_uploader.html.php
index fd06a72c..0d1d4ee2 100644
--- a/core/views/simple_uploader.html.php
+++ b/core/views/simple_uploader.html.php
@@ -30,5 +30,5 @@
     </embed>
   </object>
 
-  <input type="submit" value="<?= t("Finish") ?>">
+  <input type="submit" class="ui-state-default ui-corner-all" value="<?= t("Finish") ?>"/>
 </form>
diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php
index 92b0f6b7..d6472706 100644
--- a/modules/tag/views/admin_tags.html.php
+++ b/modules/tag/views/admin_tags.html.php
@@ -2,7 +2,7 @@
 <script>
   $("document").ready(function() {
     $("#gTagAdmin .tag-name").attr("title", "<?= t("Click to edit this tag") ?>");
-    $("#gTagAdmin .delete-link").attr("title", "<?= t("Delete this tag") ?>");
+    $("#gTagAdmin .delete-link").attr("title", $(".delete-link:first span").html());
   });
 </script>
 <div class="gBlock">
@@ -40,7 +40,8 @@
           <li>
             <span id="gTag-<?= $tag->id ?>" class="gEditable tag-name"><?= $tag->name ?></span>
             <span class="understate">(<?= $tag->count ?>)</span>
-            <a href="<?= url::site("admin/tags/form_delete/$tag->id") ?>" class="gDialogLink delete-link">X</a>
+            <a href="<?= url::site("admin/tags/form_delete/$tag->id") ?>" class="gDialogLink delete-link gButtonLink">
+                <span class="ui-icon ui-icon-trash"><?= t("Delete this tag") ?></span></a>
           </li>
 
           <? $column_tag_count++ ?>
diff --git a/modules/watermark/views/admin_watermarks.html.php b/modules/watermark/views/admin_watermarks.html.php
index 8210f95e..e83a7efa 100644
--- a/modules/watermark/views/admin_watermarks.html.php
+++ b/modules/watermark/views/admin_watermarks.html.php
@@ -8,7 +8,7 @@
   <? if (empty($name)): ?>
   <a href="<?= url::site("admin/watermarks/form_add") ?>"
      title="<?= t("Upload a watermark") ?>"
-     class="gDialogLink"><?= t("Upload a watermark") ?></a>
+     class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-document-b"></span><?= t("Upload a watermark") ?></a>
   <? else: ?>
   <h2> <?= t("Active Watermark") ?> </h2>
   <p>
@@ -27,10 +27,10 @@
     <div class="controls">
       <a href="<?= url::site("admin/watermarks/form_edit") ?>"
          title="<?= t("Edit Watermark") ?>"
-         class="gDialogLink"><?= t("edit") ?></a>
+         class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-pencil"></span><?= t("edit") ?></a>
       <a href="<?= url::site("admin/watermarks/form_delete") ?>"
          title="<?= t("Delete Watermark") ?>"
-         class="gDialogLink"><?= t("delete") ?></a>
+         class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></a>
     </div>
   </div>
   <? endif ?>
diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index baf85855..f5ebb50c 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -289,6 +289,10 @@ li.gGroup {
   float: left;
   padding: .2em .2em 0 .1em;
 }
+#gProgress button {
+  float: right;
+  margin-top: 1em;
+}
 
 /** *******************************************************************
  * 7) Server Add 
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index d401edb4..e440cd82 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -119,6 +119,7 @@ td {
 
 fieldset {
   border: 1px solid #ccc;
+  padding-bottom: .8em;
 }
 
 #gHeader fieldset,