diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
index 330a57ab7d78..d5f9a0e363ae 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
@@ -59,7 +59,7 @@ <h5>
                             ng-class="login.properties.ButtonStyle"
                             id="{{login.authType}}">
 
-                        <i class="fa" ng-class="login.properties.SocialIcon"></i>
+                      <umb-icon icon="{{login.properties.Icon}}" class="{{login.properties.Icon}}" style="height:100%;"></umb-icon>
                         <localize key="defaultdialogs_linkYour">Link your</localize>&nbsp;{{login.caption}}&nbsp;<localize key="defaultdialogs_account">account</localize>
                     </button>
                 </form>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
index 02429fa1647b..eb3a334f5380 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
@@ -124,14 +124,14 @@ <h1>{{greeting}}</h1>
 
                             <div ng-if="!login.customView">
                                 <form method="POST" action="{{vm.externalLoginFormAction}}">
-                                    <button type="submit"
-                                            class="btn btn-block btn-social"
-                                            ng-class="login.properties.ButtonStyle"
-                                            id="{{login.authType}}" name="provider" value="{{login.authType}}"
-                                            title="Log in using your {{login.caption}} account">
-                                        <i class="fa" ng-class="login.properties.SocialIcon"></i>
-                                        <localize key="login_signInWith">Sign in with</localize>&nbsp;{{login.caption}}
-                                    </button>
+                                  <button type="submit"
+                                          class="btn btn-block btn-social"
+                                          ng-class="login.properties.ButtonStyle"
+                                          id="{{login.authType}}" name="provider" value="{{login.authType}}"
+                                          title="Log in using your {{login.caption}} account">
+                                    <umb-icon icon="{{login.properties.Icon}}" class="{{login.properties.Icon}}" style="height:100%;"></umb-icon>
+                                    <localize key="login_signInWith">Sign in with</localize>&nbsp;{{login.caption}}
+                                  </button>
                                 </form>
                                 <div ng-if="login.errors">
                                     <div class="text-error" ng-repeat="error in login.errors">