diff --git a/e107_core/shortcodes/single/email_item.sc b/e107_core/shortcodes/single/email_item.sc
index ed82b8f13..71226d57d 100644
--- a/e107_core/shortcodes/single/email_item.sc
+++ b/e107_core/shortcodes/single/email_item.sc
@@ -15,12 +15,12 @@ if(deftrue('BOOTSTRAP'))
 elseif (defined("ICONMAIL") && file_exists(THEME."images/".ICONMAIL)) 
 {
 	$icon = THEME_ABS."images/".ICONMAIL;
-	$img = "<img src='".$icon."' style='border:0' alt='{$parms[0]}' />";
+	$img = "<img src='".$icon."' style='border:0' alt='{$parms[0]}' class='icon S16 action' />";
 }
 else
 {
 	$icon = e_IMAGE_ABS."generic/email.png";
-	$img = "<img src='".$icon."' style='border:0' alt='{$parms[0]}' />";
+	$img = "<img src='".$icon."' style='border:0' alt='{$parms[0]}' class='icon S16 action' />";
 }
 
 // message^source^other_parms
diff --git a/e107_core/shortcodes/single/print_item.sc b/e107_core/shortcodes/single/print_item.sc
index 80f03ad6b..de2ea7697 100644
--- a/e107_core/shortcodes/single/print_item.sc
+++ b/e107_core/shortcodes/single/print_item.sc
@@ -10,12 +10,12 @@ if(deftrue('BOOTSTRAP'))
 elseif (defined("ICONPRINT") && file_exists(THEME."images/".ICONPRINT))
 {
 	$icon = THEME_ABS."images/".ICONPRINT;
-	$img = "<img src='".$icon."' style='border:0' alt='{$parms[0]}'   />";
+	$img = "<img src='".$icon."' style='border:0' alt='{$parms[0]}'  class='icon S16 action'  />";
 }
 else
 {
 	$icon = e_IMAGE_ABS."generic/printer.png";
-	$img = "<img src='".$icon."' style='border:0' alt='{$parms[0]}'   />";
+	$img = "<img src='".$icon."' style='border:0' alt='{$parms[0]}'  class='icon S16 action'  />";
 }
 
 
diff --git a/e107_plugins/forum/forum_viewtopic.php b/e107_plugins/forum/forum_viewtopic.php
index 06d9beca6..05ca2f9c8 100644
--- a/e107_plugins/forum/forum_viewtopic.php
+++ b/e107_plugins/forum/forum_viewtopic.php
@@ -606,7 +606,7 @@ if ($thread->threadInfo['thread_lastpost'] > USERLV && !in_array($thread->thread
 else
 {
 	$ret = array('lastpost'=>$thread->threadInfo['thread_lastpost'], 'lastvisit'=>USERLV, 'thread'=>$thread->threadId, 'viewed'=>$threadsViewed);
-	$mes->addDebug(print_a($ret,true));
+	e107::getDebug()->log($ret);
 	unset($ret);
 }
 
diff --git a/e107_plugins/forum/templates/forum_icons_template.php b/e107_plugins/forum/templates/forum_icons_template.php
index e0d4d5769..3033e7fcd 100644
--- a/e107_plugins/forum/templates/forum_icons_template.php
+++ b/e107_plugins/forum/templates/forum_icons_template.php
@@ -65,7 +65,7 @@ define('IMAGE_untrack', 	'<img src="'.img_path('untrack.png').'" alt="'.LAN_FORU
 
 // User info
 define('IMAGE_website', '<img src="'.img_path('website.png').'" alt="'.LAN_FORUM_2034.'" title="'.LAN_FORUM_2034.'" />');
-define('IMAGE_email', 	'<img src="'.img_path('email.png').'" alt="'.LAN_FORUM_2044.'" title="'.LAN_FORUM_2044.'" />');
+define('IMAGE_email', 	'<img src="'.img_path('email.png').'" alt="'.LAN_FORUM_2044.'" title="'.LAN_FORUM_2044.'" class="icon S16 action" />');
 define('IMAGE_profile', '<img src="'.img_path('profile.png').'" alt="'.LAN_FORUM_4007.'" title="'.LAN_FORUM_4007.'" />');
 
 // action
diff --git a/e107_plugins/forum/templates/forum_template.php b/e107_plugins/forum/templates/forum_template.php
index 33661636f..67f9e6b47 100644
--- a/e107_plugins/forum/templates/forum_template.php
+++ b/e107_plugins/forum/templates/forum_template.php
@@ -27,7 +27,7 @@ if (!isset($FORUM_MAIN_FORUM))
 {
 	$SC_WRAPPER['LASTPOST:type=date'] = "{---}<br>";
 	$SC_WRAPPER['LASTPOST:type=url'] = " <a href='{---}'>".IMAGE_post2."</a>";
-	$FORUM_MAIN_FORUM = "<tr>\n<td style='width:5%; text-align:center' class='forumheader2'>{NEWFLAG}</td>\n<td style='width:55%' class='forumheader2'>{FORUMNAME}<br /><span class='smallblacktext'>{FORUMDESCRIPTION}</span>{FORUMSUBFORUMS}</td>\n<td style='width:10%; text-align:center' class='forumheader3'>{THREADS}</td>\n<td style='width:10%; text-align:center' class='forumheader3'>{REPLIES}</td>\n<td style='width:20%; text-align:center' class='forumheader3'><span class='smallblacktext'>{LASTPOST:type=date}{LASTPOSTUSER}{LASTPOST:type=url}</span></td>\n</tr>";
+	$FORUM_MAIN_FORUM = "<tr>\n<td style='width:5%; text-align:center' class='forumheader2'>{NEWFLAG}</td>\n<td style='width:55%' class='forumheader2'>{FORUMNAME}<br /><span class='smallblacktext'>{FORUMDESCRIPTION}</span>{FORUMSUBFORUMS}</td>\n<td style='width:10%; text-align:center' class='forumheader3'>{THREADS}</td>\n<td style='width:10%; text-align:center' class='forumheader3'>{REPLIES}</td>\n<td style='width:20%; text-align:center' class='forumheader3'><span class='smallblacktext'>{LASTPOST}</span></td>\n</tr>";
 }
 if (!isset($FORUM_MAIN_END))
 {
diff --git a/e107_plugins/forum/templates/forum_viewforum_template.php b/e107_plugins/forum/templates/forum_viewforum_template.php
index 51485e21e..a5f7cfae7 100644
--- a/e107_plugins/forum/templates/forum_viewforum_template.php
+++ b/e107_plugins/forum/templates/forum_viewforum_template.php
@@ -70,7 +70,7 @@ if(empty($FORUM_VIEW_START_CONTAINER))
 	";
 }
 
-
+// XXX These templates should remain unchanged.
 if (empty($FORUM_VIEW_FORUM)) {
 	$SC_WRAPPER['LASTPOST:type=date'] = "{---}<br>";
 	$SC_WRAPPER['LASTPOST:type=url'] = " <a href='{---}'>".IMAGE_post2."</a>";
@@ -91,7 +91,7 @@ if (empty($FORUM_VIEW_FORUM)) {
 		<td style='vertical-align:middle; text-align:center; width:20%' class='forumheader3'>{POSTER}<br />{THREADDATE}</td>
 		<td style='vertical-align:middle; text-align:center; width:5%' class='forumheader3'>{REPLIES}</td>
 		<td style='vertical-align:middle; text-align:center; width:5%' class='forumheader3'>{VIEWS}</td>
-		<td style='vertical-align:middle; text-align:center; width:20%' class='forumheader3'>{LASTPOST:type=date}{LASTPOSTUSER}{LASTPOST:type=url}</td>
+		<td style='vertical-align:middle; text-align:center; width:20%' class='forumheader3'>{LASTPOST}</td>
 		</tr>";
 }