diff --git a/public/templates/category.tpl b/public/templates/category.tpl
index bbfdfc77fb..1d473d5e30 100644
--- a/public/templates/category.tpl
+++ b/public/templates/category.tpl
@@ -34,14 +34,14 @@
 		<!-- BEGIN topics -->
 		<a href="../../topic/{topics.slug}"><li class="category-item {topics.deleted-class}">
 			<div class="row-fluid">
-				<!-- <div class="span1 thread-rating hidden-phone hidden-tablet">
+				<!-- <div class="span1 thread-rating hidden-xs hidden-sm">
 					<span>
 						<i class="icon-star icon-3x"></i><br />
 						38
 					</span>
 				</div> -->
 				<div class="span12 topic-row">
-					<div class="latest-post visible-desktop">
+					<div class="latest-post visible-lg visible-md">
 						<div class="pull-right">
 							<img style="width: 48px; height: 48px; /*temporary*/" src="{topics.teaser_userpicture}" />
 							<p><strong>{topics.teaser_username}</strong>: {topics.teaser_text}</p>
diff --git a/public/templates/footer.tpl b/public/templates/footer.tpl
index e61daec9d5..f2889d1e8c 100644
--- a/public/templates/footer.tpl
+++ b/public/templates/footer.tpl
@@ -32,7 +32,7 @@
 	</div>
 
 	<!-- START Forum Info -->
-	<div id="footer" class="container hidden-phone" style="padding-top: 50px; display: none">
+	<div id="footer" class="container hidden-xs" style="padding-top: 50px; display: none">
 		<div class="alert alert-info">
 			<span id="active_users"></span>; <span id="active_record"></span><br />
 			<span id="number_of_users"></span> <span id="post_stats"></span><br />
diff --git a/public/templates/recent.tpl b/public/templates/recent.tpl
index 9cc0176c83..ff3777698a 100644
--- a/public/templates/recent.tpl
+++ b/public/templates/recent.tpl
@@ -23,7 +23,7 @@
 			<li class="category-item {topics.deleted-class}">
 				<div class="row-fluid">
 					<div class="span12 topic-row img-polaroid">
-						<div class="latest-post visible-desktop">
+						<div class="latest-post visible-lg visible-md">
 							<div class="pull-right">										
 								<img style="width: 48px; height: 48px; /*temporary*/" src="{topics.teaser_userpicture}" />
 								<p><strong>{topics.teaser_username}</strong>: {topics.teaser_text}</p>
diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl
index 9b6d423a27..bf40808b81 100644
--- a/public/templates/topic.tpl
+++ b/public/templates/topic.tpl
@@ -9,7 +9,7 @@
 		<li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
 			<span itemprop="title">{topic_name}</span>
 		</li>
-		<div id="thread_active_users" class="hidden-phone"></div>
+		<div id="thread_active_users" class="hidden-xs"></div>
 	</ol>
 </div>
 
@@ -60,10 +60,10 @@
 					</div>
 					<div class="post-signature">{main_posts.signature}</div>
 					<div class="profile-block">
-						<img class="hidden-desktop" src="{main_posts.picture}" align="left" /> posted by <strong><a class="username-field" href="/users/{main_posts.userslug}">{main_posts.username}</a></strong> {main_posts.relativeTime} ago
-						<span class="{main_posts.edited-class} hidden-phone">| last edited by <strong><a href="/users/{main_posts.editorslug}">{main_posts.editorname}</a></strong> {main_posts.relativeEditTime} ago</span>
-						<span class="{main_posts.edited-class}"><i class="icon-edit visible-phone" title="edited by {main_posts.editorname} {main_posts.relativeEditTime} ago"></i></span>
-						<div class="post-buttons visible-phone">
+						<img class="hidden-lg hidden-md" src="{main_posts.picture}" align="left" /> posted by <strong><a class="username-field" href="/users/{main_posts.userslug}">{main_posts.username}</a></strong> {main_posts.relativeTime} ago
+						<span class="{main_posts.edited-class} hidden-xs">| last edited by <strong><a href="/users/{main_posts.editorslug}">{main_posts.editorname}</a></strong> {main_posts.relativeEditTime} ago</span>
+						<span class="{main_posts.edited-class}"><i class="icon-edit visible-xs" title="edited by {main_posts.editorname} {main_posts.relativeEditTime} ago"></i></span>
+						<div class="post-buttons visible-xs">
 							<button class="post_reply btn-link"><i class="icon-reply"></i></button>
 						</div>
 						<div class="post-buttons">
@@ -78,14 +78,14 @@
 	<!-- BEGIN posts -->
 		<a id="post_anchor_{posts.pid}" name="{posts.pid}"></a>
 		<li class="row-fluid post-row" data-pid="{posts.pid}" data-uid="{posts.uid}" data-username="{posts.username}" data-deleted="{posts.deleted}">
-			<div class="span1 profile-image-block hidden-phone hidden-tablet">
+			<div class="span1 profile-image-block hidden-xs hidden-sm">
 				<!--<i class="icon-spinner icon-spin icon-2x pull-left"></i>-->
 				<a href="/users/{posts.userslug}">
 					<img src="{posts.picture}" align="left" class="img-polaroid"/>
 				</a>
 				<div class="stats">
 					<i class="icon-star"></i><span class="user_rep_{posts.uid} formatted-number">{posts.user_rep}</span>
-					<div id="ids_{posts.pid}_{posts.uid}" class="chat hidden-phone" title="Chat"><i class="icon-comment"></i></div>
+					<div id="ids_{posts.pid}_{posts.uid}" class="chat hidden-xs" title="Chat"><i class="icon-comment"></i></div>
 				</div>
 				<span class="label label-important {posts.show_banned}">banned</span>			
 			</div>
@@ -100,15 +100,15 @@
 					<div class="post-signature">{posts.signature}</div>
 					<div class="profile-block">
 						<span class="post-buttons">
-							<button id="ids_{posts.pid}_{posts.uid}" class="edit {posts.display_moderator_tools} btn-link hidden-phone" title="Edit"><i class="icon-pencil"></i></button>
-							<button id="ids_{posts.pid}_{posts.uid}" class="delete {posts.display_moderator_tools} btn-link hidden-phone" title="Delete"><i class="icon-trash"></i></button>
-							<button id="favs_{posts.pid}_{posts.uid}" class="favourite btn-link hidden-phone" title="Favourite"><span class="post_rep_{posts.pid}">{posts.post_rep} </span><i class="{posts.fav_star_class}"></i></button>
-							<button id="quote_{posts.pid}_{posts.uid}" class="quote btn-link hidden-phone" title="Quote"><i class="icon-quote-left"></i></button>
+							<button id="ids_{posts.pid}_{posts.uid}" class="edit {posts.display_moderator_tools} btn-link hidden-xs" title="Edit"><i class="icon-pencil"></i></button>
+							<button id="ids_{posts.pid}_{posts.uid}" class="delete {posts.display_moderator_tools} btn-link hidden-xs" title="Delete"><i class="icon-trash"></i></button>
+							<button id="favs_{posts.pid}_{posts.uid}" class="favourite btn-link hidden-xs" title="Favourite"><span class="post_rep_{posts.pid}">{posts.post_rep} </span><i class="{posts.fav_star_class}"></i></button>
+							<button id="quote_{posts.pid}_{posts.uid}" class="quote btn-link hidden-xs" title="Quote"><i class="icon-quote-left"></i></button>
 							<button class="post_reply btn-link" title="Reply"><i class="icon-reply"></i></button>
 						</span>
-						<img class="hidden-desktop" src="{posts.picture}" align="left" /> posted by <strong><a class="username-field" href="/users/{posts.userslug}">{posts.username}</a></strong> {posts.relativeTime} ago
-						<span class="{posts.edited-class} hidden-phone">| last edited by <strong><a href="/users/{posts.editorslug}">{posts.editorname}</a></strong> {posts.relativeEditTime} ago</span>
-						<span class="{posts.edited-class}"><i class="icon-edit visible-phone" title="edited by {posts.editorname} {posts.relativeEditTime} ago"></i></span>
+						<img class="hidden-lg hidden-md" src="{posts.picture}" align="left" /> posted by <strong><a class="username-field" href="/users/{posts.userslug}">{posts.username}</a></strong> {posts.relativeTime} ago
+						<span class="{posts.edited-class} hidden-xs">| last edited by <strong><a href="/users/{posts.editorslug}">{posts.editorname}</a></strong> {posts.relativeEditTime} ago</span>
+						<span class="{posts.edited-class}"><i class="icon-edit visible-xs" title="edited by {posts.editorname} {posts.relativeEditTime} ago"></i></span>
 					</div>
 				</div>
 			</div>
diff --git a/public/templates/unread.tpl b/public/templates/unread.tpl
index 1e4d53cf00..1ecb943e22 100644
--- a/public/templates/unread.tpl
+++ b/public/templates/unread.tpl
@@ -27,7 +27,7 @@
 			<li class="category-item {topics.deleted-class}">
 				<div class="row-fluid">
 					<div class="span12 topic-row img-polaroid">
-						<div class="latest-post visible-desktop">
+						<div class="latest-post visible-lg visible-md">
 							<div class="pull-right">										
 								<img style="width: 48px; height: 48px; /*temporary*/" src="{topics.teaser_userpicture}" />
 								<p><strong>{topics.teaser_username}</strong>: {topics.teaser_text}</p>