diff --git a/.version b/.version
index eca07e4c..ccbccc3d 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-2.1.2
+2.2.0
diff --git a/README.md b/README.md
index bd8c5f36..7ce7a40e 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 # Nginx Proxy Manager
 
-![Version](https://img.shields.io/badge/version-2.1.2-green.svg?style=for-the-badge)
+![Version](https://img.shields.io/badge/version-2.2.0-green.svg?style=for-the-badge)
 ![Stars](https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge)
 ![Pulls](https://img.shields.io/docker/pulls/jc21/nginx-proxy-manager.svg?style=for-the-badge)
 ![Jenkins](https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fci.nginxproxymanager.com%2Fjob%2Fnginx-proxy-manager%2Fjob%2Fmaster&style=for-the-badge)
diff --git a/backend/package.json b/backend/package.json
index 709e984c..8def8f0e 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "nginx-proxy-manager",
-	"version": "2.1.2",
+	"version": "2.2.0",
 	"description": "A beautiful interface for creating Nginx endpoints",
 	"main": "js/index.js",
 	"dependencies": {
diff --git a/frontend/app-images/favicons/android-chrome-192x192.png b/frontend/app-images/favicons/android-chrome-192x192.png
index 282d7abf..7155df74 100644
Binary files a/frontend/app-images/favicons/android-chrome-192x192.png and b/frontend/app-images/favicons/android-chrome-192x192.png differ
diff --git a/frontend/app-images/favicons/android-chrome-512x512.png b/frontend/app-images/favicons/android-chrome-512x512.png
index e42c2949..8f95e003 100644
Binary files a/frontend/app-images/favicons/android-chrome-512x512.png and b/frontend/app-images/favicons/android-chrome-512x512.png differ
diff --git a/frontend/app-images/favicons/apple-touch-icon.png b/frontend/app-images/favicons/apple-touch-icon.png
index a2d2d573..e8f243a6 100644
Binary files a/frontend/app-images/favicons/apple-touch-icon.png and b/frontend/app-images/favicons/apple-touch-icon.png differ
diff --git a/frontend/app-images/favicons/browserconfig.xml b/frontend/app-images/favicons/browserconfig.xml
index f5338d08..87c8dbd2 100644
--- a/frontend/app-images/favicons/browserconfig.xml
+++ b/frontend/app-images/favicons/browserconfig.xml
@@ -2,8 +2,8 @@
 <browserconfig>
     <msapplication>
         <tile>
-            <square150x150logo src="images/favicon/mstile-150x150.png"/>
-            <TileColor>#2d89ef</TileColor>
+            <square150x150logo src="/images/favicons/mstile-150x150.png"/>
+            <TileColor>#333333</TileColor>
         </tile>
     </msapplication>
 </browserconfig>
diff --git a/frontend/app-images/favicons/favicon-16x16.png b/frontend/app-images/favicons/favicon-16x16.png
index 758ad247..e8a183ee 100644
Binary files a/frontend/app-images/favicons/favicon-16x16.png and b/frontend/app-images/favicons/favicon-16x16.png differ
diff --git a/frontend/app-images/favicons/favicon-32x32.png b/frontend/app-images/favicons/favicon-32x32.png
index 13e5557a..4fa0cf0b 100644
Binary files a/frontend/app-images/favicons/favicon-32x32.png and b/frontend/app-images/favicons/favicon-32x32.png differ
diff --git a/frontend/app-images/favicons/favicon.ico b/frontend/app-images/favicons/favicon.ico
index 51d43c02..9eae8b5f 100644
Binary files a/frontend/app-images/favicons/favicon.ico and b/frontend/app-images/favicons/favicon.ico differ
diff --git a/frontend/app-images/favicons/mstile-150x150.png b/frontend/app-images/favicons/mstile-150x150.png
index fb32224c..4a3fd8c1 100644
Binary files a/frontend/app-images/favicons/mstile-150x150.png and b/frontend/app-images/favicons/mstile-150x150.png differ
diff --git a/frontend/app-images/favicons/safari-pinned-tab.svg b/frontend/app-images/favicons/safari-pinned-tab.svg
index 7250a9a9..5f9ea3f6 100644
--- a/frontend/app-images/favicons/safari-pinned-tab.svg
+++ b/frontend/app-images/favicons/safari-pinned-tab.svg
@@ -9,63 +9,77 @@ Created by potrace 1.11, written by Peter Selinger 2001-2013
 </metadata>
 <g transform="translate(0.000000,512.000000) scale(0.100000,-0.100000)"
 fill="#000000" stroke="none">
-<path d="M2325 5114 c-16 -2 -80 -11 -142 -20 -423 -58 -886 -259 -1227 -534
--436 -352 -753 -850 -886 -1392 -55 -222 -65 -318 -65 -608 0 -290 10 -386 65
--608 113 -460 371 -911 706 -1232 329 -316 740 -543 1176 -650 225 -55 318
--65 613 -65 234 1 287 4 399 23 273 47 483 115 721 231 518 254 923 659 1176
-1176 116 239 184 448 231 721 30 175 33 606 5 782 -43 269 -118 506 -236 747
--371 756 -1074 1274 -1916 1411 -95 15 -545 28 -620 18z m1633 -2696 l-3 -743
--22 -35 c-12 -19 -37 -44 -55 -55 -33 -20 -51 -20 -1318 -20 l-1285 0 -35 22
-c-19 12 -44 37 -55 55 -19 32 -20 53 -23 776 l-2 742 1400 0 1400 0 -2 -742z"/>
-<path d="M2069 2931 c-30 -30 -31 -35 -27 -97 6 -96 23 -109 138 -109 80 0 92
-2 112 23 20 19 23 33 23 92 0 99 -17 114 -130 119 -83 3 -85 3 -116 -28z"/>
-<path d="M2429 2931 c-30 -30 -31 -35 -27 -97 6 -96 23 -109 138 -109 80 0 92
-2 112 23 20 19 23 33 23 92 0 99 -17 114 -130 119 -83 3 -85 3 -116 -28z"/>
-<path d="M2789 2931 c-30 -30 -31 -35 -27 -97 6 -96 23 -109 138 -109 80 0 92
-2 112 23 20 19 23 33 23 92 0 99 -17 114 -130 119 -83 3 -85 3 -116 -28z"/>
-<path d="M3149 2931 c-30 -30 -31 -35 -27 -97 6 -96 23 -109 138 -109 80 0 92
-2 112 23 20 19 23 33 23 92 0 99 -17 114 -130 119 -83 3 -85 3 -116 -28z"/>
-<path d="M3509 2931 c-30 -30 -31 -35 -27 -97 6 -96 23 -109 138 -109 80 0 92
-2 112 23 20 19 23 33 23 92 0 99 -17 114 -130 119 -83 3 -85 3 -116 -28z"/>
-<path d="M1349 2611 c-30 -30 -31 -35 -27 -97 6 -96 23 -109 138 -109 80 0 92
-2 112 23 20 19 23 33 23 92 0 99 -17 114 -130 119 -83 3 -85 3 -116 -28z"/>
-<path d="M1709 2611 c-30 -30 -31 -35 -27 -97 6 -96 23 -109 138 -109 80 0 92
-2 112 23 20 19 23 33 23 92 0 99 -17 114 -130 119 -83 3 -85 3 -116 -28z"/>
-<path d="M2069 2611 c-30 -30 -31 -35 -27 -97 6 -96 23 -109 138 -109 80 0 92
-2 112 23 20 19 23 33 23 92 0 99 -17 114 -130 119 -83 3 -85 3 -116 -28z"/>
-<path d="M2429 2611 c-30 -30 -31 -35 -27 -97 6 -96 23 -109 138 -109 80 0 92
-2 112 23 20 19 23 33 23 92 0 99 -17 114 -130 119 -83 3 -85 3 -116 -28z"/>
-<path d="M2789 2611 c-30 -30 -31 -35 -27 -97 6 -96 23 -109 138 -109 80 0 92
-2 112 23 20 19 23 33 23 92 0 99 -17 114 -130 119 -83 3 -85 3 -116 -28z"/>
-<path d="M3149 2611 c-30 -30 -31 -35 -27 -97 6 -96 23 -109 138 -109 80 0 92
-2 112 23 20 19 23 33 23 92 0 99 -17 114 -130 119 -83 3 -85 3 -116 -28z"/>
-<path d="M3509 2611 c-30 -30 -31 -35 -27 -97 6 -96 23 -109 138 -109 80 0 92
-2 112 23 20 19 23 33 23 92 0 99 -17 114 -130 119 -83 3 -85 3 -116 -28z"/>
-<path d="M1349 2291 c-30 -30 -31 -35 -27 -97 6 -96 23 -109 138 -109 80 0 92
-2 112 23 20 19 23 33 23 92 0 99 -17 114 -130 119 -83 3 -85 3 -116 -28z"/>
-<path d="M1709 2291 c-30 -30 -31 -35 -27 -97 6 -96 23 -109 138 -109 80 0 92
-2 112 23 20 19 23 33 23 92 0 99 -17 114 -130 119 -83 3 -85 3 -116 -28z"/>
-<path d="M2069 2291 c-30 -30 -31 -35 -27 -97 6 -96 23 -109 138 -109 80 0 92
-2 112 23 20 19 23 33 23 92 0 99 -17 114 -130 119 -83 3 -85 3 -116 -28z"/>
-<path d="M2429 2291 c-30 -30 -31 -35 -27 -97 6 -96 23 -109 138 -109 80 0 92
-2 112 23 20 19 23 33 23 92 0 99 -17 114 -130 119 -83 3 -85 3 -116 -28z"/>
-<path d="M2789 2291 c-30 -30 -31 -35 -27 -97 6 -96 23 -109 138 -109 80 0 92
-2 112 23 20 19 23 33 23 92 0 99 -17 114 -130 119 -83 3 -85 3 -116 -28z"/>
-<path d="M3149 2291 c-30 -30 -31 -35 -27 -97 6 -96 23 -109 138 -109 80 0 92
-2 112 23 20 19 23 33 23 92 0 99 -17 114 -130 119 -83 3 -85 3 -116 -28z"/>
-<path d="M3509 2291 c-30 -30 -31 -35 -27 -97 6 -96 23 -109 138 -109 80 0 92
-2 112 23 20 19 23 33 23 92 0 99 -17 114 -130 119 -83 3 -85 3 -116 -28z"/>
-<path d="M1349 1971 c-30 -30 -31 -35 -27 -97 6 -96 23 -109 138 -109 80 0 92
-2 112 23 20 19 23 33 23 92 0 99 -17 114 -130 119 -83 3 -85 3 -116 -28z"/>
-<path d="M1709 1971 c-30 -30 -31 -35 -27 -97 6 -96 23 -109 138 -109 80 0 92
-2 112 23 20 19 23 33 23 92 0 99 -17 114 -130 119 -83 3 -85 3 -116 -28z"/>
-<path d="M2069 1971 c-30 -30 -31 -35 -27 -97 6 -96 23 -109 138 -109 80 0 92
-2 112 23 20 19 23 33 23 92 0 99 -17 114 -130 119 -83 3 -85 3 -116 -28z"/>
-<path d="M2429 1971 c-30 -30 -31 -35 -27 -97 6 -96 23 -109 138 -109 80 0 92
-2 112 23 20 19 23 33 23 92 0 99 -17 114 -130 119 -83 3 -85 3 -116 -28z"/>
-<path d="M2789 1971 c-30 -30 -31 -35 -27 -97 6 -96 23 -109 138 -109 80 0 92
-2 112 23 20 19 23 33 23 92 0 99 -17 114 -130 119 -83 3 -85 3 -116 -28z"/>
-<path d="M3149 1971 c-30 -30 -31 -35 -27 -97 6 -96 23 -109 138 -109 80 0 92
-2 112 23 20 19 23 33 23 92 0 99 -17 114 -130 119 -83 3 -85 3 -116 -28z"/>
+<path d="M2348 4766 c-109 -63 -203 -116 -210 -120 -7 -3 -20 -10 -28 -16 -19
+-12 -114 -68 -410 -238 -481 -276 -1017 -586 -1087 -628 -39 -23 -73 -40 -76
+-38 -3 3 -5 -519 -5 -1160 l0 -1165 292 -169 c293 -170 727 -421 801 -462 22
+-12 99 -56 170 -98 167 -96 690 -399 732 -423 l32 -18 207 120 c114 66 226
+131 248 143 23 13 214 124 426 246 212 122 401 231 420 242 19 11 127 73 240
+138 213 123 225 130 383 220 61 35 95 60 92 68 -3 7 0 10 5 7 11 -7 7 36 -4
+54 -4 5 -2 13 4 16 8 5 7 12 -2 23 -10 12 -10 14 0 8 6 -4 12 -2 12 3 0 6 -6
+11 -12 11 -10 0 -9 3 1 9 10 6 10 10 1 16 -9 6 -9 9 0 15 9 6 9 12 0 30 -9 17
+-9 21 0 15 14 -9 10 27 -5 37 -6 5 -6 8 2 8 11 0 10 30 -2 49 -3 5 -1 13 5 16
+8 5 7 11 -1 22 -10 11 -10 16 0 22 10 7 11 13 1 31 -8 15 -8 20 -1 16 6 -4 11
+-3 11 3 0 5 -5 13 -11 17 -8 5 -8 9 1 14 9 6 9 12 0 30 -8 15 -8 20 -1 16 15
+-10 14 7 -1 22 -9 9 -9 12 0 12 12 0 12 26 -1 46 -3 6 -3 14 0 18 10 10 11
+256 1 262 -4 3 -4 13 2 23 6 12 5 22 -3 31 -9 10 -9 11 1 6 6 -4 12 -2 12 3 0
+6 -5 11 -10 11 -7 0 -7 6 0 20 6 11 7 20 1 20 -12 0 -9 33 4 43 6 6 5 10 -3
+14 -10 4 -10 8 0 21 10 12 10 14 1 8 -7 -4 -13 -2 -13 3 0 6 6 11 13 11 9 0 8
+3 -2 9 -11 7 -11 10 0 15 11 5 11 7 1 12 -10 5 -10 9 0 22 10 12 10 14 1 8 -7
+-4 -13 -2 -13 3 0 6 6 11 13 11 9 0 8 3 -2 9 -11 7 -11 10 0 15 11 5 11 7 1
+12 -10 5 -10 9 0 22 10 12 10 14 1 8 -7 -4 -13 -2 -13 3 0 6 6 11 13 11 9 0 8
+3 -2 9 -11 7 -11 10 0 15 11 5 11 7 1 12 -10 5 -10 9 0 22 10 12 10 14 1 8 -7
+-4 -13 -3 -13 3 0 5 6 12 13 15 9 5 9 7 0 12 -9 4 -10 11 -3 25 7 13 7 19 1
+19 -7 0 -7 8 -1 24 6 16 5 27 -3 35 -8 8 -8 14 -2 19 15 10 17 32 5 46 -5 7
+-7 16 -3 20 12 12 10 190 -2 198 -7 5 -7 8 1 8 12 0 12 29 -1 49 -5 10 -4 12
+3 7 7 -4 12 -3 12 3 0 5 -5 13 -11 17 -8 5 -8 9 1 14 9 6 9 12 0 30 -8 15 -8
+20 -1 16 6 -4 11 -3 11 3 0 5 -5 13 -11 17 -8 5 -8 9 1 14 9 6 9 12 0 30 -8
+16 -9 20 -1 15 12 -7 9 34 -3 54 -4 5 -2 13 4 16 8 5 7 12 -2 23 -10 12 -10
+14 0 8 6 -4 12 -2 12 3 0 6 -6 11 -12 11 -10 0 -9 3 1 9 10 6 10 10 1 16 -9 6
+-9 9 0 15 9 6 9 12 0 30 -9 17 -9 21 0 15 14 -9 10 27 -5 37 -6 5 -6 8 2 8 11
+0 10 36 -2 48 -2 3 0 11 6 18 7 8 7 14 -1 19 -5 3 -10 12 -10 18 0 7 4 6 10
+-3 8 -12 9 -9 8 12 -2 24 -34 45 -313 206 -458 265 -1024 592 -1070 617 -22
+13 -174 100 -338 194 -165 94 -304 171 -310 171 -7 0 -101 -52 -209 -114z
+m347 -191 c33 -19 85 -49 116 -66 l56 -32 0 -174 -1 -174 -68 -40 c-80 -47
+-184 -105 -214 -120 -18 -9 -43 1 -165 71 -79 46 -146 84 -148 86 -2 2 -4 17
+-4 34 0 36 -6 36 -102 11 -204 -54 -409 -148 -565 -259 -164 -116 -329 -287
+-433 -447 -105 -163 -197 -382 -232 -554 -16 -78 -20 -102 -30 -191 -7 -50 -6
+-247 0 -300 3 -25 7 -69 10 -99 3 -29 8 -57 10 -61 7 -11 -5 -40 -16 -40 -4 0
+-35 -16 -68 -35 -64 -38 -77 -42 -78 -22 -1 19 -14 91 -18 105 -25 73 -25 511
+0 584 2 7 6 27 8 43 12 77 66 267 97 340 116 269 219 425 399 606 173 172 297
+262 506 364 144 71 261 112 412 146 l101 23 -2 50 -1 50 149 88 150 87 35 -20
+c20 -10 63 -35 96 -54z m512 -300 c296 -108 565 -305 798 -586 96 -115 237
+-374 288 -529 100 -300 129 -643 77 -900 -6 -30 -13 -68 -16 -85 -4 -28 -23
+-98 -57 -207 l-15 -48 47 -25 46 -25 0 -175 0 -174 -110 -62 c-60 -35 -127
+-74 -148 -88 -45 -29 -21 -38 -253 97 l-91 53 1 174 c1 95 3 175 6 177 3 3 69
+41 148 86 141 80 144 81 173 67 16 -9 29 -13 29 -10 0 3 0 7 0 10 0 3 7 22 14
+42 21 55 55 211 63 290 9 85 10 330 0 403 -21 171 -95 421 -159 534 -5 11 -22
+40 -36 65 -140 253 -346 467 -597 621 -75 46 -204 108 -270 131 -22 7 -43 16
+-48 19 -6 5 -12 143 -8 173 2 12 16 9 118 -28z m-231 -776 c645 -372 604 -346
+605 -377 0 -15 1 -278 1 -586 l1 -558 -29 -24 c-16 -13 -32 -23 -35 -24 -4 0
+-421 -236 -529 -300 -8 -4 -109 -63 -223 -129 l-208 -121 -132 76 c-73 42
+-148 85 -167 96 -28 16 -222 127 -473 271 -18 11 -82 48 -142 83 l-111 64 1
+589 c0 324 2 591 5 594 3 2 145 84 315 182 171 98 378 217 461 265 83 48 157
+90 165 93 11 6 41 24 75 46 1 1 190 -108 420 -240z m-1788 -1533 c71 -41 138
+-80 149 -87 19 -11 20 -23 20 -186 l0 -174 -29 -15 c-15 -8 -28 -18 -28 -23 0
+-13 167 -174 235 -227 125 -97 270 -180 406 -235 74 -29 194 -67 233 -73 18
+-3 39 -8 47 -10 73 -26 352 -39 514 -24 95 8 261 43 354 74 163 55 413 195
+535 302 15 12 32 22 38 22 7 0 45 -19 85 -42 l74 -42 -23 -21 c-260 -239 -658
+-426 -983 -460 -27 -3 -63 -8 -79 -11 -32 -7 -285 -7 -361 0 -200 18 -437 87
+-633 184 -194 96 -315 185 -487 355 l-120 118 -38 -21 -38 -22 -137 78 c-75
+42 -144 83 -152 90 -12 10 -15 43 -14 178 0 99 4 170 10 176 8 8 283 168 291
+170 1 0 60 -33 131 -74z"/>
+<path d="M2475 4451 l-80 -47 -3 -84 c-3 -111 0 -122 46 -147 21 -11 59 -32
+83 -46 l44 -26 80 46 c44 25 83 51 87 56 3 6 6 53 5 106 l-2 94 -72 43 c-39
+23 -80 44 -90 47 -10 3 -51 -15 -98 -42z"/>
+<path d="M3978 1843 l-78 -45 0 -102 0 -102 83 -47 c46 -26 87 -47 92 -47 4 0
+44 21 89 47 l83 46 -1 101 -1 101 -80 47 c-44 27 -87 47 -95 47 -8 -1 -50 -22
+-92 -46z"/>
+<path d="M2307 3015 c-137 -80 -253 -145 -258 -145 -11 0 -10 21 -12 -318 -2
+-241 0 -285 13 -296 14 -11 435 -258 487 -285 20 -10 50 4 275 135 139 80 256
+151 260 157 3 6 6 142 6 303 l0 293 -132 77 c-72 42 -147 86 -166 96 -19 11
+-76 45 -127 74 -50 30 -93 54 -95 54 -1 -1 -115 -66 -251 -145z"/>
+<path d="M971 1846 c-40 -24 -76 -48 -80 -54 -5 -8 -6 -160 -2 -194 1 -8 156
+-98 169 -98 5 0 46 21 90 47 l81 47 3 70 c6 126 4 131 -60 168 -90 51 -104 58
+-116 58 -6 -1 -44 -20 -85 -44z"/>
 </g>
 </svg>
diff --git a/frontend/app-images/favicons/site.webmanifest b/frontend/app-images/favicons/site.webmanifest
index 1edcfeff..99d1016e 100644
--- a/frontend/app-images/favicons/site.webmanifest
+++ b/frontend/app-images/favicons/site.webmanifest
@@ -3,12 +3,12 @@
     "short_name": "",
     "icons": [
         {
-            "src": "android-chrome-192x192.png",
+            "src": "/images/favicons/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image/png"
         },
         {
-            "src": "android-chrome-512x512.png",
+            "src": "/images/favicons/android-chrome-512x512.png",
             "sizes": "512x512",
             "type": "image/png"
         }
diff --git a/frontend/app-images/logo-256.png b/frontend/app-images/logo-256.png
new file mode 100644
index 00000000..2bfb661d
Binary files /dev/null and b/frontend/app-images/logo-256.png differ
diff --git a/frontend/app-images/logo-text-vertical-grey.png b/frontend/app-images/logo-text-vertical-grey.png
new file mode 100644
index 00000000..70273171
Binary files /dev/null and b/frontend/app-images/logo-text-vertical-grey.png differ
diff --git a/frontend/html/partials/header.ejs b/frontend/html/partials/header.ejs
index 2d22d949..3e1f657c 100644
--- a/frontend/html/partials/header.ejs
+++ b/frontend/html/partials/header.ejs
@@ -11,16 +11,15 @@
 		<meta name="HandheldFriendly" content="True">
 		<meta name="MobileOptimized" content="320">
 		<title><%- title %></title>
-		<link rel="icon" href="/images/favicons/favicon.ico" />
-		<link rel="apple-touch-icon" sizes="180x180" href="/images/favicons/apple-touch-icon.png" />
-		<link rel="icon" type="image/png" sizes="32x32" href="/images/favicons/favicon-32x32.png" />
-		<link rel="icon" type="image/png" sizes="16x16" href="/images/favicons/favicon-16x16.png" />
-		<link rel="manifest" href="/images/favicons/site.webmanifest" />
-		<link rel="mask-icon" href="/images/favicons/safari-pinned-tab.svg" color="#5bbad5" />
-		<link rel="shortcut icon" href="/images/favicons/favicon.ico" />
-		<meta name="msapplication-TileColor" content="#2d89ef" />
-		<meta name="msapplication-config" content="/images/favicons/browserconfig.xml" />
-		<meta name="theme-color" content="#ffffff" />
+		<link rel="apple-touch-icon" sizes="180x180" href="/images/favicons/apple-touch-icon.png">
+		<link rel="icon" type="image/png" sizes="32x32" href="/images/favicons/favicon-32x32.png">
+		<link rel="icon" type="image/png" sizes="16x16" href="/images/favicons/favicon-16x16.png">
+		<link rel="manifest" href="/images/favicons/site.webmanifest">
+		<link rel="mask-icon" href="/images/favicons/safari-pinned-tab.svg" color="#5bbad5">
+		<link rel="shortcut icon" href="/images/favicons/favicon.ico">
+		<meta name="msapplication-TileColor" content="#333333">
+		<meta name="msapplication-config" content="/images/favicons/browserconfig.xml">
+		<meta name="theme-color" content="#ffffff">
 		<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300i,400,400i,500,500i,600,600i,700,700i&amp;subset=latin-ext">
 		<link href="/css/main.css?v=<%= version %>" rel="stylesheet">
 	</head>
diff --git a/frontend/js/login/ui/login.ejs b/frontend/js/login/ui/login.ejs
index ae8b1675..b6f52b7a 100644
--- a/frontend/js/login/ui/login.ejs
+++ b/frontend/js/login/ui/login.ejs
@@ -3,24 +3,35 @@
         <div class="col col-login mx-auto">
             <form class="card" action="" method="post">
                 <div class="card-body p-6">
-                    <div class="card-title"><%- i18n('login', 'title') %></div>
-                    <div class="form-group">
-                        <label class="form-label"><%- i18n('str', 'email-address') %></label>
-                        <input name="identity" type="email" class="form-control" placeholder="<%- i18n('str', 'email-address') %>" required>
-                    </div>
-                    <div class="form-group">
-                        <label class="form-label"><%- i18n('str', 'password') %></label>
-                        <input name="secret" type="password" class="form-control" placeholder="<%- i18n('str', 'password') %>" required>
-                        <div class="invalid-feedback secret-error"></div>
-                    </div>
-                    <div class="form-footer">
-                        <button type="submit" class="btn btn-teal btn-block"><%- i18n('str', 'sign-in') %></button>
+                    <div class="container">
+                        <div class="row">
+                            <div class="col-sm-12 col-md-6">
+                                <div class="text-center p-6">
+                                    <img src="/images/logo-text-vertical-grey.png" alt="Logo" />
+                                    <div class="text-center text-muted mt-5">
+                                        <%- i18n('main', 'version', {version: getVersion()}) %>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-sm-12 col-md-6">
+                                <div class="card-title"><%- i18n('login', 'title') %></div>
+                                <div class="form-group">
+                                    <label class="form-label"><%- i18n('str', 'email-address') %></label>
+                                    <input name="identity" type="email" class="form-control" placeholder="<%- i18n('str', 'email-address') %>" required>
+                                </div>
+                                <div class="form-group">
+                                    <label class="form-label"><%- i18n('str', 'password') %></label>
+                                    <input name="secret" type="password" class="form-control" placeholder="<%- i18n('str', 'password') %>" required>
+                                    <div class="invalid-feedback secret-error"></div>
+                                </div>
+                                <div class="form-footer">
+                                    <button type="submit" class="btn btn-teal btn-block"><%- i18n('str', 'sign-in') %></button>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </form>
-            <div class="text-center text-muted">
-                <%- i18n('main', 'app') %> <%- i18n('main', 'version', {version: getVersion()}) %>
-            </div>
         </div>
     </div>
 </div>
diff --git a/frontend/package.json b/frontend/package.json
index 8ad6ca81..df7bfa3d 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nginx-proxy-manager",
-  "version": "2.1.2",
+  "version": "2.2.0",
   "description": "A beautiful interface for creating Nginx endpoints",
   "main": "js/index.js",
   "devDependencies": {
diff --git a/frontend/scss/custom.scss b/frontend/scss/custom.scss
index ff997da3..8e417f86 100644
--- a/frontend/scss/custom.scss
+++ b/frontend/scss/custom.scss
@@ -32,3 +32,7 @@ a:hover {
     display: flex;
     flex-wrap: wrap;
 }
+
+.col-login {
+    max-width: 48rem;
+}
\ No newline at end of file