diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 40d9413e..adb9cb78 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -54,7 +54,7 @@
         android:allowBackup="true"
         android:fullBackupContent="false"
         android:networkSecurityConfig="@xml/network_security_config"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme"
         tools:ignore="UnusedAttribute">
diff --git a/app/src/main/java/at/bitfire/davdroid/AccountSettings.java b/app/src/main/java/at/bitfire/davdroid/AccountSettings.java
index 2a006403..dd9130b8 100644
--- a/app/src/main/java/at/bitfire/davdroid/AccountSettings.java
+++ b/app/src/main/java/at/bitfire/davdroid/AccountSettings.java
@@ -116,13 +116,6 @@ public class AccountSettings {
             App.log.info("Account " + account.name + " has version " + version + ", current version: " + CURRENT_VERSION);
 
             if (version < CURRENT_VERSION) {
-                Bitmap bitmapLogo = null;
-                Drawable drawableLogo = android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP ?
-                        context.getDrawable(R.drawable.ic_launcher) :
-                        context.getResources().getDrawable(R.drawable.ic_launcher);
-                if (drawableLogo instanceof BitmapDrawable)
-                    bitmapLogo = ((BitmapDrawable)drawableLogo).getBitmap();
-
                 Notification notify = new NotificationCompat.Builder(context)
                         .setSmallIcon(R.drawable.ic_new_releases_light)
                         .setLargeIcon(App.getLauncherBitmap(context))
diff --git a/app/src/main/java/at/bitfire/davdroid/App.java b/app/src/main/java/at/bitfire/davdroid/App.java
index 5ae12bf8..8b41f6fc 100644
--- a/app/src/main/java/at/bitfire/davdroid/App.java
+++ b/app/src/main/java/at/bitfire/davdroid/App.java
@@ -152,8 +152,8 @@ public class App extends Application {
     public static Bitmap getLauncherBitmap(@NonNull Context context) {
         Bitmap bitmapLogo = null;
         Drawable drawableLogo = android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP ?
-                context.getDrawable(R.drawable.ic_launcher) :
-                context.getResources().getDrawable(R.drawable.ic_launcher);
+                context.getDrawable(R.mipmap.ic_launcher) :
+                context.getResources().getDrawable(R.mipmap.ic_launcher);
         if (drawableLogo instanceof BitmapDrawable)
             bitmapLogo = ((BitmapDrawable)drawableLogo).getBitmap();
         return bitmapLogo;
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/StartupDialogFragment.java b/app/src/main/java/at/bitfire/davdroid/ui/StartupDialogFragment.java
index 494416d4..94aeb03a 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/StartupDialogFragment.java
+++ b/app/src/main/java/at/bitfire/davdroid/ui/StartupDialogFragment.java
@@ -123,7 +123,7 @@ public class StartupDialogFragment extends DialogFragment {
 
             case DEVELOPMENT_VERSION:
                 return new AlertDialog.Builder(getActivity())
-                        .setIcon(R.drawable.ic_launcher)
+                        .setIcon(R.mipmap.ic_launcher)
                         .setTitle(R.string.startup_development_version)
                         .setMessage(R.string.startup_development_version_message)
                         .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@@ -141,7 +141,7 @@ public class StartupDialogFragment extends DialogFragment {
 
             case FDROID_DONATE:
                 return new AlertDialog.Builder(getActivity())
-                        .setIcon(R.drawable.ic_launcher)
+                        .setIcon(R.mipmap.ic_launcher)
                         .setTitle(R.string.startup_donate)
                         .setMessage(R.string.startup_donate_message)
                         .setPositiveButton(R.string.startup_donate_now, new DialogInterface.OnClickListener() {
diff --git a/app/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index dce11e1c..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index d4520816..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index e4b9000a..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index 126ae37e..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/drawable/side_nav_bar.xml b/app/src/main/res/drawable/side_nav_bar.xml
deleted file mode 100644
index a9468e52..00000000
--- a/app/src/main/res/drawable/side_nav_bar.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<!--
-  ~ Copyright © 2013 – 2016 Ricki Hirner (bitfire web engineering).
-  ~ All rights reserved. This program and the accompanying materials
-  ~ are made available under the terms of the GNU Public License v3.0
-  ~ which accompanies this distribution, and is available at
-  ~ http://www.gnu.org/licenses/gpl.html
-  -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-    <gradient
-        android:angle="135"
-        android:endColor="@color/light_green300"
-        android:startColor="@color/green700"
-        android:type="linear"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/account_list_item.xml b/app/src/main/res/layout/account_list_item.xml
index 2979790c..a6407d19 100644
--- a/app/src/main/res/layout/account_list_item.xml
+++ b/app/src/main/res/layout/account_list_item.xml
@@ -34,7 +34,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
                 android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                android:textColor="@color/white"
+                android:textColor="@android:color/white"
                 tools:text="Account Name"/>
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/nav_header_accounts.xml b/app/src/main/res/layout/nav_header_accounts.xml
index 972fd1bd..399c9a33 100644
--- a/app/src/main/res/layout/nav_header_accounts.xml
+++ b/app/src/main/res/layout/nav_header_accounts.xml
@@ -10,8 +10,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="match_parent"
-              android:layout_height="@dimen/nav_header_height"
-              android:background="@drawable/side_nav_bar"
+              android:layout_height="wrap_content"
+              android:background="@color/grey700"
               android:gravity="bottom"
               android:orientation="vertical"
               android:padding="@dimen/activity_margin"
@@ -21,14 +21,14 @@
         android:id="@+id/imageView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingTop="@dimen/nav_header_vertical_spacing"
-        android:src="@drawable/ic_launcher"
+        android:layout_marginTop="24dp"
+        android:src="@mipmap/ic_launcher"
         tools:ignore="ContentDescription"/>
 
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="@dimen/nav_header_vertical_spacing"
+        android:layout_marginTop="@dimen/nav_header_vertical_spacing"
         android:text="@string/app_name"
         android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
 
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..74db61a3
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..0451d780
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..de276832
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..bf39cbee
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..91a73f56
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap/ic_launcher.png b/app/src/main/res/mipmap/ic_launcher.png
new file mode 100644
index 00000000..7465415b
Binary files /dev/null and b/app/src/main/res/mipmap/ic_launcher.png differ
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 89e97956..058d47c7 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -19,9 +19,8 @@
     <color name="orange400">#ffa726</color>
     <color name="orangeA700">#ff6d00</color>
 
-    <color name="grey">#888888</color>
-    <color name="very_light_grey">#ebebeb</color>
-    <color name="white">#ffffff</color>
+    <color name="grey200">#eeeeee</color>
+    <color name="grey700">#616161</color>
 
     <!-- preference-v14 uses this color for categories text -->
     <color name="preference_fallback_accent_color">@color/orangeA700</color>
@@ -35,7 +34,7 @@
         <item name="colorPrimaryDark">@color/light_green700</item>
         <item name="colorAccent">@color/orangeA700</item>
         <item name="android:textColorPrimary">@drawable/text_color</item>
-        <item name="android:textColorSecondary">@color/grey</item>
+        <item name="android:textColorSecondary">@color/grey700</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
     </style>
 
@@ -65,7 +64,7 @@
     <!-- stepper (wizard) -->
 
     <style name="stepper_nav_bar">
-        <item name="android:background">@color/very_light_grey</item>
+        <item name="android:background">@color/grey200</item>
     </style>
 
     <style name="stepper_nav_button">
@@ -89,11 +88,11 @@
     </style>
 
     <style name="toolbar_theme">
-        <item name="android:textColorSecondary">@color/white</item>
+        <item name="android:textColorSecondary">@android:color/white</item>
     </style>
     <style name="toolbar_style" parent="Widget.AppCompat.Toolbar">
         <item name="android:background">@color/light_green700</item>
-        <item name="titleTextColor">@color/white</item>
+        <item name="titleTextColor">@android:color/white</item>
     </style>
 
 
diff --git a/app/src/main/res/xml/account_authenticator.xml b/app/src/main/res/xml/account_authenticator.xml
index a2b393a5..d919b748 100644
--- a/app/src/main/res/xml/account_authenticator.xml
+++ b/app/src/main/res/xml/account_authenticator.xml
@@ -8,7 +8,7 @@
 
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
     android:accountType="bitfire.at.davdroid"
-    android:icon="@drawable/ic_launcher"
+    android:icon="@mipmap/ic_launcher"
     android:label="@string/app_name"
-    android:smallIcon="@drawable/ic_launcher"
+    android:smallIcon="@mipmap/ic_launcher"
     android:accountPreferences="@xml/sync_prefs" />