diff --git a/public/templates/category.tpl b/public/templates/category.tpl
index 62e82aceaa..5efceef0c8 100644
--- a/public/templates/category.tpl
+++ b/public/templates/category.tpl
@@ -46,8 +46,8 @@
 						<a href="../../topic/{topics.slug}" itemprop="url">
 							<div>
 								<h3>
-									<span class="badge {topics.badgeclass}">{topics.postcount}</span>
-									<span class="topic-title" itemprop="name">{topics.title}</span>
+									<meta itemprop="name" content="{topics.title}">
+									<span class="topic-title"><span class="badge {topics.badgeclass}">{topics.postcount}</span>{topics.title}</span>
 								</h3>
 								<small>
 									<strong><i class="{topics.pin-icon}"></i> <i class="{topics.lock-icon}"></i></strong>
diff --git a/public/templates/home.tpl b/public/templates/home.tpl
index e97cdbc523..da640ebdc7 100644
--- a/public/templates/home.tpl
+++ b/public/templates/home.tpl
@@ -6,8 +6,8 @@
 	<!-- BEGIN categories -->
 	<div class="col-md-3 col-xs-6">
 		<a href="category/{categories.slug}" itemprop="url">
-			<span class="badge {categories.badgeclass}">{categories.topic_count} </span>
-			<h4 itemprop="name">{categories.name}</h4>
+			<meta itemprop="name" content="{categories.name}">
+			<h4><span class="badge {categories.badgeclass}">{categories.topic_count} </span> {categories.name}</h4>
 			<div class="icon {categories.blockclass}">
 				<div id="category-{categories.cid}" class="category-slider-{categories.post_count}">
 					<div class="category-box"><i class="{categories.icon} icon-4x"></i></div>
diff --git a/public/themes/vanilla/category.less b/public/themes/vanilla/category.less
index 0f6ecf4473..ac4293b7b3 100644
--- a/public/themes/vanilla/category.less
+++ b/public/themes/vanilla/category.less
@@ -67,11 +67,10 @@
 				white-space: nowrap;
 				text-overflow:ellipsis;
 				overflow: hidden;
-			}
 
-			.badge {
-				vertical-align: 65%;
-				margin-right: 0.25em;
+				.badge {
+					margin-right: 6px;
+				}
 			}
 		}
 
diff --git a/public/themes/vanilla/home.less b/public/themes/vanilla/home.less
index 7ee050fcc2..27d0455106 100644
--- a/public/themes/vanilla/home.less
+++ b/public/themes/vanilla/home.less
@@ -1,8 +1,4 @@
 .home {
-	.badge {
-		vertical-align: 50%;
-	}
-
 	h4 {
 		font-weight: 700;
 		line-height: 21px;