diff --git a/templates/user/auth/signin_navbar.tmpl b/templates/user/auth/signin_navbar.tmpl
index 2bee1325f78d4..f5df928ce32cc 100644
--- a/templates/user/auth/signin_navbar.tmpl
+++ b/templates/user/auth/signin_navbar.tmpl
@@ -4,8 +4,8 @@
 	</a>
 	{{if .EnableOpenIDSignIn}}
 		<a class="{{if .PageIsLoginOpenID}}active{{end}} item" href="{{AppSubUrl}}/user/login/openid">
-			<img align="left" width="16" height="16" src="{{AppSubUrl}}/img/openid-16x16.png"/>
-			OpenID
+			<i class="fa fa-openid"></i>
+			&nbsp;OpenID
 		</a>
 	{{end}}
 </div>
diff --git a/templates/user/auth/signin_openid.tmpl b/templates/user/auth/signin_openid.tmpl
index ccc689ce33b95..db364d1c15512 100644
--- a/templates/user/auth/signin_openid.tmpl
+++ b/templates/user/auth/signin_openid.tmpl
@@ -4,6 +4,7 @@
 	<div class="ui container">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
+			<i class="fa fa-openid"></i>
 			OpenID
 		</h4>
 		<div class="ui attached segment">
@@ -14,7 +15,7 @@
 			</div>
 			<div class="required inline field {{if .Err_OpenID}}error{{end}}">
 				<label for="openid">
-				<img alt="OpenID URI" height="16" src="{{AppSubUrl}}/img/openid-16x16.png"/>
+				<i class="fa fa-openid"></i>
 				OpenID URI
 				</label>
 				<input id="openid" name="openid" value="{{.openid}}" autofocus required>