diff --git a/app/assets/javascripts/discourse/templates/poster_expansion.handlebars b/app/assets/javascripts/discourse/templates/poster_expansion.handlebars
index 65d733dcf7..48d92ea151 100644
--- a/app/assets/javascripts/discourse/templates/poster_expansion.handlebars
+++ b/app/assets/javascripts/discourse/templates/poster_expansion.handlebars
@@ -23,6 +23,7 @@
 
   {{#if user}}
     <div class="metadata">
+      {{#if user.location}}<h3><i class="fa fa-map-marker"></i> {{{user.location}}}</h3>{{/if}}
       <h3>{{i18n last_post}} {{unboundDate path="user.last_posted_at" leaveAgo="true"}}</h3>
       <h3>{{i18n joined}} {{unboundDate path="user.created_at" leaveAgo="true"}}</h3>
       {{groups-list groups=user.custom_groups}}
diff --git a/app/assets/javascripts/discourse/templates/user/user.js.handlebars b/app/assets/javascripts/discourse/templates/user/user.js.handlebars
index 90d8f305a1..1acd48aac0 100644
--- a/app/assets/javascripts/discourse/templates/user/user.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/user/user.js.handlebars
@@ -87,7 +87,7 @@
           <div class='secondary'>
             <dl>
               {{#if location}}
-                <dt>{{i18n user.location}}</dt><dd>{{location}}</a></dd>
+                <dd><i class="fa fa-map-marker"></i> {{location}}</dd>
               {{/if}}
               {{#if websiteName}}
                 <dt>{{i18n user.website}}</dt><dd><a {{bind-attr href="website"}} target="_blank">{{websiteName}}</a></dd>