diff --git a/public/src/forum/category.js b/public/src/forum/category.js
index e9777904ab..09eacd8c55 100644
--- a/public/src/forum/category.js
+++ b/public/src/forum/category.js
@@ -12,7 +12,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 
 		app.enterRoom('category_' + cid);
 
-		$('#twitter-intent').on('click', function () {
+		$('#twitter-share').on('click', function () {
 			window.open(twitterUrl, '_blank', 'width=550,height=420,scrollbars=no,status=no');
 			return false;
 		});
diff --git a/public/templates/category.tpl b/public/templates/category.tpl
index 418c8ca40b..c437ceac2d 100644
--- a/public/templates/category.tpl
+++ b/public/templates/category.tpl
@@ -14,7 +14,7 @@
 	<!-- IF !disableSocialButtons -->
 	<div class="inline-block pull-right">
 		<a href="#" id="facebook-share"><i class="fa fa-facebook-square fa-2x"></i></a>&nbsp;
-		<a href="#" id="twitter-intent"><i class="fa fa-twitter-square fa-2x"></i></a>&nbsp;
+		<a href="#" id="twitter-share"><i class="fa fa-twitter-square fa-2x"></i></a>&nbsp;
 		<a href="#" id="google-share"><i class="fa fa-google-plus-square fa-2x"></i></a>&nbsp;
 	</div>
 	<!-- ENDIF !disableSocialButtons -->
diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl
index 20c8cb4b29..2bb43ff789 100644
--- a/public/templates/topic.tpl
+++ b/public/templates/topic.tpl
@@ -101,9 +101,9 @@
 									<button title="[[topic:share]]"class="btn btn-sm btn-default share" data-toggle="dropdown" href="#"><i class="fa fa-share-square-o"></i></button>
 									<ul class="dropdown-menu text-center pull-right" role="menu" aria-labelledby="dLabel">
 										<!-- IF !disableSocialButtons -->
-										<li class="btn btn-sm btn-default facebook-share" type="button" title=""><i class="fa fa-facebook"></i></li>
-										<li class="btn btn-sm btn-default twitter-share" type="button" title=""><i class="fa fa-twitter"></i></li>
-										<li class="btn btn-sm btn-default google-share" type="button" title=""><i class="fa fa-google-plus"></i></li>
+										<li class="btn btn-sm btn-default facebook-share" type="button" title=""><i class="fa fa-facebook fa-fw"></i></li>
+										<li class="btn btn-sm btn-default twitter-share" type="button" title=""><i class="fa fa-twitter fa-fw"></i></li>
+										<li class="btn btn-sm btn-default google-share" type="button" title=""><i class="fa fa-google-plus fa-fw"></i></li>
 										<!-- ENDIF !disableSocialButtons -->
 										<li>
 											<input type="text" id="post_{posts.pid}_link" value="" class="form-control pull-right post-link" style=""></input>