diff --git a/public/language/ar/topic.json b/public/language/ar/topic.json
index 0f8a291542..a022f2987d 100644
--- a/public/language/ar/topic.json
+++ b/public/language/ar/topic.json
@@ -2,6 +2,7 @@
     "topic": "موضوع",
     "topics": "مواضيع",
     "no_topics_found": "لا توجد مواضيع !",
+    "no_posts_found": "No posts found!",
     "profile": "ملف",
     "posted_by": "Posted by",
     "chat": "دردشة",
@@ -18,13 +19,17 @@
     "tools": "أدوات",
     "flag": "Flag",
     "flag_title": "Flag this post for moderation",
+    "deleted_message": "This thread has been deleted. Only users with thread management privileges can see it.",
     "thread_tools.title": "أدوات الموضوع",
     "thread_tools.markAsUnreadForAll": "علم غير مقروء",
     "thread_tools.pin": "علق الموضوع",
+    "thread_tools.unpin": "Unpin Topic",
     "thread_tools.lock": "قفل الموضوع",
+    "thread_tools.unlock": "Unlock Topic",
     "thread_tools.move": "نقل الموضوع",
     "thread_tools.fork": "تفرع الموضوع",
     "thread_tools.delete": "حذف الموضوع",
+    "thread_tools.restore": "Restore Topic",
     "load_categories": "تحميل الفئات",
     "disabled_categories_note": "الفئات المجلدة رمادية",
     "confirm_move": "انقل",
@@ -34,6 +39,10 @@
     "favourites.not_logged_in.title": "ليس موجود حالياً",
     "favourites.not_logged_in.message": "الرجاء تسجيل الدخول لتفضل هذا الرد",
     "favourites.has_no_favourites": "ليس لديك أي ردود مفضلة. فضل بعد الردود لرؤيتهم هنا",
+    "vote.not_logged_in.title": "Not Logged In",
+    "vote.not_logged_in.message": "Please log in in order to vote",
+    "vote.cant_vote_self.title": "Invalid Vote",
+    "vote.cant_vote_self.message": "You cannot vote for your own post",
     "loading_more_posts": "تحميل المزيد من المشاركات",
     "move_topic": "نقل الموضوع",
     "move_post": "نقل الرد",
diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js
index 91fde9d7b4..3910ee9bc9 100644
--- a/public/src/forum/topic.js
+++ b/public/src/forum/topic.js
@@ -913,7 +913,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 				x;
 
 			if (locked === true) {
-				translator.translate('<i class="fa fa-unlock"></i> [[topic:thread_tools.unlock]] [[topic:topic]]', function(translated) {
+				translator.translate('<i class="fa fa-unlock"></i> [[topic:thread_tools.unlock]]', function(translated) {
 					lockThreadEl.html(translated);
 				});
 				threadReplyBtn.attr('disabled', true);
@@ -937,7 +937,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 
 				thread_state.locked = '1';
 			} else {
-				translator.translate('<i class="fa fa-lock"></i> [[topic:thread_tools.lock]] [[topic:topic]]', function(translated) {
+				translator.translate('<i class="fa fa-lock"></i> [[topic:thread_tools.lock]]', function(translated) {
 					lockThreadEl.html(translated);
 				});
 				threadReplyBtn.attr('disabled', false);
@@ -971,7 +971,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 				deleteNotice = document.getElementById('thread-deleted') || document.createElement('div');
 
 			if (deleted) {
-				translator.translate('<i class="fa fa-comment"></i> [[topic:thread_tools.restore]] [[topic:topic]]', function(translated) {
+				translator.translate('<i class="fa fa-comment"></i> [[topic:thread_tools.restore]]', function(translated) {
 					deleteTextEl.html(translated);
 				});
 				threadEl.addClass('deleted');
@@ -984,7 +984,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 
 				thread_state.deleted = '1';
 			} else {
-				translator.translate('<i class="fa fa-trash-o"></i> [[topic:thread_tools.delete]] [[topic:topic]]', function(translated) {
+				translator.translate('<i class="fa fa-trash-o"></i> [[topic:thread_tools.delete]]', function(translated) {
 					deleteTextEl.html(translated);
 				});
 				threadEl.removeClass('deleted');
@@ -997,7 +997,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 		function set_pinned_state(pinned, alert) {
 			var pinEl = $('.pin_thread');
 
-			translator.translate('<i class="fa fa-thumb-tack"></i> [[topic:thread_tools.' + (pinned ? 'unpin' : 'pin') + ']] [[topic:topic]]', function(translated) {
+			translator.translate('<i class="fa fa-thumb-tack"></i> [[topic:thread_tools.' + (pinned ? 'unpin' : 'pin') + ']]', function(translated) {
 				if (pinned) {
 					pinEl.html(translated);
 					if (alert) {
diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl
index d56bac87d3..c68438c48b 100644
--- a/public/templates/topic.tpl
+++ b/public/templates/topic.tpl
@@ -178,13 +178,13 @@
 						<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button">[[topic:thread_tools.title]] <span class="caret"></span></button>
 						<ul class="dropdown-menu pull-right">
 							<li><a href="#" class="markAsUnreadForAll"><i class="fa fa-inbox"></i> [[topic:thread_tools.markAsUnreadForAll]]</a></li>
-							<li><a href="#" class="pin_thread"><i class="fa fa-thumb-tack"></i> [[topic:thread_tools.pin]] [[topic:topic]]</a></li>
-							<li><a href="#" class="lock_thread"><i class="fa fa-lock"></i> [[topic:thread_tools.lock]] [[topic:topic]]</a></li>
+							<li><a href="#" class="pin_thread"><i class="fa fa-thumb-tack"></i> [[topic:thread_tools.pin]]</a></li>
+							<li><a href="#" class="lock_thread"><i class="fa fa-lock"></i> [[topic:thread_tools.lock]]</a></li>
 							<li class="divider"></li>
 							<li><a href="#" class="move_thread"><i class="fa fa-arrows"></i> [[topic:thread_tools.move]]</a></li>
 							<li><a href="#" class="fork_thread"><i class="fa fa-code-fork"></i> [[topic:thread_tools.fork]]</a></li>
 							<li class="divider"></li>
-							<li><a href="#" class="delete_thread"><span class="text-error"><i class="fa fa-trash-o"></i> [[topic:thread_tools.delete]] [[topic:topic]]</span></a></li>
+							<li><a href="#" class="delete_thread"><span class="text-error"><i class="fa fa-trash-o"></i> [[topic:thread_tools.delete]]</span></a></li>
 						</ul>
 					</div>
 				</div>