diff --git a/admin/themes/default/template/album_notification.tpl b/admin/themes/default/template/album_notification.tpl
index 5a1ff943b..8c56544b2 100644
--- a/admin/themes/default/template/album_notification.tpl
+++ b/admin/themes/default/template/album_notification.tpl
@@ -117,7 +117,9 @@ span.errors {
 {/if}
 
   <p class="actionButtons">
-    <input class="submit" type="submit" value="{'Send'|@translate}" name="submitEmail">
+    <button name="submitEmail" type="submit" class="buttonLike">
+      <i class="icon-mail"></i> {'Send'|translate}
+    </button>
     <span class="errors" style="display:none">&#x2718; {'No recipient selected'|translate}</span>
   </p>
 
diff --git a/admin/themes/default/template/cat_list.tpl b/admin/themes/default/template/cat_list.tpl
index 87c0b2d70..2a47b3134 100644
--- a/admin/themes/default/template/cat_list.tpl
+++ b/admin/themes/default/template/cat_list.tpl
@@ -58,9 +58,9 @@ jQuery(document).ready(function(){
 
 <h2><span style="letter-spacing:0">{$CATEGORIES_NAV}</span> &#8250; {'Album list management'|@translate}</h2>
 <p class="showCreateAlbum" id="notManualOrder">
-  <a href="#" id="addAlbumOpen">{'create a new album'|@translate}</a>
-  {if count($categories)}| <a href="#" id="autoOrderOpen">{'apply automatic sort order'|@translate}</a>{/if}
-  {if ($PARENT_EDIT)}| <a href="{$PARENT_EDIT}"></span>{'edit'|@translate}</a>{/if}
+  <a href="#" id="addAlbumOpen" class="icon-plus-circled">{'create a new album'|@translate}</a>
+  {if count($categories)}<span class="userSeparator">&middot;</span><a href="#" id="autoOrderOpen" class="icon-sort-number-up">{'apply automatic sort order'|@translate}</a>{/if}
+  {if ($PARENT_EDIT)}<span class="userSeparator">&middot;</span><a href="{$PARENT_EDIT}" class="icon-pencil"></span>{'edit'|@translate}</a>{/if}
 </p>
 <form id="formCreateAlbum" action="{$F_ACTION}" method="post" style="display:none;">
   <fieldset class="with-border">
@@ -73,8 +73,11 @@ jQuery(document).ready(function(){
       </p>
       
       <p class="actionButtons">
-        <input class="submit" name="submitAdd" type="submit" value="{'Create'|@translate}">
-        <a href="#" id="addAlbumClose">{'Cancel'|@translate}</a>
+        <button name="submitAdd" type="submit" class="buttonLike">
+          <i class="icon-plus-circled"></i> {'Create'|translate}
+        </button>
+
+        <a href="#" id="addAlbumClose" class="icon-cancel-circled">{'Cancel'|@translate}</a>
       </p>
   </fieldset>
 </form>
@@ -95,8 +98,10 @@ jQuery(document).ready(function(){
     </p>
   
     <p class="actionButtons">
-      <input class="submit" name="submitAutoOrder" type="submit" value="{'Save order'|@translate}">
-      <a href="#" id="autoOrderClose">{'Cancel'|@translate}</a>
+      <button name="submitAutoOrder" type="submit" class="buttonLike">
+        <i class="icon-floppy"></i> {'Save order'|translate}
+      </button>
+      <a href="#" id="autoOrderClose" class="icon-cancel-circled">{'Cancel'|@translate}</a>
     </p>
   </fieldset>
 </form>
diff --git a/admin/themes/default/template/cat_perm.tpl b/admin/themes/default/template/cat_perm.tpl
index e90d6dc1a..1da975251 100644
--- a/admin/themes/default/template/cat_perm.tpl
+++ b/admin/themes/default/template/cat_perm.tpl
@@ -171,7 +171,10 @@ jQuery("#selectStatus").change(function() {
 </fieldset>
 
   <p style="margin:12px;text-align:left;">
-    <input class="submit" type="submit" value="{'Save Settings'|@translate}" name="submit">
+    <button name="submit" type="submit" class="buttonLike">
+      <i class="icon-floppy"></i> {'Save Settings'|@translate}
+    </button>
+
     <label id="applytoSubAction" style="display:none;" class="font-checkbox">
       <span class="icon-check"></span>
       <input type="checkbox" name="apply_on_sub" {if $INHERIT}checked="checked"{/if}>
diff --git a/admin/themes/default/template/element_set_ranks.tpl b/admin/themes/default/template/element_set_ranks.tpl
index 71f8ab9a4..3321a69fa 100644
--- a/admin/themes/default/template/element_set_ranks.tpl
+++ b/admin/themes/default/template/element_set_ranks.tpl
@@ -95,7 +95,9 @@ jQuery('.thumbnail').tipTip({
       </div>
   </fieldset>
   <p>
-    <input type="submit" value="{'Submit'|@translate}" name="submit">
+    <button name="submit" type="submit" class="buttonLike">
+      <i class="icon-floppy"></i> {'Save Settings'|@translate}
+    </button>
 
     <label class="font-checkbox">
       <span class="icon-check"></span>
diff --git a/admin/themes/default/template/rating.tpl b/admin/themes/default/template/rating.tpl
index 9dcce6f12..8ef3d72d8 100644
--- a/admin/themes/default/template/rating.tpl
+++ b/admin/themes/default/template/rating.tpl
@@ -23,10 +23,13 @@
       <input type="text" name="display" size="2" value="{$DISPLAY}">
     </label>
 
-    <label>
-      &nbsp;
-    <input class="submit" type="submit" value="{'Submit'|@translate}">
-    </label>
+    <div style="clear:both"></div>
+
+    <p style="margin:10px 0 0 0">
+      <button name="submit" type="submit" class="buttonLike">
+        <i class="icon-filter"></i> {'Submit'|translate}
+      </button>
+    </p>
     <input type="hidden" name="page" value="rating">
   </fieldset>
 </form>
diff --git a/admin/themes/default/template/rating_user.tpl b/admin/themes/default/template/rating_user.tpl
index e1493832a..6d93f9610 100644
--- a/admin/themes/default/template/rating_user.tpl
+++ b/admin/themes/default/template/rating_user.tpl
@@ -54,10 +54,16 @@ body .ui-tooltip {
 	<label>{'Consensus deviation'|@translate}
 	<input type="text" size="5" name="consensus_top_number" value="{$CONSENSUS_TOP_NUMBER}">
 	{'Best rated'|@translate}
+
 	</label>
 
-	<input type="submit" value="{'Submit'|@translate}">
-	</label>
+  <div style="clear:both"></div>
+
+  <p style="margin:10px 0 0 0">
+    <button name="submit" type="submit" class="buttonLike">
+      <i class="icon-filter"></i> {'Submit'|translate}
+    </button>
+  </p>
 	<input type="hidden" name="page" value="rating_user">
 </fieldset>
 </form>
diff --git a/admin/themes/default/template/tags.tpl b/admin/themes/default/template/tags.tpl
index 51282c2d0..fb18f69c3 100644
--- a/admin/themes/default/template/tags.tpl
+++ b/admin/themes/default/template/tags.tpl
@@ -3,7 +3,7 @@
 
 {html_style}
 .showInfo { text-indent:5px; }
-.buttonLike i { font-size:14px; }
+form fieldset p { margin-left:0; }
 {/html_style}
 
 {footer_script require='jquery'}
@@ -320,7 +320,10 @@ jQuery("input[name=confirm_deletion]").change(function() {
         </span>
 
         <p id="applyActionBlock" style="display:none" class="actionButtons">
-          <input id="applyAction" class="submit" type="submit" value="{'Apply action'|@translate}" name=""> <span id="applyOnDetails"></span>
+          <button id="applyAction" name="submit" type="submit" class="buttonLike">
+            <i class="icon-trash"></i> {'Apply action'|translate} {* icon-trash because the only action is deletion *}
+          </button>
+          <span id="applyOnDetails"></span>
         </p>
       </div> {* #permitAction *}
   </fieldset>