diff --git a/app/assets/javascripts/discourse/templates/choose_topic.js.handlebars b/app/assets/javascripts/discourse/templates/choose_topic.js.handlebars
index 9632519ea60..7f9cbf87961 100644
--- a/app/assets/javascripts/discourse/templates/choose_topic.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/choose_topic.js.handlebars
@@ -12,6 +12,7 @@
       <div class='controls'>
         <label class='radio'>
         <input type='radio' id="choose-topic-{{unbound id}}" name='choose_topic_id' {{action chooseTopic this target="view"}}>{{title}}
+        </label>
       </div>
     {{/each}}
     </ul>
diff --git a/app/assets/javascripts/discourse/templates/components/category-drop.js.handlebars b/app/assets/javascripts/discourse/templates/components/category-drop.js.handlebars
index b9efc849563..36bba0c22fe 100644
--- a/app/assets/javascripts/discourse/templates/components/category-drop.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/components/category-drop.js.handlebars
@@ -7,9 +7,9 @@
   </a>
 {{else}}
   {{#if noSubcategories}}
-    <a href='#' {{action expand}} class='badge-category home' {{bind-attr style="badgeStyle"}}>{{i18n categories.no_subcategory}}</i></a>
+    <a href='#' {{action expand}} class='badge-category home' {{bind-attr style="badgeStyle"}}>{{i18n categories.no_subcategory}}</a>
   {{else}}
-    <a href='#' {{action expand}} class='badge-category home' {{bind-attr style="badgeStyle"}}>{{allCategoriesLabel}}</i></a>
+    <a href='#' {{action expand}} class='badge-category home' {{bind-attr style="badgeStyle"}}>{{allCategoriesLabel}}</a>
   {{/if}}
 {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/composer/similar_topics.js.handlebars b/app/assets/javascripts/discourse/templates/composer/similar_topics.js.handlebars
index f79ebc4219b..c2567e367ba 100644
--- a/app/assets/javascripts/discourse/templates/composer/similar_topics.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/composer/similar_topics.js.handlebars
@@ -1,5 +1,5 @@
 <a href='#' {{action closeMessage this}} class='close'><i class='fa fa-times-circle'></i></a>
-<h3>{{i18n composer.similar_topics}}<h3>
+<h3>{{i18n composer.similar_topics}}</h3>
 
 <ul class='topics'>
   {{#each similarTopics}}
diff --git a/app/assets/javascripts/discourse/views/post_menu_view.js b/app/assets/javascripts/discourse/views/post_menu_view.js
index 11bd20379c3..d402327bb13 100644
--- a/app/assets/javascripts/discourse/views/post_menu_view.js
+++ b/app/assets/javascripts/discourse/views/post_menu_view.js
@@ -207,7 +207,8 @@ Discourse.PostMenuView = Discourse.View.extend({
     }
 
     buffer.push("<button title=\"" + tooltip +
-                "\" data-action=\"bookmark\" class='bookmark'><div class='" + iconClass +
+                "\" data-action=\"bookmark\" class='" + buttonClass +
+                "'><div class='" + iconClass +
                 "'></div></button>");
   },