diff --git a/e107_plugins/forum/forum.php b/e107_plugins/forum/forum.php
index ef7eac91e..189fc0d45 100644
--- a/e107_plugins/forum/forum.php
+++ b/e107_plugins/forum/forum.php
@@ -250,12 +250,13 @@ if (!$forumList)
 
 $forum_string = '';
 $pVars = new e_vars;
+$frm = e107::getForm();
 foreach ($forumList['parents'] as $parent)
 {
 	$status = parse_parent($parent);
 	$pVars->PARENTSTATUS = $status;
 
-	$pVars->PARENTNAME = $parent['forum_name'];
+	$pVars->PARENTNAME = "<a id='".$frm->name2id($parent['forum_name'])."'>".$parent['forum_name']."</a>";
 	$forum_string .= $tp->simpleParse($FORUM_MAIN_PARENT, $pVars);
 	if (!count($forumList['forums'][$parent['forum_id']]))
 	{
diff --git a/e107_plugins/forum/forum_class.php b/e107_plugins/forum/forum_class.php
index b114df87f..f3465afaa 100644
--- a/e107_plugins/forum/forum_class.php
+++ b/e107_plugins/forum/forum_class.php
@@ -1564,6 +1564,8 @@ class e107forum
 	{
 		$e107 = e107::getInstance();
 		$tp = e107::getParser();
+		$frm = e107::getForm();
+		
 		global $FORUM_CRUMB, $forumInfo, $threadInfo, $thread;
 		global $BREADCRUMB,$BACKLINK;  // Eventually we should deprecate BACKLINK
 
@@ -1579,8 +1581,8 @@ class e107forum
 			$replace 	= array(LAN_FORUM_0001, e107::getUrl()->create('forum/forum/main'));
 			$FORUM_CRUMB['forums']['value'] = str_replace($search, $replace, $FORUM_CRUMB['forums']['value']);
 
-			$search 	= '{PARENT_TITLE}';
-			$replace 	= $tp->toHTML($forumInfo['parent_name']);
+			$search 	= array('{PARENT_TITLE}', '{PARENT_HREF}');
+			$replace 	= array($tp->toHTML($forumInfo['parent_name']), e107::getUrl()->create('forum/forum/main')."#".$frm->name2id($forumInfo['parent_name']));
 			$FORUM_CRUMB['parent']['value'] = str_replace($search, $replace, $FORUM_CRUMB['parent']['value']);
 
 			if($forumInfo['forum_sub'])
@@ -1794,22 +1796,22 @@ function img_path($filename)
 			{
 				if($ML)
 				{
-                	$image = (is_readable(e_PLUGIN.'forum/images/'.IMODE.'/'.e_LANGUAGE.'_'.$filename)) ? e_PLUGIN.'forum/images/'.IMODE.'/'.e_LANGUAGE.'_'.$filename : e_PLUGIN.'forum/images/'.IMODE.'/English_'.$filename;
+                	$image = (is_readable(e_PLUGIN.'forum/images/icons/'.e_LANGUAGE.'_'.$filename)) ? e_PLUGIN.'forum/images/icons/'.e_LANGUAGE.'_'.$filename : e_PLUGIN.'forum/images/icons/English_'.$filename;
 				}
 				else
 				{
-                	$image = e_PLUGIN.'forum/images/'.IMODE.'/'.$filename;
+                	$image = e_PLUGIN.'forum/images/icons/'.$filename;
 				}
 			}
 			else
 			{
 				if($ML)
 				{
-					$image = (is_readable(e_PLUGIN."forum/images/lite/".e_LANGUAGE.'_'.$filename)) ? e_PLUGIN.'forum/images/lite/'.e_LANGUAGE.'_'.$filename : e_PLUGIN.'forum/images/lite/English_'.$filename;
+					$image = (is_readable(e_PLUGIN."forum/images/lite/".e_LANGUAGE.'_'.$filename)) ? e_PLUGIN.'forum/images/icons/'.e_LANGUAGE.'_'.$filename : e_PLUGIN.'forum/images/icons/English_'.$filename;
 				}
 				else
                 {
-           			$image = e_PLUGIN.'forum/images/lite/'.$filename;
+           			$image = e_PLUGIN.'forum/images/icons/'.$filename;
 				}
 
 			}
diff --git a/e107_plugins/forum/forum_viewforum.php b/e107_plugins/forum/forum_viewforum.php
index ee33437b5..c85b488e6 100644
--- a/e107_plugins/forum/forum_viewforum.php
+++ b/e107_plugins/forum/forum_viewforum.php
@@ -726,7 +726,7 @@ function fpages($thread_info, $replies)
 				$text .= $text ? ' ' : '';
 				$urlparms['page'] = $aa;
 				$url = e107::getUrl()->create('forum/thread/view', $urlparms);
-				$opts[] = "<a class='btn btn-mini' data-toggle='tooltip' title=\"Go to Page $aa\" href='{$url}'>{$aa}</a>"; //FIXME LAN_GOPAGE syntax?
+				$opts[] = "<a data-toggle='tooltip' title=\"Go to Page $aa\" href='{$url}'>{$aa}</a>"; //FIXME LAN_GOPAGE syntax?
 			}
 			$text .= ' ... ';
 			for($a = $pages-3; $a <= $pages-1; $a++)
@@ -735,7 +735,7 @@ function fpages($thread_info, $replies)
 				$text .= $text ? ' ' : '';
 				$urlparms['page'] = $aa;
 				$url = e107::getUrl()->create('forum/thread/view', $urlparms);
-				$opts[] = "<a class='btn btn-mini' data-toggle='tooltip' title=\"Go to Page $aa\" href='{$url}'>{$aa}</a>"; //FIXME LAN_GOPAGE syntax?
+				$opts[] = "<a data-toggle='tooltip' title=\"Go to Page $aa\" href='{$url}'>{$aa}</a>"; //FIXME LAN_GOPAGE syntax?
 			}
 		}
 		else
@@ -746,12 +746,26 @@ function fpages($thread_info, $replies)
 				$text .= $text ? ' ' : '';
 				$urlparms['page'] = $aa;
 				$url = e107::getUrl()->create('forum/thread/view', $urlparms);
-				$opts[] =  "<a class='btn btn-mini' data-toggle='tooltip' title=\"Go to Page $aa\" href='{$url}'>{$aa}</a>"; //FIXME LAN_GOPAGE syntax?
+				$opts[] =  "<a data-toggle='tooltip' title=\"Go to Page $aa\" href='{$url}'>{$aa}</a>"; //FIXME LAN_GOPAGE syntax?
 			}
 		}
 	
+		if(deftrue('BOOTSTRAP'))
+		{
+			$text = "<div class='pagination pagination-mini' style='margin:0px'>
+					<ul>
+						<li>";
+			
+			$text .= implode("</li><li>",$opts); // ."</div>";	
+			$text .= "</li></ul></div>";				
+		}
+		else 
+		{
+			$text = implode("",$opts); // ."</div>";
+		}
+	
+		
 		
-		$text = implode("",$opts); // ."</div>";
 		
 	}
 	else
diff --git a/e107_plugins/forum/images/icons/announce.png b/e107_plugins/forum/images/icons/announce.png
index 2978abbab..c79178c44 100644
Binary files a/e107_plugins/forum/images/icons/announce.png and b/e107_plugins/forum/images/icons/announce.png differ
diff --git a/e107_plugins/forum/templates/forum_viewforum_template.php b/e107_plugins/forum/templates/forum_viewforum_template.php
index d06ceed6f..e27148b9f 100644
--- a/e107_plugins/forum/templates/forum_viewforum_template.php
+++ b/e107_plugins/forum/templates/forum_viewforum_template.php
@@ -266,7 +266,7 @@ $FORUM_CRUMB['sitename']['sep'] = " :: ";
 $FORUM_CRUMB['forums']['value'] = "<a class='forumlink' href='{FORUMS_HREF}'>{FORUMS_TITLE}</a>";
 $FORUM_CRUMB['forums']['sep'] = " :: ";
 
-$FORUM_CRUMB['parent']['value'] = "{PARENT_TITLE}";
+$FORUM_CRUMB['parent']['value'] = "<a class='forumlink' href='{PARENT_HREF}'>{PARENT_TITLE}</a>"; 
 $FORUM_CRUMB['parent']['sep'] = " :: ";
 
 $FORUM_CRUMB['subparent']['value'] = "<a class='forumlink' href='{SUBPARENT_HREF}'>{SUBPARENT_TITLE}</a>";
@@ -297,7 +297,7 @@ $FORUM_VIEWFORUM_TEMPLATE['header'] 			= "<div class='row-fluid'><div>{BACKLINK}
 												
 													{SUBFORUMS}";
 
-$FORUM_VIEWFORUM_TEMPLATE['item'] 				= "<tr><td>{ICON}</td><td>{THREADNAME}<div><small class='clearfix'>by {POSTER} {THREADTIMELAPSE}  {PAGESX}</small></div></td><td>{REPLIESX}</td><td>{VIEWSX}</td><td><small>{LASTPOSTUSER} {LASTPOSTDATE} </small><div class='span2 right pull-right'>{ADMINOPTIONS}</div></td></tr>\n";
+$FORUM_VIEWFORUM_TEMPLATE['item'] 				= "<tr><td>{ICON}</td><td><div>{THREADNAME}</div><div class='pull-left'><small>by {POSTER} {THREADTIMELAPSE} &nbsp;</small></div><div class='pull-left'> {PAGESX}</div></td><td>{REPLIESX}</td><td>{VIEWSX}</td><td><small>{LASTPOSTUSER} {LASTPOSTDATE} </small><div class='span2 right pull-right'>{ADMINOPTIONS}</div></td></tr>\n";
 $FORUM_VIEWFORUM_TEMPLATE['item-sticky'] 		= $FORUMVIEW['item'] ; // "<tr><td>{THREADNAME}</td></tr>\n";
 $FORUM_VIEWFORUM_TEMPLATE['item-announce'] 		= $FORUMVIEW['item'] ; // "<tr><td>{THREADNAME}</td></tr>\n";
 
diff --git a/e107_plugins/forum/templates/forum_viewtopic_template.php b/e107_plugins/forum/templates/forum_viewtopic_template.php
index b90a72738..becaf01ae 100644
--- a/e107_plugins/forum/templates/forum_viewtopic_template.php
+++ b/e107_plugins/forum/templates/forum_viewtopic_template.php
@@ -297,7 +297,7 @@ $FORUM_CRUMB['sitename']['sep'] = " :: ";
 $FORUM_CRUMB['forums']['value'] = "<a class='forumlink' href='{FORUMS_HREF}'>{FORUMS_TITLE}</a>";
 $FORUM_CRUMB['forums']['sep'] = " :: ";
 
-$FORUM_CRUMB['parent']['value'] = "{PARENT_TITLE}";
+$FORUM_CRUMB['parent']['value'] = "<a class='forumlink' href='{PARENT_HREF}'>{PARENT_TITLE}</a>"; 
 $FORUM_CRUMB['parent']['sep'] = " :: ";
 
 $FORUM_CRUMB['subparent']['value'] = "<a class='forumlink' href='{SUBPARENT_HREF}'>{SUBPARENT_TITLE}</a>";