diff --git a/src/www/assets/icons/about.png b/src/www/assets/icons/about.png
new file mode 100644
index 0000000000..b5e2c38bde
Binary files /dev/null and b/src/www/assets/icons/about.png differ
diff --git a/src/www/assets/icons/add.png b/src/www/assets/icons/add.png
new file mode 100644
index 0000000000..1dedaf6530
Binary files /dev/null and b/src/www/assets/icons/add.png differ
diff --git a/src/www/assets/icons/back.png b/src/www/assets/icons/back.png
new file mode 100644
index 0000000000..54ca096f3c
Binary files /dev/null and b/src/www/assets/icons/back.png differ
diff --git a/src/www/assets/icons/change_language.png b/src/www/assets/icons/change_language.png
new file mode 100644
index 0000000000..3ad885ba12
Binary files /dev/null and b/src/www/assets/icons/change_language.png differ
diff --git a/src/www/assets/icons/contact.png b/src/www/assets/icons/contact.png
new file mode 100644
index 0000000000..3af65e90be
Binary files /dev/null and b/src/www/assets/icons/contact.png differ
diff --git a/src/www/assets/icons/feedback.png b/src/www/assets/icons/feedback.png
new file mode 100644
index 0000000000..3af65e90be
Binary files /dev/null and b/src/www/assets/icons/feedback.png differ
diff --git a/src/www/assets/icons/help.png b/src/www/assets/icons/help.png
new file mode 100644
index 0000000000..f0355df551
Binary files /dev/null and b/src/www/assets/icons/help.png differ
diff --git a/src/www/assets/icons/menu.png b/src/www/assets/icons/menu.png
new file mode 100644
index 0000000000..6b01874af1
Binary files /dev/null and b/src/www/assets/icons/menu.png differ
diff --git a/src/www/assets/icons/outline.png b/src/www/assets/icons/outline.png
new file mode 100644
index 0000000000..839790f2eb
Binary files /dev/null and b/src/www/assets/icons/outline.png differ
diff --git a/src/www/assets/icons/quit.png b/src/www/assets/icons/quit.png
new file mode 100644
index 0000000000..febfdf75be
Binary files /dev/null and b/src/www/assets/icons/quit.png differ
diff --git a/src/www/assets/jigsaw-logo.png b/src/www/assets/jigsaw-logo.png
new file mode 100644
index 0000000000..e6b852400c
Binary files /dev/null and b/src/www/assets/jigsaw-logo.png differ
diff --git a/src/www/assets/outline-client-logo.png b/src/www/assets/outline-client-logo.png
new file mode 100644
index 0000000000..82d2b39046
Binary files /dev/null and b/src/www/assets/outline-client-logo.png differ
diff --git a/src/www/ui_components/about-view.js b/src/www/ui_components/about-view.js
index 3c4d97a8a4..8306b097a7 100644
--- a/src/www/ui_components/about-view.js
+++ b/src/www/ui_components/about-view.js
@@ -109,7 +109,7 @@ Polymer({
       ></div>
       <div id="footer">
         <a href="https://jigsaw.google.com">
-          <img id="jigsaw-logo" src$="[[rootPath]]assets/jigsaw-logo.svg" />
+          <img id="jigsaw-logo" src$="[[rootPath]]assets/jigsaw-logo.png" />
         </a>
       </div>
     </div>
diff --git a/src/www/ui_components/app-root.js b/src/www/ui_components/app-root.js
index f51dee6bc5..f836ef8b41 100644
--- a/src/www/ui_components/app-root.js
+++ b/src/www/ui_components/app-root.js
@@ -105,7 +105,7 @@ export class AppRoot extends mixinBehaviors([AppLocalizeBehavior], PolymerElemen
           margin-top: 2px;
         }
 
-        app-toolbar paper-icon-button {
+        app-toolbar paper-button {
           /* make the ink color (used for tap animations) actually visible */
           --paper-icon-button-ink-color: #eff;
           padding: var(--app-toolbar-button-gutter);
@@ -133,7 +133,7 @@ export class AppRoot extends mixinBehaviors([AppLocalizeBehavior], PolymerElemen
         }
 
         /* rtl:begin:ignore */
-        #drawer-nav paper-icon-item {
+        #drawer-nav paper-item {
           cursor: pointer;
           font-size: 16px;
           --paper-item-selected: {
@@ -143,8 +143,8 @@ export class AppRoot extends mixinBehaviors([AppLocalizeBehavior], PolymerElemen
           }
         }
 
-        #drawer-nav paper-icon-item:focus::before,
-        #drawer-nav paper-icon-item:focus::after {
+        #drawer-nav paper-item:focus::before,
+        #drawer-nav paper-item:focus::after {
           color: var(--medium-green);
           background-color: var(--light-gray);
         }
@@ -175,16 +175,21 @@ export class AppRoot extends mixinBehaviors([AppLocalizeBehavior], PolymerElemen
           border-width: 0px;
         }
 
-        #drawer-nav paper-icon-item .item-label {
+        #drawer-nav paper-item .item-label {
           float: left;
         }
 
-        #drawer-nav paper-icon-item:not(.iron-selected) {
+        #drawer-nav paper-item:not(.iron-selected) {
           opacity: 0.8;
         }
 
         #drawer-nav paper-item {
           min-height: 32px;
+          text-transform: capitalize;
+        }
+
+        .first-menu-item {
+          margin-top: 12px;
         }
 
         .last-menu-item {
@@ -197,13 +202,25 @@ export class AppRoot extends mixinBehaviors([AppLocalizeBehavior], PolymerElemen
         }
 
         paper-item > :first-child {
-          color: rgba(0, 0, 0, 0.54);
-          font-size: 14px;
-          text-decoration: none;
-          width: 100%;
           cursor: pointer;
         }
 
+        paper-item > img {
+          height: 24px;
+          width: 24px;
+          margin-right: 10px;
+        }
+
+        paper-item > a {
+          color: inherit;
+          text-decoration: none;
+        }
+
+        paper-button {
+          min-width: 0;
+          margin: 0;
+        }
+
         paper-toast {
           --paper-toast-background-color: var(--dark-green);
           align-items: center;
@@ -223,7 +240,7 @@ export class AppRoot extends mixinBehaviors([AppLocalizeBehavior], PolymerElemen
           :host {
             --app-drawer-width: 250px;
           }
-          #drawer-nav paper-icon-item {
+          #drawer-nav paper-item {
             min-height: 42px;
           }
         }
@@ -250,30 +267,33 @@ export class AppRoot extends mixinBehaviors([AppLocalizeBehavior], PolymerElemen
         <app-header slot="header" fixed="">
           <app-toolbar>
             <div id="app-toolbar-left">
-              <paper-icon-button
+              <paper-button
                 id="menuBtn"
                 hidden$="[[shouldShowBackButton]]"
-                icon="menu"
                 on-tap="openDrawer"
-              ></paper-icon-button>
-              <paper-icon-button
+              >
+                <img src$="[[rootPath]]assets/icons/menu.png" alt="menu" />
+              </paper-button>
+              <paper-button
                 id="backBtn"
                 hidden$="[[!shouldShowBackButton]]"
-                icon="arrow-back"
                 on-tap="_goBack"
-              ></paper-icon-button>
+              >
+                <img src$="[[rootPath]]assets/icons/back.png" alt="back" />
+              </paper-button>
             </div>
             <div main-title="" class$="[[page]]">
-              <img src$="[[rootPath]]assets/outline-client-logo.svg" hidden$="[[!shouldShowAppLogo]]" />
+              <img src$="[[rootPath]]assets/outline-client-logo.png" hidden$="[[!shouldShowAppLogo]]" />
               <div hidden$="[[shouldShowAppLogo]]">[[localize(pageTitleKey)]]</div>
             </div>
             <div id="app-toolbar-right">
-              <paper-icon-button
+              <paper-button
                 id="addBtn"
-                icon="add"
                 on-tap="promptAddServer"
                 hidden$="[[!shouldShowAddButton]]"
-              ></paper-icon-button>
+              >
+                <img src$="[[rootPath]]assets/icons/add.png" alt="add" />
+              </paper-button>
             </div>
           </app-toolbar>
         </app-header>
@@ -361,39 +381,39 @@ export class AppRoot extends mixinBehaviors([AppLocalizeBehavior], PolymerElemen
           </div>
           <hr class="nav-hr" />
           <paper-listbox id="drawer-nav" selected="{{routeData.page}}" attr-for-selected="name" on-tap="closeDrawer">
-            <paper-icon-item name="servers">
-              <iron-icon icon="outline-icons:outline" slot="item-icon"></iron-icon>
+            <paper-item name="servers" class="first-menu-item">
+              <img src$="[[rootPath]]assets/icons/outline.png" alt="outline"  />
               <span class="item-label">[[localize('servers-menu-item')]]</span>
-            </paper-icon-item>
+            </paper-item>
             <template is="dom-if" if="{{contactViewFeatureFlag}}">
-              <paper-icon-item name="contact">
-                <iron-icon id="feedback-icon" icon="feedback" slot="item-icon"></iron-icon>
+              <paper-item name="contact">
+                <img src$="[[rootPath]]assets/icons/contact.png" alt="contact"  />
                 [[localize('contact-page-title')]]
-              </paper-icon-item>
+              </paper-item>
             </template>
             <template is="dom-if" if="{{!contactViewFeatureFlag}}">
-              <paper-icon-item name="feedback">
-                <iron-icon id="feedback-icon" icon="feedback" slot="item-icon"></iron-icon>
+              <paper-item name="feedback">
+                <img src$="[[rootPath]]assets/icons/feedback.png" alt="feedback"  />
                 [[localize('feedback-page-title')]]
-              </paper-icon-item>
+              </paper-item>
             </template>
-            <paper-icon-item name="about">
-              <iron-icon icon="info" slot="item-icon"></iron-icon>
+            <paper-item name="about">
+              <img src$="[[rootPath]]assets/icons/about.png" alt="about"  />
               [[localize('about-page-title')]]
-            </paper-icon-item>
-            <paper-icon-item name="help">
+            </paper-item>
+            <paper-item name="help">
               <a href="https://support.getoutline.org" id="helpAnchor" hidden=""></a>
-              <iron-icon icon="help" slot="item-icon"></iron-icon>
+              <img src$="[[rootPath]]assets/icons/help.png" alt="help"  />
               [[localize('help-page-title')]]
-            </paper-icon-item>
-            <paper-icon-item name="language" class$="[[_computeIsLastVisibleMenuItem(shouldShowQuitButton)]]">
-              <iron-icon icon="language" slot="item-icon"></iron-icon>
+            </paper-item>
+            <paper-item name="language" class$="[[_computeIsLastVisibleMenuItem(shouldShowQuitButton)]]">
+              <img src$="[[rootPath]]assets/icons/change_language.png" alt="change language"  />
               [[localize('change-language-page-title')]]
-            </paper-icon-item>
-            <paper-icon-item name="quit" class="last-menu-item" hidden$="[[!shouldShowQuitButton]]">
-              <iron-icon icon="cancel" slot="item-icon"></iron-icon>
+            </paper-item>
+            <paper-item name="quit" class="last-menu-item" hidden$="[[!shouldShowQuitButton]]">
+              <img src$="[[rootPath]]assets/icons/quit.png" alt="quit" />
               [[localize('quit')]]
-            </paper-icon-item>
+            </paper-item>
             <paper-item class="border-top">
               <a href="https://www.google.com/policies/privacy/">[[localize('privacy')]]</a>
             </paper-item>