diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle
index c5d2bbcff..e71206d16 100644
--- a/OpenKeychain/build.gradle
+++ b/OpenKeychain/build.gradle
@@ -26,7 +26,7 @@ dependencies {
     compile 'com.journeyapps:zxing-android-integration:2.0.1@aar'
     compile 'com.google.zxing:core:3.0.1'
     compile 'com.jpardogo.materialtabstrip:library:1.0.8'
-    compile 'it.neokree:MaterialNavigationDrawer:1.3'
+    compile 'it.neokree:MaterialNavigationDrawer:1.3.1'
     compile 'com.nispok:snackbar:2.7.4'
     compile 'com.getbase:floatingactionbutton:1.7.0'
 }
diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
index c7b8c9b3a..253836080 100644
--- a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
+++ b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
@@ -18,7 +18,7 @@
         <ImageView
             android:id="@+id/status_bar"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/statusbar_margin"
+            android:layout_height="@dimen/statusbar_height"
             android:background="?attr/colorPrimary" />
 
         <android.support.v7.widget.Toolbar
diff --git a/OpenKeychain/src/main/res/layout/first_time_activity.xml b/OpenKeychain/src/main/res/layout/first_time_activity.xml
index 61737e548..ba80214a6 100644
--- a/OpenKeychain/src/main/res/layout/first_time_activity.xml
+++ b/OpenKeychain/src/main/res/layout/first_time_activity.xml
@@ -7,7 +7,7 @@
     <ImageView
         android:id="@+id/status_bar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/statusbar_margin" />
+        android:layout_height="@dimen/statusbar_height" />
 
     <LinearLayout
         android:id="@+id/first_time_buttons"
diff --git a/OpenKeychain/src/main/res/layout/toolbar_standalone.xml b/OpenKeychain/src/main/res/layout/toolbar_standalone.xml
index cef0b862d..950c2f2ae 100644
--- a/OpenKeychain/src/main/res/layout/toolbar_standalone.xml
+++ b/OpenKeychain/src/main/res/layout/toolbar_standalone.xml
@@ -7,10 +7,14 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
+    <!--
+        We always have windowTranslucentStatus=true to get under the status bar.
+        Thus this ImageView is the part under the status bar!
+    -->
     <ImageView
         android:id="@+id/status_bar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/statusbar_margin"
+        android:layout_height="@dimen/statusbar_height"
         android:background="?attr/colorPrimary" />
 
     <android.support.v7.widget.Toolbar
diff --git a/OpenKeychain/src/main/res/values-v21/dimens.xml b/OpenKeychain/src/main/res/values-v21/dimens.xml
index d54327293..3a85cca93 100644
--- a/OpenKeychain/src/main/res/values-v21/dimens.xml
+++ b/OpenKeychain/src/main/res/values-v21/dimens.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="statusbar_margin">21dp</dimen>
-    <!-- 120dp + statusbar_margin -->
+    <!--
+        Status bar height according to
+        http://www.google.com/design/spec/layout/structure.html#structure-system-bars
+    -->
+    <dimen name="statusbar_height">24dp</dimen>
+    <!-- 120dp + statusbar_height -->
     <dimen name="big_toolbar">141dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/dimens.xml b/OpenKeychain/src/main/res/values/dimens.xml
index 21ef110ea..7e361a358 100644
--- a/OpenKeychain/src/main/res/values/dimens.xml
+++ b/OpenKeychain/src/main/res/values/dimens.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="statusbar_margin">0dp</dimen>
+    <!-- on Android < 5, we do not color the status bar, thus 0dp! -->
+    <dimen name="statusbar_height">0dp</dimen>
     <dimen name="big_toolbar">120dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml
index f1d1ea490..885d5e682 100644
--- a/OpenKeychain/src/main/res/values/themes.xml
+++ b/OpenKeychain/src/main/res/values/themes.xml
@@ -4,7 +4,7 @@
     <style name="KeychainTheme" parent="KeychainTheme.Base" />
 
     <!--<style name="KeychainTheme.Base" parent="HoloKeychainTheme">-->
-    <style name="KeychainTheme.Base" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="KeychainTheme.Base" parent="Theme.AppCompat.Light">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/accent</item>