diff --git a/auth/assets/public/fonts/poppins/Poppins-Bold.ttf b/auth/assets/public/fonts/poppins/Poppins-Bold.ttf
new file mode 100644
index 000000000..b94d47f3a
Binary files /dev/null and b/auth/assets/public/fonts/poppins/Poppins-Bold.ttf differ
diff --git a/auth/assets/public/fonts/poppins/Poppins-Medium.ttf b/auth/assets/public/fonts/poppins/Poppins-Medium.ttf
new file mode 100644
index 000000000..e90e87ed6
Binary files /dev/null and b/auth/assets/public/fonts/poppins/Poppins-Medium.ttf differ
diff --git a/auth/assets/public/fonts/poppins/Poppins-Regular.ttf b/auth/assets/public/fonts/poppins/Poppins-Regular.ttf
new file mode 100644
index 000000000..be06e7fdc
Binary files /dev/null and b/auth/assets/public/fonts/poppins/Poppins-Regular.ttf differ
diff --git a/auth/assets/public/fonts/poppins/Poppins-SemiBold.ttf b/auth/assets/public/fonts/poppins/Poppins-SemiBold.ttf
new file mode 100644
index 000000000..dabf7c242
Binary files /dev/null and b/auth/assets/public/fonts/poppins/Poppins-SemiBold.ttf differ
diff --git a/auth/assets/public/style.css b/auth/assets/public/style.css
index 7ac95272a..73b830db1 100644
--- a/auth/assets/public/style.css
+++ b/auth/assets/public/style.css
@@ -1,14 +1,47 @@
 :root {
-  --primary: #4D7281;
-  --primary-hover: #497689;
+  --primary: #0B344E;
+  --primary-hover: #061E2C;
   --light: #E4E9EF;
-  --danger: #E54122;
+  --danger: #E24646;
   --body-margin: 50px;
 }
 
+@font-face {
+  font-family: 'Poppins-Bold';
+  src: url('./fonts/poppins/Poppins-Bold.ttf') format('truetype');
+  font-weight: 100 900;
+  font-style: normal;
+  font-display: swap;
+}
+
+@font-face {
+  font-family: 'Poppins-SemiBold';
+  src: url('./fonts/poppins/Poppins-SemiBold.ttf') format('truetype');
+  font-weight: 100 900;
+  font-style: normal;
+  font-display: swap;
+}
+
+@font-face {
+  font-family: 'Poppins-Regular';
+  src: url('./fonts/poppins/Poppins-Regular.ttf') format('truetype');
+  font-weight: 100 900;
+  font-style: normal;
+  font-display: swap;
+}
+
+@font-face {
+  font-family: 'Poppins-Medium';
+  src: url('./fonts/poppins/Poppins-Medium.ttf') format('truetype');
+  font-weight: 100 900;
+  font-style: normal;
+  font-display: swap;
+}
+
+
 body {
   margin: var(--body-margin) 0;
-  font-family: 'Nunito', sans-serif;
+  font-family: 'Poppins-Regular';
   height: calc(100vh - 2 * var(--body-margin));
 }
 
@@ -27,8 +60,22 @@ body {
   right: 0;
 }
 
-.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6, label, .btn, a {
-  font-weight: 600;
+.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 {
+  font-family: 'Poppins-SemiBold';
+}
+
+thead th,
+legend,
+label,
+a,
+.btn {
+  font-family: 'Poppins-Medium';
+}
+
+strong,
+b,
+.font-weight-bold {
+  font-family: 'Poppins-SemiBold';
 }
 
 /* over-ride default variables colors */
diff --git a/auth/assets/templates/authorized-clients.html.tpl b/auth/assets/templates/authorized-clients.html.tpl
index 57c472396..af6d9f80e 100644
--- a/auth/assets/templates/authorized-clients.html.tpl
+++ b/auth/assets/templates/authorized-clients.html.tpl
@@ -1,6 +1,6 @@
 {{ template "inc_header.html.tpl" set . "activeNav" "clients" }}
 <div class="card-body p-0">
-    <h1 class="h4 card-title p-3 border-bottom">{{ tr "authorized-clients.template.title" }}</h1>
+    <h4 class="card-title p-3 border-bottom">{{ tr "authorized-clients.template.title" }}</h4>
 	<form
 		method="POST"
 		class="clearfix"
diff --git a/auth/assets/templates/change-password.html.tpl b/auth/assets/templates/change-password.html.tpl
index bd6eee617..29c323031 100644
--- a/auth/assets/templates/change-password.html.tpl
+++ b/auth/assets/templates/change-password.html.tpl
@@ -1,6 +1,6 @@
 {{ template "inc_header.html.tpl" set . "activeNav" "security" }}
 <div class="card-body p-0">
-	<h1 class="h4 card-title p-3 border-bottom">{{ tr "change-password.template.title" }}</h1>
+	<h4 class="card-title p-3 border-bottom">{{ tr "change-password.template.title" }}</h4>
 	<form
 		method="POST"
 		action="{{ links.ChangePassword }}"
diff --git a/auth/assets/templates/create-password.html.tpl b/auth/assets/templates/create-password.html.tpl
index 3a52ef272..2281a7c2c 100644
--- a/auth/assets/templates/create-password.html.tpl
+++ b/auth/assets/templates/create-password.html.tpl
@@ -1,6 +1,6 @@
 {{ template "inc_header.html.tpl" set . "activeNav" "security" }}
 <div class="card-body p-0">
-	<h1 class="h4 card-title p-3 border-bottom">{{ tr "create-password.template.title" }}</h1>
+	<h4 class="card-title p-3 border-bottom">{{ tr "create-password.template.title" }}</h4>
 	<form
 		method="POST"
 		action="{{ links.CreatePassword }}"
diff --git a/auth/assets/templates/error-internal.html.tpl b/auth/assets/templates/error-internal.html.tpl
index 78dac8c25..d036c43f0 100644
--- a/auth/assets/templates/error-internal.html.tpl
+++ b/auth/assets/templates/error-internal.html.tpl
@@ -1,6 +1,6 @@
 {{ template "inc_header.html.tpl" . }}
 <div class="card-body p-0">
-	<h1 class="h4 card-title p-3 border-bottom">{{ tr "error-internal.template.title" }}</h1>
+	<h4 class="card-title p-3 border-bottom">{{ tr "error-internal.template.title" }}</h4>
 	<div class="text-danger mb-4 font-weight-bold p-3" role="alert">
 		{{ .error }}
 	</div>
diff --git a/auth/assets/templates/login.html.tpl b/auth/assets/templates/login.html.tpl
index af6c75eae..985690025 100644
--- a/auth/assets/templates/login.html.tpl
+++ b/auth/assets/templates/login.html.tpl
@@ -1,6 +1,6 @@
 {{ template "inc_header.html.tpl" . }}
 <div class="card-body p-0">
-	<h1 class="h4 card-title p-3 border-bottom">{{ tr "login.template.title" }}</h1>
+	<h4 class="card-title p-3 border-bottom">{{ tr "login.template.title" }}</h4>
 	{{ if .settings.LocalEnabled }}
 	<form
 		method="POST"
diff --git a/auth/assets/templates/mfa-totp-disable.html.tpl b/auth/assets/templates/mfa-totp-disable.html.tpl
index f63dc5933..b803ac995 100644
--- a/auth/assets/templates/mfa-totp-disable.html.tpl
+++ b/auth/assets/templates/mfa-totp-disable.html.tpl
@@ -1,6 +1,6 @@
 {{ template "inc_header.html.tpl"  set . "hideNav" true }}
 <div class="card-body p-0">
-	<h1 class="h4 card-title p-3 border-bottom">{{ tr "mfa-totp-disable.template.title" }}</h1>
+	<h4 class="card-title p-3 border-bottom">{{ tr "mfa-totp-disable.template.title" }}</h4>
 
 	<form
 		class="p-3"
diff --git a/auth/assets/templates/mfa-totp.html.tpl b/auth/assets/templates/mfa-totp.html.tpl
index f45d91ef1..32599e663 100644
--- a/auth/assets/templates/mfa-totp.html.tpl
+++ b/auth/assets/templates/mfa-totp.html.tpl
@@ -1,6 +1,6 @@
 {{ template "inc_header.html.tpl"  set . "hideNav" true }}
 <div class="card-body p-0">
-	<h1 class="h4 card-title p-3 border-bottom">{{ tr "mfa-totp.template.title" }}</h1>
+	<h4 class="card-title p-3 border-bottom">{{ tr "mfa-totp.template.title" }}</h4>
 
 	{{ if .enforced }}
 	<p class="p-3 text-danger mb-0 font-weight-bold">
diff --git a/auth/assets/templates/mfa.html.tpl b/auth/assets/templates/mfa.html.tpl
index 2d97d3b3c..ab0b674d5 100644
--- a/auth/assets/templates/mfa.html.tpl
+++ b/auth/assets/templates/mfa.html.tpl
@@ -1,6 +1,6 @@
 {{ template "inc_header.html.tpl" set . "hideNav" true }}
 <div class="card-body p-0 mb-2">
-	<h1 class="h4 card-title p-3 border-bottom">{{ tr "mfa.template.title" }}</h1>
+	<h4 class="card-title p-3 border-bottom">{{ tr "mfa.template.title" }}</h4>
 
 	{{ if .emailOtpPending }}
 	<form
diff --git a/auth/assets/templates/oauth2-authorize-client.html.tpl b/auth/assets/templates/oauth2-authorize-client.html.tpl
index 6bad6019c..288f2bdbd 100644
--- a/auth/assets/templates/oauth2-authorize-client.html.tpl
+++ b/auth/assets/templates/oauth2-authorize-client.html.tpl
@@ -7,7 +7,7 @@
 	</div>
 	{{ end }}
 
-	<h1 class="h4 card-title p-3 border-bottom">{{ tr "oauth2-authorize-client.template.title" }} "{{ coalesce .client.Name }}"</h1>
+	<h4 class="card-title p-3 border-bottom">{{ tr "oauth2-authorize-client.template.title" }} "{{ coalesce .client.Name }}"</h1>
 
 	<form
 		action="{{ links.OAuth2AuthorizeClient }}"
diff --git a/auth/assets/templates/password-reset-requested.html.tpl b/auth/assets/templates/password-reset-requested.html.tpl
index 4183bbffc..8812e5c11 100644
--- a/auth/assets/templates/password-reset-requested.html.tpl
+++ b/auth/assets/templates/password-reset-requested.html.tpl
@@ -1,6 +1,6 @@
 {{ template "inc_header.html.tpl" . }}
 <div class="card-body p-0">
-	<h1 class="h4 card-title p-3 border-bottom">{{ tr "password-reset-requested.template.title" }}</h1>
+	<h4 class="card-title p-3 border-bottom">{{ tr "password-reset-requested.template.title" }}</h4>
 	<div class="p-3" role="alert">
 	    {{ tr "password-reset-requested.template.instructions" }}
 	</div>
diff --git a/auth/assets/templates/pending-email-confirmation.html.tpl b/auth/assets/templates/pending-email-confirmation.html.tpl
index 0d7da5aa0..8039d087c 100644
--- a/auth/assets/templates/pending-email-confirmation.html.tpl
+++ b/auth/assets/templates/pending-email-confirmation.html.tpl
@@ -1,6 +1,6 @@
 {{ template "inc_header.html.tpl" . }}
 <div class="card-body p-0">
-	<h1 class="h4 card-title p-3 border-bottom">{{ tr "pending-email-confirmation.template.title" }}</h1>
+	<h4 class="card-title p-3 border-bottom">{{ tr "pending-email-confirmation.template.title" }}</h4>
 	<div class="p-3" role="alert">
 		{{ tr "pending-email-confirmation.template.instructions" }}
 	</div>
diff --git a/auth/assets/templates/profile.html.tpl b/auth/assets/templates/profile.html.tpl
index ffc680213..4ac616738 100644
--- a/auth/assets/templates/profile.html.tpl
+++ b/auth/assets/templates/profile.html.tpl
@@ -1,6 +1,6 @@
 {{ template "inc_header.html.tpl" set . "activeNav" "profile" }}
 <div class="card-body p-0">
-	<h1 class="h4 card-title p-3 border-bottom">{{ tr "profile.template.title" }}</h1>
+	<h4 class="card-title p-3 border-bottom">{{ tr "profile.template.title" }}</h4>
 	<form
 		method="POST"
 		action="{{ links.Profile }}"
diff --git a/auth/assets/templates/request-password-reset.html.tpl b/auth/assets/templates/request-password-reset.html.tpl
index a42a13285..6358d135a 100644
--- a/auth/assets/templates/request-password-reset.html.tpl
+++ b/auth/assets/templates/request-password-reset.html.tpl
@@ -1,6 +1,6 @@
 {{ template "inc_header.html.tpl" . }}
 <div class="card-body p-0">
-	<h1 class="h4 card-title p-3 border-bottom">{{ tr "request-password-reset.template.title" }}</h1>
+	<h4 class="card-title p-3 border-bottom">{{ tr "request-password-reset.template.title" }}</h4>
 	<form
 		method="POST"
 		action="{{ links.RequestPasswordReset }}"
diff --git a/auth/assets/templates/reset-password.html.tpl b/auth/assets/templates/reset-password.html.tpl
index 0260ae904..2fed4e8f9 100644
--- a/auth/assets/templates/reset-password.html.tpl
+++ b/auth/assets/templates/reset-password.html.tpl
@@ -1,6 +1,6 @@
 {{ template "inc_header.html.tpl" . }}
 <div class="card-body p-0">
-	<h1 class="h4 card-title p-3 border-bottom">{{ tr "reset-password.template.title" }}</h1>
+	<h4 class="card-title p-3 border-bottom">{{ tr "reset-password.template.title" }}</h4>
 	<form
 		method="POST"
 		action="{{ links.ResetPassword }}"
diff --git a/auth/assets/templates/security.html.tpl b/auth/assets/templates/security.html.tpl
index 20ab8ae38..e5be3577f 100644
--- a/auth/assets/templates/security.html.tpl
+++ b/auth/assets/templates/security.html.tpl
@@ -1,6 +1,6 @@
 {{ template "inc_header.html.tpl" set . "activeNav" "security" }}
 <div class="card-body p-0">
-	<h1 class="h4 card-title p-3 border-bottom">{{ tr "security.template.title" }}</h1>
+	<h4 class="card-title p-3 border-bottom">{{ tr "security.template.title" }}</h4>
 	<form
 		method="POST"
 		action="{{ links.Security }}"
diff --git a/auth/assets/templates/sessions.html.tpl b/auth/assets/templates/sessions.html.tpl
index 3aabffd41..2f96f5990 100644
--- a/auth/assets/templates/sessions.html.tpl
+++ b/auth/assets/templates/sessions.html.tpl
@@ -3,7 +3,6 @@
 	<form
 		method="POST"
 		action="{{ links.Sessions }}"
-		class="p-3"
 	>
 		{{ .csrfField }}
 		<div class="card-title p-3 border-bottom">
diff --git a/auth/assets/templates/signup.html.tpl b/auth/assets/templates/signup.html.tpl
index 29c11d632..bea1ad57a 100644
--- a/auth/assets/templates/signup.html.tpl
+++ b/auth/assets/templates/signup.html.tpl
@@ -1,6 +1,6 @@
 {{ template "inc_header.html.tpl" . }}
 <div class="card-body p-0">
-	<h1 class="h4 card-title p-3 border-bottom">{{ tr "signup.template.title" }}</h1>
+	<h4 class="card-title p-3 border-bottom">{{ tr "signup.template.title" }}</h4>
 	<form
 		method="POST"
 		action="{{ links.Signup }}"