diff --git a/themes/src/main/resources-community/theme/base/admin/messages/admin-messages_de.properties b/themes/src/main/resources-community/theme/base/admin/messages/admin-messages_de.properties
index e54161de1c..fa078eb045 100644
--- a/themes/src/main/resources-community/theme/base/admin/messages/admin-messages_de.properties
+++ b/themes/src/main/resources-community/theme/base/admin/messages/admin-messages_de.properties
@@ -974,7 +974,7 @@ unlink-users=Benutzer entsperren
 #client-authentication=Client Authentication
 #client-authentication.tooltip=Select the flow you want to use for authentication of clients.
 #docker-auth=Docker Authentication
-#docker-auth.tooptip=Select the flow you want to use for authentication against a docker client.
+#docker-auth.tooltip=Select the flow you want to use for authentication against a docker client.
 new=Neu
 copy=Kopieren
 #add-execution=Add execution
diff --git a/themes/src/main/resources-community/theme/base/admin/messages/admin-messages_ja.properties b/themes/src/main/resources-community/theme/base/admin/messages/admin-messages_ja.properties
index b416e582af..69717072c3 100644
--- a/themes/src/main/resources-community/theme/base/admin/messages/admin-messages_ja.properties
+++ b/themes/src/main/resources-community/theme/base/admin/messages/admin-messages_ja.properties
@@ -962,7 +962,7 @@ reset-credentials.tooltip=ユーザーがクレデンシャルを忘れた際に
 client-authentication=クライアント認証
 client-authentication.tooltip=クライアント認証で使用したいフローを選択してください。
 docker-auth=Docker認証
-docker-auth.tooptip=Dockerクライアントに対する認証に使用するフローを選択します。
+docker-auth.tooltip=Dockerクライアントに対する認証に使用するフローを選択します。
 new=新規作成
 copy=コピー
 add-execution=Execution を追加
diff --git a/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties b/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties
index 93c0a8b3e7..cfd6b2ee8e 100644
--- a/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties
+++ b/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties
@@ -1012,7 +1012,7 @@ reset-credentials.tooltip=Select the flow you want to use when the user has forg
 client-authentication=Client Authentication
 client-authentication.tooltip=Select the flow you want to use for authentication of clients.
 docker-auth=Docker Authentication
-docker-auth.tooptip=Select the flow you want to use for authentication against a docker client.
+docker-auth.tooltip=Select the flow you want to use for authentication against a docker client.
 new=New
 copy=Copy
 add-execution=Add execution
diff --git a/themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-openshift-v3.html b/themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-openshift-v3.html
index 3323e1d85c..eeae6be9f5 100755
--- a/themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-openshift-v3.html
+++ b/themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-openshift-v3.html
@@ -94,7 +94,7 @@
                 <div class="col-md-6">
                     <input ng-model="identityProvider.linkOnly" name="identityProvider.trustEmail" id="linkOnly" onoffswitch on-text="{{:: 'onText' | translate}}" off-text="{{:: 'offText' | translate}}" />
                 </div>
-                <kc-tooltip>{{:: 'linkOnly.tooltip' | translate}}</kc-tooltip>
+                <kc-tooltip>{{:: 'link-only.tooltip' | translate}}</kc-tooltip>
             </div>
             <div class="form-group">
                 <label class="col-md-2 control-label" for="hideOnLoginPage">{{:: 'hide-on-login-page' | translate}}</label>
diff --git a/themes/src/main/resources/theme/base/admin/resources/partials/realm-tokens.html b/themes/src/main/resources/theme/base/admin/resources/partials/realm-tokens.html
index f31ca1b2f6..5d8d6187ad 100755
--- a/themes/src/main/resources/theme/base/admin/resources/partials/realm-tokens.html
+++ b/themes/src/main/resources/theme/base/admin/resources/partials/realm-tokens.html
@@ -204,7 +204,7 @@
                     <option value="Days">{{:: 'days' | translate}}</option>
                 </select>
             </div>
-            <kc-tooltip>{{:: 'login-timeout' | translate}}</kc-tooltip>
+            <kc-tooltip>{{:: 'login-timeout.tooltip' | translate}}</kc-tooltip>
         </div>
 
         <div class="form-group">