diff --git a/forms/common-themes/src/main/resources/theme/account/logo-example/resources/css/account.css b/forms/common-themes/src/main/resources/theme/account/logo-example/resources/css/account.css
new file mode 100755
index 0000000000..8b82ef250e
--- /dev/null
+++ b/forms/common-themes/src/main/resources/theme/account/logo-example/resources/css/account.css
@@ -0,0 +1,8 @@
+.navbar-title {
+    background-image: url('../img/red-hat-logo.png');
+    height: 65px;
+    background-repeat: no-repeat;
+    width: 203px;
+    margin: 3px 10px 5px;
+    text-indent: -99999px;
+}
\ No newline at end of file
diff --git a/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/img/red-hat-logo.png b/forms/common-themes/src/main/resources/theme/account/logo-example/resources/img/red-hat-logo.png
old mode 100644
new mode 100755
similarity index 100%
rename from forms/common-themes/src/main/resources/theme/admin/keycloak/resources/img/red-hat-logo.png
rename to forms/common-themes/src/main/resources/theme/account/logo-example/resources/img/red-hat-logo.png
diff --git a/forms/common-themes/src/main/resources/theme/account/logo-example/theme.properties b/forms/common-themes/src/main/resources/theme/account/logo-example/theme.properties
new file mode 100755
index 0000000000..04feb70eda
--- /dev/null
+++ b/forms/common-themes/src/main/resources/theme/account/logo-example/theme.properties
@@ -0,0 +1,4 @@
+parent=keycloak
+import=common/keycloak
+
+styles= ../patternfly/lib/patternfly/css/patternfly.css ../patternfly/css/account.css ../keycloak/css/account.css css/account.css
\ No newline at end of file
diff --git a/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/css/base-styles.css b/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/css/base-styles.css
new file mode 100755
index 0000000000..e7f821754a
--- /dev/null
+++ b/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/css/base-styles.css
@@ -0,0 +1,35 @@
+@import url("../lib/patternfly/css/patternfly.css");
+@import url("../lib/select2-3.4.1/select2.css");
+
+@import url("admin-console.css");
+@import url("tables.css");
+@import url("sprites.css");
+
+.navbar-pf {
+    background-image: url('../img/header-bkgrnd.png');
+    border-top: 3px solid rgba(255, 255, 255, 0.15);
+}
+
+.navbar-pf .navbar-primary {
+    font-size: 13px;
+    background-image: -webkit-linear-gradient(top, rgba(0,0,0,0.1) 0%, rgba(0,0,0,.4) 100%);
+    background-image: linear-gradient(to bottom, rgba(0,0,0,.1) 0%, rgba(0,0,0,.4) 100%);
+}
+
+.navbar-pf .navbar-header {
+    border-bottom: 1px solid rgba(255,255,255,.15);
+}
+
+.navbar-pf .navbar-primary li.dropdown.context > a,
+.navbar-pf .navbar-primary li.dropdown.context > a:hover,
+.navbar-pf .navbar-primary li.dropdown.context.open > a,
+.navbar-pf .navbar-primary > .active > a,
+.navbar-pf .navbar-primary > .active > a:hover{
+    background-color: rgba(0,0,0,0.1);
+    background-image: -webkit-linear-gradient(top, rgba(0,0,0,0.1) 0%, rgba(0,0,0,0.1) 100%);
+    background-image: linear-gradient(to bottom, rgba(0,0,0,0.1) 0%, rgba(0,0,0,0.1) 100%);
+    border-bottom: none;
+    border-right-color: rgba(255,255,255,0.15);
+    border-top-color: rgba(255,255,255,0.05);
+}
+
diff --git a/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/css/overrides.css b/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/css/overrides.css
new file mode 100755
index 0000000000..e69de29bb2
diff --git a/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/css/styles.css b/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/css/styles.css
index e71ad3db1a..da48466d2f 100755
--- a/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/css/styles.css
+++ b/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/css/styles.css
@@ -1,35 +1,2 @@
-@import url("../lib/patternfly/css/patternfly.css");
-@import url("../lib/select2-3.4.1/select2.css");
-
-@import url("admin-console.css");
-@import url("tables.css");
-@import url("sprites.css");
-
-.navbar-pf {
-    background-image: url('../img/header-bkgrnd.png');
-    border-top: 3px solid rgba(255, 255, 255, 0.15);
-}
-
-.navbar-pf .navbar-primary {
-    font-size: 13px;
-    background-image: -webkit-linear-gradient(top, rgba(0,0,0,0.1) 0%, rgba(0,0,0,.4) 100%);
-    background-image: linear-gradient(to bottom, rgba(0,0,0,.1) 0%, rgba(0,0,0,.4) 100%);
-}
-
-.navbar-pf .navbar-header {
-    border-bottom: 1px solid rgba(255,255,255,.15);
-}
-
-.navbar-pf .navbar-primary li.dropdown.context > a,
-.navbar-pf .navbar-primary li.dropdown.context > a:hover,
-.navbar-pf .navbar-primary li.dropdown.context.open > a,
-.navbar-pf .navbar-primary > .active > a,
-.navbar-pf .navbar-primary > .active > a:hover{
-    background-color: rgba(0,0,0,0.1);
-    background-image: -webkit-linear-gradient(top, rgba(0,0,0,0.1) 0%, rgba(0,0,0,0.1) 100%);
-    background-image: linear-gradient(to bottom, rgba(0,0,0,0.1) 0%, rgba(0,0,0,0.1) 100%);
-    border-bottom: none;
-    border-right-color: rgba(255,255,255,0.15);
-    border-top-color: rgba(255,255,255,0.05);
-}
-
+@import url("base-styles.css");
+@import url("overrides.css");
diff --git a/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/img/subway-logo.png b/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/img/subway-logo.png
deleted file mode 100644
index 1b7842985d..0000000000
Binary files a/forms/common-themes/src/main/resources/theme/admin/keycloak/resources/img/subway-logo.png and /dev/null differ
diff --git a/forms/common-themes/src/main/resources/theme/admin/logo-example/resources/css/overrides.css b/forms/common-themes/src/main/resources/theme/admin/logo-example/resources/css/overrides.css
new file mode 100755
index 0000000000..a0a86e70eb
--- /dev/null
+++ b/forms/common-themes/src/main/resources/theme/admin/logo-example/resources/css/overrides.css
@@ -0,0 +1,8 @@
+.navbar-title {
+    background-image: url('../img/red-hat-logo.png');
+    height: 65px;
+    background-repeat: no-repeat;
+    width: 203px;
+    margin: 3px 10px 5px;
+    text-indent: -99999px;
+}
diff --git a/forms/common-themes/src/main/resources/theme/admin/logo-example/resources/img/red-hat-logo.png b/forms/common-themes/src/main/resources/theme/admin/logo-example/resources/img/red-hat-logo.png
new file mode 100755
index 0000000000..0b01b1a445
Binary files /dev/null and b/forms/common-themes/src/main/resources/theme/admin/logo-example/resources/img/red-hat-logo.png differ
diff --git a/forms/common-themes/src/main/resources/theme/admin/logo-example/theme.properties b/forms/common-themes/src/main/resources/theme/admin/logo-example/theme.properties
new file mode 100755
index 0000000000..5265964d7b
--- /dev/null
+++ b/forms/common-themes/src/main/resources/theme/admin/logo-example/theme.properties
@@ -0,0 +1,2 @@
+parent=keycloak
+import=common/keycloak
diff --git a/forms/common-themes/src/main/resources/theme/login/logo-example/resources/css/login.css b/forms/common-themes/src/main/resources/theme/login/logo-example/resources/css/login.css
new file mode 100755
index 0000000000..81d3946a6e
--- /dev/null
+++ b/forms/common-themes/src/main/resources/theme/login/logo-example/resources/css/login.css
@@ -0,0 +1,9 @@
+#kc-logo-wrapper {
+    background-image: url("../img/red-hat-logo.png");
+    background-repeat: no-repeat;
+    background-position: top right;
+
+    height: 65px;
+
+    margin: 100px;
+}
diff --git a/forms/common-themes/src/main/resources/theme/login/logo-example/resources/img/red-hat-logo.png b/forms/common-themes/src/main/resources/theme/login/logo-example/resources/img/red-hat-logo.png
new file mode 100644
index 0000000000..0b01b1a445
Binary files /dev/null and b/forms/common-themes/src/main/resources/theme/login/logo-example/resources/img/red-hat-logo.png differ
diff --git a/forms/common-themes/src/main/resources/theme/login/logo-example/theme.properties b/forms/common-themes/src/main/resources/theme/login/logo-example/theme.properties
new file mode 100755
index 0000000000..d1b98ed842
--- /dev/null
+++ b/forms/common-themes/src/main/resources/theme/login/logo-example/theme.properties
@@ -0,0 +1,4 @@
+parent=keycloak
+import=common/keycloak
+
+styles= ../patternfly/lib/patternfly/css/patternfly.css ../patternfly/css/login.css ../patternfly/lib/zocial/zocial.css ../keycloak/css/login.css css/login.css
\ No newline at end of file