diff --git a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.css b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.css
index bf52b718a3..6b3ca679f9 100644
--- a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.css
+++ b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.css
@@ -55,17 +55,30 @@ body {
   color: #fff;
   font-weight: bold;
 }
-.loading span {
-  background: url(img/loader.gif) no-repeat center top;
+.loading {
   position: fixed;
   z-index: 1000;
   top: 50%;
   left: 50%;
-  margin-top: -2.27272727272727em;
-  margin-left: -2.27272727272727em;
-  padding-top: 2.90909090909091em;
+  width: 6em;
+  height: 6em;
+  margin-top: -3em;
+  margin-left: -3em;
+  text-align: center;
+}
+.loading img {
+  width: 3em;
+  height: 3em;
+  background-color: #f0f0f0;
+  display: inline-block;
+  padding: 0.3em;
+  border-radius: 0.4em;
+}
+.loading span {
   font-size: 1.1em;
   color: #666;
+  display: inline-block;
+  padding-top: 0.36363636363636em;
 }
 /* Header */
 .header.rcue {
@@ -485,11 +498,11 @@ td.token-cell button {
   font-family: "Open Sans", sans-serif;
   margin: 0;
 }
-.modal .modal-body p {
+.modal .modal-body p span {
+  display: block;
   font-size: 1.1em;
 }
-.modal .modal-body p.primary {
-  font-size: 1.1em;
+.modal .modal-body p span.primary {
   font-weight: bold;
   margin-bottom: 0.45454545454545em;
 }
diff --git a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.less b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.less
index 7ef77be18e..0109fe5f3c 100644
--- a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.less
+++ b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.less
@@ -75,18 +75,30 @@ body {
 }
 
 .loading {
+    position: fixed;
+    z-index: 1000;
+    top: 50%;
+    left: 50%;
+    width: 6em;
+    height: 6em;
+    margin-top: -3em;
+    margin-left: -3em;
+    text-align: center;
+
+    img {
+        width: 3em;
+        height: 3em;
+        background-color: #f0f0f0;
+        display: inline-block;
+        padding: 0.3em;
+        border-radius: 0.4em;
+    }
     
     span {
-        background: url(img/loader.gif) no-repeat center top;
-        position: fixed;
-        z-index: 1000;
-        top: 50%;
-        left: 50%;
-        margin-top: -2.27272727272727em;
-        margin-left: -2.27272727272727em;
-        padding-top: 2.90909090909091em;
         font-size: 1.1em;
         color: #666;
+        display: inline-block;
+        padding-top: 0.36363636363636em;
     }
 }
 
@@ -592,11 +604,11 @@ td.token-cell button {
     
     .modal-body {
         
-        p {
+        p span {
+            display: block;
             font-size: 1.1em;
-            
+        
             &.primary {
-                font-size: 1.1em;
                 font-weight: bold;
                 margin-bottom: 0.45454545454545em;
             }
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/js/services.js b/admin-ui/src/main/resources/META-INF/resources/admin/js/services.js
index 4ee4a90c89..71485f3349 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/js/services.js
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/js/services.js
@@ -17,8 +17,8 @@ module.service('Dialog', function($dialog) {
 	var dialog = {};
 	dialog.confirmDelete = function(name, type, success) {
 		var title = 'Delete ' + type.charAt(0).toUpperCase() + type.slice(1);
-		var msg = '<p class="primary">Are you sure you want to permanently delete the ' + type + ' "' + name + '"?</p>' +
-            '<p>This action can\'t be undone.</p>';
+		var msg = '<span class="primary">Are you sure you want to permanently delete the ' + type + ' "' + name + '"?</span>' +
+            '<span>This action can\'t be undone.</span>';
 		var btns = [ {
 			result : 'cancel',
 			label : 'Cancel'
diff --git a/forms/src/main/resources/org/keycloak/forms/messages.properties b/forms/src/main/resources/org/keycloak/forms/messages.properties
index be120c2727..aa13cf8499 100644
--- a/forms/src/main/resources/org/keycloak/forms/messages.properties
+++ b/forms/src/main/resources/org/keycloak/forms/messages.properties
@@ -22,15 +22,15 @@ passwordNewConfirm=New Password confirmation
 authenticatorCode=One-time-password
 clientCertificate=Client Certificate
 
-invalidUser=Invalid username or password
-invalidPassword=Invalid username or password
+invalidUser=Invalid username or password.
+invalidPassword=Invalid username or password.
 accountDisabled=Account is disabled, contact admin
 
 missingFirstName=Please specify first name
 missingLastName=Please specify last name
 missingEmail=Please specify email
 missingUsername=Please specify username
-missingPassword=Please specify password
+missingPassword=Please specify password.
 notMatchPassword=Passwords don't match
 missingTotp=Please specify authenticator code
 
@@ -49,7 +49,7 @@ actionTotpWarning=You need to set up the Google Authenticator to activate your a
 actionProfileWarning=You need to update your user profile to activate your account.
 actionPasswordWarning=You need to change your password to activate your account.
 actionEmailWarning=You need to verify your email address to activate your account.
-actionFollow=Please follow the steps below.
+actionFollow=Please fill in the fields below.
 
 successHeader=Success!
 errorHeader=Error!