diff --git a/e107_plugins/forum/forum.css b/e107_plugins/forum/forum.css
index 264a703a0..444f1ccd0 100644
--- a/e107_plugins/forum/forum.css
+++ b/e107_plugins/forum/forum.css
@@ -30,6 +30,10 @@ text-align: center;
     }
 
 
+/* v1.x icon fix */
+.forum-viewforum-admin-icons a                          { vertical-align:top;  width:16px; height:16px; display:inline-block; line-height:14px }
+.forum-viewforum-admin-icons input                      { vertical-align:top;  width:16px; height:16px}
+
 @media all and (min-height: 800px) {
     #forum, #forum-stats, #forum-rules                  { min-height: 500px;  }
 }
diff --git a/e107_plugins/forum/forum_viewforum.php b/e107_plugins/forum/forum_viewforum.php
index 7e1268686..824878e31 100644
--- a/e107_plugins/forum/forum_viewforum.php
+++ b/e107_plugins/forum/forum_viewforum.php
@@ -724,7 +724,7 @@ function parse_thread($thread_info)
 		$moveUrl        = e107::url('forum','move', $thread_info);
 
 		$tVars->ADMIN_ICONS = "
-		<form method='post' action='".e_REQUEST_URI."' id='frmMod_{$forumId}_{$threadId}' style='margin:0;'><div>
+		<form method='post' action='".e_REQUEST_URI."' id='frmMod_{$forumId}_{$threadId}' style='margin:0;'><div class='forum-viewforum-admin-icons'>
 		<input type='image' ".IMAGE_admin_delete." name='deleteThread_{$threadId}' value='thread_action' onclick=\"return confirm_({$threadId})\" />
 		".($thread_info['thread_sticky'] == 1 ? "<input type='image' ".IMAGE_admin_unstick." name='unstick_{$threadId}' value='thread_action' /> " : "<input type='image' ".IMAGE_admin_stick." name='stick_{$threadId}' value='thread_action' /> ")."
 		".($thread_info['thread_active'] ? "<input type='image' ".IMAGE_admin_lock." name='lock_{$threadId}' value='thread_action' /> " : "<input type='image' ".IMAGE_admin_unlock." name='unlock_{$threadId}' value='thread_action' /> "). "
diff --git a/e107_plugins/forum/images/icons/admin_delete.png b/e107_plugins/forum/images/icons/admin_delete.png
index f4985d4a3..37a7c7497 100644
Binary files a/e107_plugins/forum/images/icons/admin_delete.png and b/e107_plugins/forum/images/icons/admin_delete.png differ
diff --git a/e107_plugins/forum/images/icons/admin_lock.png b/e107_plugins/forum/images/icons/admin_lock.png
index c486fe4e4..6df8ea6d8 100644
Binary files a/e107_plugins/forum/images/icons/admin_lock.png and b/e107_plugins/forum/images/icons/admin_lock.png differ
diff --git a/e107_plugins/forum/images/icons/admin_move.png b/e107_plugins/forum/images/icons/admin_move.png
index 1c14e1acc..f1e45cff9 100644
Binary files a/e107_plugins/forum/images/icons/admin_move.png and b/e107_plugins/forum/images/icons/admin_move.png differ
diff --git a/e107_plugins/forum/images/icons/admin_stick.png b/e107_plugins/forum/images/icons/admin_stick.png
index 8b6e0a2fb..a2c0cfb10 100644
Binary files a/e107_plugins/forum/images/icons/admin_stick.png and b/e107_plugins/forum/images/icons/admin_stick.png differ
diff --git a/e107_plugins/forum/images/icons/admin_unlock.png b/e107_plugins/forum/images/icons/admin_unlock.png
index 75b178fd5..42dd93e26 100644
Binary files a/e107_plugins/forum/images/icons/admin_unlock.png and b/e107_plugins/forum/images/icons/admin_unlock.png differ
diff --git a/e107_plugins/forum/images/icons/e.png b/e107_plugins/forum/images/icons/e.png
index 09385ef0a..836be3e1d 100644
Binary files a/e107_plugins/forum/images/icons/e.png and b/e107_plugins/forum/images/icons/e.png differ
diff --git a/e107_plugins/forum/templates/forum_icons_template.php b/e107_plugins/forum/templates/forum_icons_template.php
index ab50fb784..e0d4d5769 100644
--- a/e107_plugins/forum/templates/forum_icons_template.php
+++ b/e107_plugins/forum/templates/forum_icons_template.php
@@ -13,7 +13,7 @@
 if (!defined('e107_INIT')) { exit(); }
 
 $tp = e107::getParser();
-if(deftrue("FONTAWESOME", 4)) {
+if(deftrue("FONTAWESOME", false)) {
 
 define('IMAGE_e', 					'e');
 define('IMAGE_new', 				$tp->toGlyph('fa-star', 'size=2x'));