diff --git a/web/static/img/email-icon.svg b/web/static/img/email-icon.svg
index 20cf793e..10f0d8d0 100644
--- a/web/static/img/email-icon.svg
+++ b/web/static/img/email-icon.svg
@@ -1,7 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Layer_1" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
-	xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 43 43"
-	style="enable-background:new 0 0 43 43;" xml:space="preserve">
-  <rect id="Rectangle-290" fill="#84B6F0" width="43" height="43"/>
-  <path fill="#FFF" d="M8.5,11.3v20.3h26V11.3H8.5z M31,13.3l-9.6,9.3L12,13.3H31z M10.5,29.7v-15l11,10.7l11-10.7v15H10.5z"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="27px" height="21px" viewBox="0 0 27 21" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 46.2 (44496) - http://www.bohemiancoding.com/sketch -->
+    <title>Shape</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="email-logo" fill-rule="nonzero" fill="#ffffff">
+            <path d="M0.5,0.3 L0.5,20.6 L26.5,20.6 L26.5,0.3 L0.5,0.3 Z M23,2.3 L13.4,11.6 L4,2.3 L23,2.3 Z M2.5,18.7 L2.5,3.7 L13.5,14.4 L24.5,3.7 L24.5,18.7 L2.5,18.7 Z" id="Shape"></path>
+        </g>
+    </g>
 </svg>
diff --git a/web/static/img/google-icon.svg b/web/static/img/google-icon.svg
index a5714f0d..d667afdf 100644
--- a/web/static/img/google-icon.svg
+++ b/web/static/img/google-icon.svg
@@ -1,21 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="36px" height="37px" viewBox="0 0 36 37" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-  <defs>
-      <linearGradient x1="3.84931507%" y1="34.473262%" x2="92.2854795%" y2="70.223262%" id="linearGradient-1">
-          <stop stop-color="#3E2723" stop-opacity="0.2" offset="0%"></stop>
-          <stop stop-color="#3E2723" stop-opacity="0.02" offset="100%"></stop>
-      </linearGradient>
-  </defs>
-  <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-    <g id="A.1-Verify-Email-Screen_login-" sketch:type="MSArtboardGroup" transform="translate(-407.000000, -272.000000)">
-      <g id="Shape-+-g+" sketch:type="MSLayerGroup" transform="translate(407.000000, 272.000000)">
-        <path d="M35.9639881,15.3236905 L18.7923214,0.75202381 L10.7579762,0.75202381 C5.14494048,0.75202381 2.39345238,4.16386905 2.39345238,8.01595238 C2.39345238,10.9875595 4.8147619,14.2893452 8.88696429,14.2893452 L9.8775,14.2893452 C9.65738095,14.6195238 9.54732143,15.279881 9.54732143,15.720119 C9.54732143,16.8207143 9.98755952,17.3710119 10.6479167,18.031369 C8.88696429,18.1414286 5.58517857,18.4716071 3.16386905,20.0124405 C0.852619048,21.3331548 0.192261905,23.3142262 0.192261905,24.745 C0.192261905,25.9556548 0.6325,27.05625 1.62303571,28.0467857 L15.4905357,36.9142857 L35.9639881,36.9142857 L35.9639881,15.3236905 Z" id="Shape" fill="url(#linearGradient-1)" sketch:type="MSShapeGroup"></path>
-        <g id="g+" transform="translate(0.192262, 1.192262)" sketch:type="MSShapeGroup">
-          <path d="M18.6000595,-0.110059524 L18.6000595,-0.440238095 L10.5657143,-0.110059524 C4.95267857,-0.110059524 2.20119048,3.30178571 2.20119048,7.15386905 C2.20119048,10.1254762 4.6225,13.4272619 8.69470238,13.4272619 L9.6852381,13.4272619 C9.46511905,13.7574405 9.35505952,14.4177976 9.35505952,14.9680952 C9.35505952,16.0686905 9.79529762,16.6189881 10.4556548,17.2793452 C8.69470238,17.3894048 5.39291667,17.7195833 2.97160714,19.2604167 C0.660357143,20.581131 0,22.5622024 0,23.9929762 C0,26.8545238 2.7514881,29.4959524 8.36452381,29.4959524 C15.0781548,29.4959524 18.6000595,25.8639881 18.6000595,22.2320238 C18.6000595,19.4805357 17.0592262,18.1598214 15.2982738,16.7290476 L13.8675,15.6284524 C13.4272619,15.2982738 12.9870238,14.8580357 12.9870238,13.9775595 C12.9870238,13.0970833 13.5373214,12.4367262 14.087619,12.1065476 C15.7385119,10.7858333 17.3894048,9.46511905 17.3894048,6.4935119 C17.3894048,3.74202381 15.7385119,2.31125 14.7479762,1.54083333 L16.9491667,1.54083333 L18.6000595,-0.110059524 L18.6000595,-0.110059524 Z M16.0686905,23.6627976 C16.0686905,25.8639881 14.087619,27.8450595 10.3455952,27.8450595 C6.16333333,27.8450595 3.52190476,25.7539286 3.52190476,23.1125 C3.52190476,20.3610119 6.05327381,19.3704762 6.82369048,19.0402976 C8.47458333,18.49 10.5657143,18.3799405 10.8958929,18.3799405 L11.776369,18.3799405 C14.7479762,20.581131 16.0686905,21.6817262 16.0686905,23.6627976 L16.0686905,23.6627976 Z M10.5657143,12.1065476 C7.26392857,12.1065476 5.50297619,8.25446429 5.50297619,5.28285714 C5.50297619,2.53136905 7.26392857,1.21065476 9.13494048,1.21065476 C12.6568452,1.21065476 14.4177976,5.61303571 14.4177976,8.25446429 C14.3077381,11.4461905 11.55625,12.1065476 10.5657143,12.1065476 L10.5657143,12.1065476 Z M26.4142857,12.9870238 L26.4142857,8.03434524 L24.7633929,8.03434524 L24.7633929,12.9870238 L19.8107143,12.9870238 L19.8107143,14.6379167 L24.7633929,14.6379167 L24.7633929,19.5905952 L26.4142857,19.5905952 L26.4142857,14.6379167 L31.3669643,14.6379167 L31.3669643,12.9870238 L26.4142857,12.9870238 L26.4142857,12.9870238 Z" id="Shape" opacity="0.16" fill="#3E2723"></path>
-          <path d="M18.6000595,-0.440238095 L10.5657143,-0.440238095 C4.95267857,-0.440238095 2.20119048,2.97160714 2.20119048,6.82369048 C2.20119048,9.79529762 4.6225,13.0970833 8.69470238,13.0970833 L9.6852381,13.0970833 C9.46511905,13.4272619 9.35505952,14.087619 9.35505952,14.5278571 C9.35505952,15.6284524 9.79529762,16.17875 10.4556548,16.8391071 C8.69470238,16.9491667 5.39291667,17.2793452 2.97160714,18.8201786 C0.660357143,20.1408929 0,22.1219643 0,23.5527381 C0,26.4142857 2.7514881,29.0557143 8.36452381,29.0557143 C15.0781548,29.0557143 18.6000595,25.42375 18.6000595,21.7917857 C18.6000595,19.0402976 17.0592262,17.7195833 15.2982738,16.2888095 L13.8675,15.1882143 C13.4272619,14.8580357 12.9870238,14.4177976 12.9870238,13.5373214 C12.9870238,12.6568452 13.5373214,11.9964881 14.087619,11.6663095 C15.7385119,10.3455952 17.3894048,9.02488095 17.3894048,6.05327381 C17.3894048,3.30178571 15.7385119,1.8710119 14.7479762,1.10059524 L16.9491667,1.10059524 L18.6000595,-0.440238095 L18.6000595,-0.440238095 Z M16.0686905,23.332619 C16.0686905,25.5338095 14.087619,27.514881 10.3455952,27.514881 C6.16333333,27.514881 3.52190476,25.42375 3.52190476,22.7823214 C3.52190476,20.0308333 6.05327381,19.0402976 6.82369048,18.710119 C8.47458333,18.1598214 10.5657143,18.0497619 10.8958929,18.0497619 L11.776369,18.0497619 C14.7479762,20.2509524 16.0686905,21.3515476 16.0686905,23.332619 L16.0686905,23.332619 Z M10.5657143,11.8864286 C7.26392857,11.8864286 5.50297619,8.03434524 5.50297619,5.0627381 C5.50297619,2.31125 7.26392857,0.990535714 9.13494048,0.990535714 C12.6568452,0.990535714 14.4177976,5.39291667 14.4177976,8.03434524 C14.3077381,11.2260714 11.55625,11.8864286 10.5657143,11.8864286 L10.5657143,11.8864286 Z M26.4142857,12.6568452 L26.4142857,7.70416667 L24.7633929,7.70416667 L24.7633929,12.6568452 L19.8107143,12.6568452 L19.8107143,14.3077381 L24.7633929,14.3077381 L24.7633929,19.2604167 L26.4142857,19.2604167 L26.4142857,14.3077381 L31.3669643,14.3077381 L31.3669643,12.6568452 L26.4142857,12.6568452 L26.4142857,12.6568452 Z" id="Shape" fill="#F1F1F1"></path>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 46.2 (44496) - http://www.bohemiancoding.com/sketch -->
+    <title>logo_googleg_48dp</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="logo_googleg_48dp">
+            <path d="M17.64,9.20454545 C17.64,8.56636364 17.5827273,7.95272727 17.4763636,7.36363636 L9,7.36363636 L9,10.845 L13.8436364,10.845 C13.635,11.97 13.0009091,12.9231818 12.0477273,13.5613636 L12.0477273,15.8195455 L14.9563636,15.8195455 C16.6581818,14.2527273 17.64,11.9454545 17.64,9.20454545 L17.64,9.20454545 Z" id="Shape" fill="#4285F4" fill-rule="nonzero"></path>
+            <path d="M9,18 C11.43,18 13.4672727,17.1940909 14.9563636,15.8195455 L12.0477273,13.5613636 C11.2418182,14.1013636 10.2109091,14.4204545 9,14.4204545 C6.65590909,14.4204545 4.67181818,12.8372727 3.96409091,10.71 L0.957272727,10.71 L0.957272727,13.0418182 C2.43818182,15.9831818 5.48181818,18 9,18 L9,18 Z" id="Shape" fill="#34A853" fill-rule="nonzero"></path>
+            <path d="M3.96409091,10.71 C3.78409091,10.17 3.68181818,9.59318182 3.68181818,9 C3.68181818,8.40681818 3.78409091,7.83 3.96409091,7.29 L3.96409091,4.95818182 L0.957272727,4.95818182 C0.347727273,6.17318182 0,7.54772727 0,9 C0,10.4522727 0.347727273,11.8268182 0.957272727,13.0418182 L3.96409091,10.71 L3.96409091,10.71 Z" id="Shape" fill="#FBBC05" fill-rule="nonzero"></path>
+            <path d="M9,3.57954545 C10.3213636,3.57954545 11.5077273,4.03363636 12.4404545,4.92545455 L15.0218182,2.34409091 C13.4631818,0.891818182 11.4259091,0 9,0 C5.48181818,0 2.43818182,2.01681818 0.957272727,4.95818182 L3.96409091,7.29 C4.67181818,5.16272727 6.65590909,3.57954545 9,3.57954545 L9,3.57954545 Z" id="Shape" fill="#EA4335" fill-rule="nonzero"></path>
+            <polygon id="Shape" points="0 0 18 0 18 18 0 18"></polygon>
         </g>
-      </g>
     </g>
-  </g>
-</svg>
-
+</svg>
\ No newline at end of file
diff --git a/web/static/img/ldap-icon.svg b/web/static/img/ldap-icon.svg
new file mode 100644
index 00000000..506dadc0
--- /dev/null
+++ b/web/static/img/ldap-icon.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="21px" height="17px" viewBox="0 0 21 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 46.2 (44496) - http://www.bohemiancoding.com/sketch -->
+    <title>Combined-Shape</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="login_logo" fill-rule="nonzero" fill="#ffffff">
+            <path d="M20.9998732,0 L21,16.8 L3.15,15.75 L3.15,11.025 L4.725,11.025 L4.725,14.175 L19.425,15.225 L19.425,1.575 L4.725,2.625 L4.725,5.775 L3.15,5.775 L3.15,1.05 L20.9998732,0 Z M10.4273448,11.5821438 L12.8956645,9.26892989 L0,9.26892989 L0,7.57550094 L12.8956645,7.57550094 L10.4273448,5.26641726 L11.39466,4.2 L15.5772664,8.40226079 L11.4497226,12.6045216 L10.4273448,11.5821438 Z" id="Combined-Shape"></path>
+        </g>
+    </g>
+</svg>
diff --git a/web/static/img/saml-icon.svg b/web/static/img/saml-icon.svg
new file mode 100644
index 00000000..506dadc0
--- /dev/null
+++ b/web/static/img/saml-icon.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="21px" height="17px" viewBox="0 0 21 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 46.2 (44496) - http://www.bohemiancoding.com/sketch -->
+    <title>Combined-Shape</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="login_logo" fill-rule="nonzero" fill="#ffffff">
+            <path d="M20.9998732,0 L21,16.8 L3.15,15.75 L3.15,11.025 L4.725,11.025 L4.725,14.175 L19.425,15.225 L19.425,1.575 L4.725,2.625 L4.725,5.775 L3.15,5.775 L3.15,1.05 L20.9998732,0 Z M10.4273448,11.5821438 L12.8956645,9.26892989 L0,9.26892989 L0,7.57550094 L12.8956645,7.57550094 L10.4273448,5.26641726 L11.39466,4.2 L15.5772664,8.40226079 L11.4497226,12.6045216 L10.4273448,11.5821438 Z" id="Combined-Shape"></path>
+        </g>
+    </g>
+</svg>
diff --git a/web/static/main.css b/web/static/main.css
index a2551982..9df2052f 100644
--- a/web/static/main.css
+++ b/web/static/main.css
@@ -44,9 +44,10 @@ body {
 }
 
 .dex-btn-icon--google {
-  background-color: #DB4437;
+  background-color: #FFFFFF;
   background-image: url(../static/img/google-icon.svg);;
 }
+
 .dex-btn-icon--local {
   background-color: #84B6EF;
   background-image: url(../static/img/email-icon.svg);
@@ -72,6 +73,16 @@ body {
   background-image: url(../static/img/bitbucket-icon.svg);
 }
 
+.dex-btn-icon--ldap {
+  background-color: #84B6EF;
+  background-image: url(../static/img/ldap-icon.svg);
+}
+
+.dex-btn-icon--saml {
+  background-color: #84B6EF;
+  background-image: url(../static/img/saml-icon.svg);
+}
+
 .dex-btn-text {
   font-weight: 600;
   line-height: 36px;
diff --git a/web/templates/header.html b/web/templates/header.html
index 53803311..edd6289a 100644
--- a/web/templates/header.html
+++ b/web/templates/header.html
@@ -7,6 +7,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link href="{{ url "static/main.css" }}" rel="stylesheet">
     <link href="{{ url "theme/styles.css" }}" rel="stylesheet">
+    <link rel="icon" href="{{ url "theme/favicon.png" }}">
   </head>
 
   <body class="theme-body">
diff --git a/web/themes/coreos/favicon.png b/web/themes/coreos/favicon.png
new file mode 100644
index 00000000..db13cf7f
Binary files /dev/null and b/web/themes/coreos/favicon.png differ
diff --git a/web/themes/tectonic/favicon.png b/web/themes/tectonic/favicon.png
new file mode 100644
index 00000000..29643556
Binary files /dev/null and b/web/themes/tectonic/favicon.png differ
diff --git a/web/themes/tectonic/styles.css b/web/themes/tectonic/styles.css
index a3beb8f8..7930e073 100644
--- a/web/themes/tectonic/styles.css
+++ b/web/themes/tectonic/styles.css
@@ -1,18 +1,11 @@
 .theme-body {
-  background-color: #1E394C;
+  background-color: #1C425B;
   color: #333;
   font-family: 'Source Sans Pro', Helvetica, sans-serif;
 }
 
 .theme-navbar {
-  background-color: #fff;
-  box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2);
-  color: #333;
-  font-size: 13px;
-  font-weight: 100;
-  height: 46px;
-  overflow: hidden;
-  padding: 0 10px;
+  display: none;
 }
 
 .theme-navbar__logo-wrap {
@@ -107,3 +100,7 @@
   font-size: 13px;
   font-weight: 600;
 }
+
+.dex-container {
+  margin: 60px auto;
+}