diff --git a/app/assets/javascripts/discourse/templates/category-group-autocomplete.raw.hbs b/app/assets/javascripts/discourse/templates/category-group-autocomplete.raw.hbs
index f169dacf37..5a3ec802d7 100644
--- a/app/assets/javascripts/discourse/templates/category-group-autocomplete.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/category-group-autocomplete.raw.hbs
@@ -1,7 +1,7 @@
 <div class='autocomplete'>
   <ul>
-    {{#each options}}
-      <li>{{category-link this allowUncategorized="true"}}</li>
+    {{#each option in options}}
+      <li>{{category-link option allowUncategorized="true"}}</li>
     {{/each}}
   </ul>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/emoji-selector-autocomplete.raw.hbs b/app/assets/javascripts/discourse/templates/emoji-selector-autocomplete.raw.hbs
index ed2e39c7ab..a01fbde0bd 100644
--- a/app/assets/javascripts/discourse/templates/emoji-selector-autocomplete.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/emoji-selector-autocomplete.raw.hbs
@@ -1,8 +1,8 @@
 <div class='autocomplete'>
   <ul>
-    {{#each options}}
+    {{#each option in  options}}
       <li>
-        <a href><img src='{{src}}' class='emoji'> {{code}}</a>
+        <a href><img src='{{option.src}}' class='emoji'> {{option.code}}</a>
       </li>
     {{/each}}
   </ul>
diff --git a/app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs b/app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs
index 2692f10ea8..8a519786e8 100644
--- a/app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs
@@ -1,13 +1,13 @@
 <div class='emoji-modal'>
   <ul class='toolbar'>
-    {{#each toolbarItems}}<li><a {{#if selected}}class='selected'{{/if}} data-group-id='{{groupId}}'><img src='{{src}}' class='emoji'></a></li>{{/each}}
+    {{#each item in toolbarItems}}<li><a {{#if item.selected}}class='selected'{{/if}} data-group-id='{{item.groupId}}'><img src='{{item.src}}' class='emoji'></a></li>{{/each}}
   </ul>
   <div class='emoji-table-wrapper'>
   <table class='emoji-page'>
-    {{#each rows}}
+    {{#each row in rows}}
       <tr>
-        {{#each this}}
-          <td><a title='{{title}}'><img src='{{src}}' class='emoji'></a></td>
+        {{#each item in row}}
+          <td><a title='{{item.title}}'><img src='{{item.src}}' class='emoji'></a></td>
         {{/each}}
       </tr>
     {{/each}}
@@ -18,16 +18,16 @@
   <div class='nav'>
     <span class='prev'>
       {{#if prevDisabled}}
-        <i class='fa fa-fast-backward'></i>
+        {{fa-icon "fast-backward"}}
       {{else}}
-        <a><i class='fa fa-fast-backward'></i></a>
+        <a>{{fa-icon "fast-backward"}}</a>
       {{/if}}
     </span>
     <span class='next'>
       {{#if nextDisabled}}
-        <i class='fa fa-fast-forward'></i>
+        {{fa-icon "fast-forward"}}
       {{else}}
-        <a><i class='fa fa-fast-forward'></i></a>
+        <a>{{fa-icon "fast-forward"}}</a>
       {{/if}}
     </span>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/group-selector-autocomplete.raw.hbs b/app/assets/javascripts/discourse/templates/group-selector-autocomplete.raw.hbs
index a396c2d7f5..e842a91b34 100644
--- a/app/assets/javascripts/discourse/templates/group-selector-autocomplete.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/group-selector-autocomplete.raw.hbs
@@ -1,7 +1,7 @@
 <div class='autocomplete'>
   <ul>
-    {{#each options}}
-      <li><a href>{{this.name}}</a></li>
+    {{#each option in options}}
+      <li><a href>{{option.name}}</a></li>
     {{/each}}
   </ul>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/user-selector-autocomplete.raw.hbs b/app/assets/javascripts/discourse/templates/user-selector-autocomplete.raw.hbs
index eea69be0b8..f24fea4f55 100644
--- a/app/assets/javascripts/discourse/templates/user-selector-autocomplete.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/user-selector-autocomplete.raw.hbs
@@ -1,21 +1,21 @@
 <div class='autocomplete'>
   <ul>
-    {{#each options.users}}
+    {{#each user in options.users}}
       <li>
-        <a href='#'>{{avatar this imageSize="tiny"}}
-          <span class='username'>{{this.username}}</span>
-          <span class='name'>{{this.name}}</span>
+        <a href='#'>{{avatar user imageSize="tiny"}}
+          <span class='username'>{{user.username}}</span>
+          <span class='name'>{{user.name}}</span>
         </a>
       </li>
     {{/each}}
     {{#if options.groups}}
       {{#if options.users}}<hr>{{/if}}
-      {{#each options.groups}}
+      {{#each group in options.groups}}
         <li>
           <a href=''>
             <i class='icon-group'></i>
-            <span class='username'>{{this.name}}</span>
-            <span class='name'>{{max-usernames usernames max="3"}}</span>
+            <span class='username'>{{group.name}}</span>
+            <span class='name'>{{max-usernames group.usernames max="3"}}</span>
           </a>
         </li>
       {{/each}}