diff --git a/webui/view/theme/default/templates/audit/helper.tpl b/webui/view/theme/default/templates/audit/helper.tpl
index 6d153e2e..bb2a47ef 100644
--- a/webui/view/theme/default/templates/audit/helper.tpl
+++ b/webui/view/theme/default/templates/audit/helper.tpl
@@ -43,7 +43,7 @@
             <td class="auditcell ip"><?php print $message['ipaddr']; ?></td>
             <td class="auditcell action"><?php print $actions[$message['action']]; ?></td>
             <td class="auditcell description"><?php if($message['description'] != $message['shortdescription']) { ?><span title="<?php print $message['description']; ?>"><?php print $message['shortdescription']; ?></span><?php } else { print $message['description']; } ?></td>
-            <td class="auditcell ref"><?php if(Registry::get('auditor_user') == 1 && $message['id'] > 0) { ?><a href="#" onclick="Piler.view_message(<?php print $message['id']; ?>);"><?php } ?><?php print $message['id']; ?><?php if(Registry::get('auditor_user') == 1 && $message['id'] > 0) { ?></a><?php } ?></td>
+            <td class="auditcell ref"><?php if(Registry::get('auditor_user') == 1 && $message['id'] > 0) { ?><a href="#" onclick="Piler.view_message(<?php print $message['id']; ?>);"><?php print $message['id']; ?></a><?php } ?></td>
          </tr>
 
 <?php } } else { ?>
diff --git a/webui/view/theme/mobile/stylesheet/style-mobile.css b/webui/view/theme/mobile/stylesheet/style-mobile.css
index 6c089ccd..6b6ea885 100644
--- a/webui/view/theme/mobile/stylesheet/style-mobile.css
+++ b/webui/view/theme/mobile/stylesheet/style-mobile.css
@@ -1,7 +1,7 @@
 
 @media screen {
 
-        a { color: #850505; text-decoration: none; }
+        a { color: #0072e6; text-decoration: none; }
 
         p { margin: 0 0 10px 0; }
 
@@ -35,7 +35,7 @@
 
 	#A1 { text-align: right; }
 
-        h3.title { color: #850505; }
+        h3.title { color: #0072e6; }
 
 	.formbottom { margin-bottom: 30px; }
 
@@ -69,7 +69,7 @@
 	.resultrow a { color: #3d3d3d; }
 	.resultrow.odd { background: #f5f5f5; }
 	.resultrow.new { font-style: normal; }
-	.resultrow.new a { color: #850505; }
+	.resultrow.new a { color: #0072e6; }
 	.resultrow.new a.spam { color: #aaa; }
 	.resultrow.selected { border: 2px solid black; }
 	.resultrow.spam { color: #aaa; }
@@ -92,6 +92,8 @@
 	.auditcell.ref { width: 90px; }
 	.auditcell.header { height: 30px; font: bold 12px Arial, sans-serif; color: black; }
 
+	a.auditlink { color: #0072e6; }
+
         #health1 { display: table-cell; margin-top: 10px; margin-bottom: 0; }
         #health2 { display: table-cell; text-align: right; }
 
@@ -101,13 +103,13 @@
 	#pagenav { float: left; margin-top: 0px; margin-bottom: 0px; text-align: left; width: 990px; border: 0px solid red; }
 	.navrow { display: table-row; }
 	.navlink { color: #bbb; font: bold 12px Arial, sans-serif; }
-	#pagenav a.navlink { color: #850505; font: bold 12px Arial, sans-serif; }
+	#pagenav a.navlink { color: #0072e6; font: bold 12px Arial, sans-serif; }
 
         #pagingleft { display: table-cell; float: left; text-align: left; width: 60px;  border: 0px solid red; }
         #pagingcenter { display: table-cell; float: left; text-align: center; width: 145px; border: 0px solid red; }
         #pagingright { display: table-cell; float: left; text-align: right; width: 60px; border: 0px solid red; }
 
-	.messagelink { border-bottom: 1px solid gray; color: #850505; }
+	.messagelink { border-bottom: 1px solid gray; color: #0072e6; }
 	.messagelink.spam { border-bottom: 1px solid gray; color: #aaa; }
 	#results a:hover { color: black; }
 
diff --git a/webui/view/theme/mobile/templates/audit/helper.tpl b/webui/view/theme/mobile/templates/audit/helper.tpl
index 5c05d486..ef04f95d 100644
--- a/webui/view/theme/mobile/templates/audit/helper.tpl
+++ b/webui/view/theme/mobile/templates/audit/helper.tpl
@@ -11,7 +11,7 @@
             <div class="auditcell ip"><?php print $message['ipaddr']; ?></div>
             <div class="auditcell action"><?php print $actions[$message['action']]; ?></div>
             <div class="auditcell description"><?php if($message['description'] != $message['shortdescription']) { ?><span title="<?php print $message['description']; ?>"><?php print $message['shortdescription']; ?></span><?php } else { print $message['description']; } ?></div>
-            <div class="auditcell ref"><?php if(Registry::get('auditor_user') == 1 && $message['id'] > 0) { ?><a href="#" onclick="Piler.view_message(<?php print $message['id']; ?>);"><?php } ?><?php print $message['id']; ?><?php if(Registry::get('auditor_user') == 1 && $message['id'] > 0) { ?></a><?php } ?></div>
+            <div class="auditcell ref"><?php if(Registry::get('auditor_user') == 1 && $message['id'] > 0) { ?><a href="#" class="auditlink" onclick="Piler.view_message(<?php print $message['id']; ?>);"><?php print $message['id']; ?></a><?php } ?></div>
          </div>
 
 <?php } } else { ?>
diff --git a/webui/view/theme/mobile/templates/common/layout-audit.tpl b/webui/view/theme/mobile/templates/common/layout-audit.tpl
index 7b52d93b..2f91280f 100644
--- a/webui/view/theme/mobile/templates/common/layout-audit.tpl
+++ b/webui/view/theme/mobile/templates/common/layout-audit.tpl
@@ -47,7 +47,7 @@
 
          <input type="text" id="_search" name="_search" class="input-medium span6" value="" placeholder="<?php print $text_enter_search_terms; ?>" onclick="Piler.toggle_search_class();" />
 
-         <button id="button_search" class="btn btn-primary" onclick="Piler.auditexpert(this); return false;"><?php print $text_search; ?></button>
+         <button id="button_search" class="btn btn-danger" onclick="Piler.auditexpert(this); return false;"><?php print $text_search; ?></button>
          <input type="button" class="btn" onclick="Piler.cancel();" value="<?php print $text_cancel; ?>" />
       </form>
 
diff --git a/webui/view/theme/mobile/templates/common/layout-search.tpl b/webui/view/theme/mobile/templates/common/layout-search.tpl
index 6dc925bd..fc11518f 100644
--- a/webui/view/theme/mobile/templates/common/layout-search.tpl
+++ b/webui/view/theme/mobile/templates/common/layout-search.tpl
@@ -55,7 +55,7 @@
          <button class="btn" onclick="Piler.cancel(); return false;"><?php print $text_cancel; ?></button>
          <button class="btn " onclick="Piler.saved_search_terms('<?php print $text_saved; ?>'); return false;"><?php print $text_save; ?></button>
          <button class="btn btn-inverse" onclick="Piler.load_saved_search_terms(); return false;"><?php print $text_load; ?></button>
-         <button class="btn btn-warning" onclick="Piler.remove_saved_search_terms('<?php print $text_successfully_removed; ?>'); return false;"><?php print $text_remove; ?></button>
+         <button class="btn" onclick="Piler.remove_saved_search_terms('<?php print $text_successfully_removed; ?>'); return false;"><?php print $text_remove; ?></button>
 
       </form>
 
diff --git a/webui/view/theme/mobile/templates/message/view.tpl b/webui/view/theme/mobile/templates/message/view.tpl
index 1882b194..2c2f63dd 100644
--- a/webui/view/theme/mobile/templates/message/view.tpl
+++ b/webui/view/theme/mobile/templates/message/view.tpl
@@ -32,7 +32,7 @@
 
 <form class="form-inline" name="view">
 
-<strong><?php print $text_notes; ?></strong>: <input type="text" size="60" id="note" name="note" class="input-medium" value="<?php print preg_replace("/\"/", "&quot;", $message['note']); ?>" /> <input type="button" value="<?php print $text_save; ?>" class="btn btn-warning" onclick="Piler.add_note_to_message(<?php print $id; ?>, '<?php print $text_saved; ?>'); " />
+<strong><?php print $text_notes; ?></strong>: <input type="text" size="60" id="note" name="note" class="input-medium" value="<?php print preg_replace("/\"/", "&quot;", $message['note']); ?>" /> <input type="button" value="<?php print $text_save; ?>" class="btn btn-inverse" onclick="Piler.add_note_to_message(<?php print $id; ?>, '<?php print $text_saved; ?>'); " />
 
 </form>
 
diff --git a/webui/view/theme/mobile/templates/search/helper.tpl b/webui/view/theme/mobile/templates/search/helper.tpl
index 926b192d..d6cb7ddb 100644
--- a/webui/view/theme/mobile/templates/search/helper.tpl
+++ b/webui/view/theme/mobile/templates/search/helper.tpl
@@ -36,8 +36,8 @@
          <a xid="size" xorder="1" onclick="Piler.changeOrder(this);"><i class="icon-chevron-up"></i></a>
          <a xid="size" xorder="0" onclick="Piler.changeOrder(this);"><i class="icon-chevron-down"></i></a>
       </td>
-      <td><i class="attachment icon-paper-clip icon-large" title="<?php print $text_attachment_flag; ?>"></i></div>
-      <td>&nbsp;</div>
+      <td><i class="icon-file"></i></div>
+      <td><i class="icon-bookmark"></i></div>
       <td><i class="icon-tag"></i></div>
    <?php if(ENABLE_ON_THE_FLY_VERIFICATION == 1) { ?>
       <td>&nbsp;</td>
@@ -57,11 +57,11 @@
             <td><a href="#" <?php if($message['spam'] == 1) { ?>class="spam"<?php } ?> <?php if($message['subject'] != $message['shortsubject']) { ?>title="<?php print $message['subject']; ?>"<?php } ?> onclick="Piler.view_message_by_pos(<?php print $i; ?>);"><?php if($message['subject'] != $message['shortsubject']) { print $message['shortsubject']; } else { print $message['subject']; } ?></a><?php if($message['reference']) { ?> <a href="#" title="<?php print $text_conversation_available; ?>" onclick="$('#ref').val('<?php print $message['reference']; ?>'); Piler.expert(this);">[+]</span></a><?php } ?></td>
 
             <td><?php print $message['size']; ?></td>
-            <td><?php if($message['attachments'] > 0) { ?><img src="<?php print ICON_ATTACHMENT; ?>" alt="" width="16" height="18" /><?php } else { ?>&nbsp;<?php } ?></td>
-            <td><?php if($message['note']) { ?><a href="#" title="<?php print $message['note']; ?>"><img src="<?php print ICON_NOTES; ?>" alt="akakaka" width="16" height="16" /></a><?php } else { ?>&nbsp;<?php } ?></td>
-            <td><?php if($message['tag']) { ?><a href="#" title="<?php print $message['tag']; ?>"><img src="<?php print ICON_TAG; ?>" alt="" /></a><?php } else { ?>&nbsp;<?php } ?></td>
+            <td><?php if($message['attachments'] > 0) { ?><i class="icon-file"></i><?php } ?></td>
+            <td><?php if($message['note']) { ?><i class="icon-bookmark" title="<?php print $message['note']; ?>"></i><?php } ?></td>
+            <td><?php if($message['tag']) { ?><i class="icon-tag" title="<?php print $message['tag']; ?>"></i><?php } ?></td>
          <?php if(ENABLE_ON_THE_FLY_VERIFICATION == 1) { ?>
-            <td><img src="<?php if($message['verification'] == 1){ print ICON_GREEN_OK; } else { print ICON_RED_X; } ?>" alt="verification status" /></td>
+            <td><i class="icon-<?php if($message['verification'] == 1){ ?>ok<?php } else { ?>remove<?php } ?>-sign" title="verification status"></i></td>
          <?php } ?>
          </tr>
 
@@ -97,6 +97,7 @@
          <?php if($next_page <= $total_pages){ ?><a href="#" onclick="Piler.navigation(<?php print $next_page; ?>);">&gt; </a> <?php } else { ?><span class="navlink">&gt; </span><?php } ?>
          <?php if($page < $total_pages) { ?> &nbsp; <a href="#" onclick="Piler.navigation(<?php print $total_pages; ?>);"> &gt;&gt; </a><?php } else { ?> <span class="navlink"> &nbsp; &gt;&gt;</span><?php } ?>
    </span>
+
 <?php } else { ?>&nbsp;<?php } ?>
 
               <button class="btn piler-right-margin" onclick="Piler.bulk_restore_messages('<?php print $text_restored; ?>'); return false;"><?php print $text_bulk_restore_selected_emails; ?></button>