diff --git a/client/src/builtin/EmoteAc.js b/client/src/builtin/EmoteAc.js
index fc80ed83..1659c961 100644
--- a/client/src/builtin/EmoteAc.js
+++ b/client/src/builtin/EmoteAc.js
@@ -1,4 +1,4 @@
-/**
+/**
  * BetterDiscord Emote Autocomplete Module
  * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
  * All rights reserved.
@@ -41,13 +41,14 @@ export default new class EmoteAc extends BuiltinModule {
         if (regex.length <= 0) {
             return {
                 type: 'imagetext',
-                title: [`Your ${acType ? 'most used' : 'favourite'} emotes`, '<= TOGGLE =>'],
+                title: [`Your ${acType ? 'most used' : 'favourite'} emotes`, '', `⬅ ${acType ? 'Favourites' : 'Most Used'} ⮕`],
                 items: EmoteModule[acType ? 'mostUsed' : 'favourites'].sort((a, b) => b.useCount - a.useCount).slice(0, 10).map(mu => {
                     return {
-                        key: acType ? `${mu.key} | ${mu.useCount}` : mu.name,
+                        key: acType ? mu.key : mu.name,
                         value: {
                             src: EMOTE_SOURCES[mu.type].replace(':id', mu.id),
-                            replaceWith: `;${acType ? mu.key : mu.name};`
+                            replaceWith: `;${acType ? mu.key : mu.name};`,
+                            hint: mu.useCount ? `Used ${mu.useCount} times` : null
                         }
                     }
                 })
diff --git a/client/src/styles/partials/generic/autocomplete.scss b/client/src/styles/partials/generic/autocomplete.scss
index 6f4edacf..0ec20149 100644
--- a/client/src/styles/partials/generic/autocomplete.scss
+++ b/client/src/styles/partials/generic/autocomplete.scss
@@ -73,6 +73,10 @@
                         margin-left: 8px;
                         color: #f6f6f7;
                     }
+
+                    .bd-acHint {
+                        color: #72767d;
+                    }
                 }
             }
         }
diff --git a/client/src/ui/components/common/Autocomplete.vue b/client/src/ui/components/common/Autocomplete.vue
index 52a80919..faa5430b 100644
--- a/client/src/ui/components/common/Autocomplete.vue
+++ b/client/src/ui/components/common/Autocomplete.vue
@@ -15,15 +15,17 @@
                 <div class="bd-autocompleteSelector">
                     <div class="bd-autocompleteTitle">
                         {{search.title[0] || search.title}}
-                        <strong>{{search.title[1] || sterm}}</strong>
+                        <strong v-if="search.title.length >= 2">{{search.title[1] || sterm}}</strong>
+                        <strong v-if="search.title.length === 3" :style="{float: 'right'}">{{search.title[2]}}</strong>
                     </div>
                 </div>
             </div>
             <div v-for="(item, index) in search.items" class="bd-autocompleteRow" @mouseover="selectedIndex = index" @click="inject">
                 <div class="bd-autocompleteSelector bd-selectable" :class="{'bd-selected': index === selectedIndex}">
                     <div class="bd-autocompleteField">
-                        <img v-if="search.type === 'imagetext'" :src="item.value.src" :alt="item.key" />
-                        <div class="bd-flexGrow">{{item.key}}</div>
+                        <img v-if="search.type === 'imagetext'" :src="item.src || item.value.src" :alt="item.key || item.text || item.alt" />
+                        <div class="bd-flexGrow">{{item.key || item.text}}</div>
+                        <div class="bd-acHint" v-if="item.hint || (item.value && item.value.hint)">{{item.hint || item.value.hint}}</div>
                     </div>
                 </div>
             </div>