diff --git a/app/src/main/res/layout/activity_calculator.xml b/app/src/main/res/layout/activity_calculator.xml
index deec73027..6f1fc6cc8 100644
--- a/app/src/main/res/layout/activity_calculator.xml
+++ b/app/src/main/res/layout/activity_calculator.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -11,10 +10,10 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="?attr/colorPrimary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:popupTheme="?attr/actionBarPopupTheme"
         app:theme="?attr/actionBarTheme" />
 
     <TextView
diff --git a/app/src/main/res/layout/activity_panic_settings.xml b/app/src/main/res/layout/activity_panic_settings.xml
index 3469eea44..2919b6ac1 100644
--- a/app/src/main/res/layout/activity_panic_settings.xml
+++ b/app/src/main/res/layout/activity_panic_settings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -10,14 +9,13 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:popupTheme="?attr/actionBarPopupTheme"
-        app:theme="?attr/actionBarTheme"/>
+        android:background="?attr/colorPrimary"
+        app:theme="?attr/actionBarTheme" />
 
-    <fragment
+    <fragment xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/fragment_container"
         class="org.fdroid.fdroid.views.panic.PanicPreferencesFragment"
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/installed_apps_layout.xml b/app/src/main/res/layout/installed_apps_layout.xml
index 021676674..392ee9549 100644
--- a/app/src/main/res/layout/installed_apps_layout.xml
+++ b/app/src/main/res/layout/installed_apps_layout.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -10,34 +9,34 @@
         android:id="@+id/toolbar"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
+        android:background="?attr/colorPrimary"
         app:layout_constraintEnd_toEndOf="parent"
-        app:theme="?attr/actionBarTheme"
-        app:popupTheme="?attr/actionBarPopupTheme" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:theme="?attr/actionBarTheme" />
 
     <TextView
         android:id="@+id/empty_state"
+        style="@style/AppListEmptyText"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/toolbar"
-        style="@style/AppListEmptyText"
+        android:text="@string/empty_installed_app_list"
         android:visibility="gone"
-        android:text="@string/empty_installed_app_list" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/toolbar" />
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/app_list"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        tools:listitem="@layout/installed_app_list_item"
+        android:scrollbars="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/toolbar"
-        android:scrollbars="vertical" />
+        tools:listitem="@layout/installed_app_list_item" />
 
     <!--
     Commented out until the long press functionality is implemented.
diff --git a/app/src/main/res/layout/repo_list_activity.xml b/app/src/main/res/layout/repo_list_activity.xml
index 472461097..806ff7945 100644
--- a/app/src/main/res/layout/repo_list_activity.xml
+++ b/app/src/main/res/layout/repo_list_activity.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <android.support.v7.widget.Toolbar
         android:id="@+id/toolbar"
-        android:title="@string/menu_manage"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:theme="?attr/actionBarTheme"
-        app:popupTheme="?attr/actionBarPopupTheme" />
+        android:background="?attr/colorPrimary"
+        android:title="@string/menu_manage"
+        app:theme="?attr/actionBarTheme" />
 
     <ListView
         android:id="@+id/list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:listitem="@layout/repo_item"
-        android:scrollbars="vertical" />
+        android:scrollbars="vertical"
+        tools:listitem="@layout/repo_item" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/repodetails.xml b/app/src/main/res/layout/repodetails.xml
index 375db46ca..60609ced5 100644
--- a/app/src/main/res/layout/repodetails.xml
+++ b/app/src/main/res/layout/repodetails.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
     <android.support.v7.widget.Toolbar
         android:id="@+id/toolbar"
-        android:title="@string/repo_details"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:theme="?attr/actionBarTheme"
-        app:popupTheme="?attr/actionBarPopupTheme" />
+        android:background="?attr/colorPrimary"
+        android:title="@string/repo_details"
+        app:theme="?attr/actionBarTheme" />
 
     <ScrollView
         android:layout_width="match_parent"
@@ -21,16 +21,17 @@
             android:id="@+id/repoView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingLeft="?attr/listPreferredItemPaddingLeft"
-            android:paddingStart="?attr/listPreferredItemPaddingLeft"
-            android:paddingRight="?attr/listPreferredItemPaddingRight"
+            android:orientation="vertical"
             android:paddingEnd="?attr/listPreferredItemPaddingRight"
-            android:orientation="vertical">
+            android:paddingLeft="?attr/listPreferredItemPaddingLeft"
+            android:paddingRight="?attr/listPreferredItemPaddingRight"
+            android:paddingStart="?attr/listPreferredItemPaddingLeft">
 
             <!-- URL of this repo -->
             <TextView
-                android:text="@string/repo_url"
-                style="@style/CaptionText" />
+                style="@style/CaptionText"
+                android:text="@string/repo_url" />
+
             <TextView
                 android:id="@+id/input_repo_url"
                 style="@style/BodyText" />
@@ -38,8 +39,9 @@
             <!-- Name of this repo -->
             <TextView
                 android:id="@+id/label_repo_name"
-                android:text="@string/repo_name"
-                style="@style/CaptionText" />
+                style="@style/CaptionText"
+                android:text="@string/repo_name" />
+
             <TextView
                 android:id="@+id/text_repo_name"
                 style="@style/BodyText" />
@@ -47,8 +49,9 @@
             <!-- Description - as pulled from the index file during last update... -->
             <TextView
                 android:id="@+id/label_description"
-                android:text="@string/repo_description"
-                style="@style/CaptionText" />
+                style="@style/CaptionText"
+                android:text="@string/repo_description" />
+
             <TextView
                 android:id="@+id/text_description"
                 style="@style/BodyText" />
@@ -56,8 +59,9 @@
             <!-- Number of apps belonging to this repo -->
             <TextView
                 android:id="@+id/label_num_apps"
-                android:text="@string/repo_num_apps"
-                style="@style/CaptionText" />
+                style="@style/CaptionText"
+                android:text="@string/repo_num_apps" />
+
             <TextView
                 android:id="@+id/text_num_apps"
                 style="@style/BodyText" />
@@ -65,75 +69,82 @@
             <!-- The last time this repo was updated -->
             <TextView
                 android:id="@+id/label_last_update"
-                android:text="@string/repo_last_update"
-                style="@style/CaptionText" />
+                style="@style/CaptionText"
+                android:text="@string/repo_last_update" />
+
             <TextView
                 android:id="@+id/text_last_update"
                 style="@style/BodyText" />
 
             <!-- mirrors included in the index -->
             <TextView
-                    android:id="@+id/label_official_mirrors"
-                    android:visibility="gone"
-                    android:text="@string/repo_official_mirrors"
-                    style="@style/CaptionText" />
+                android:id="@+id/label_official_mirrors"
+                style="@style/CaptionText"
+                android:text="@string/repo_official_mirrors"
+                android:visibility="gone" />
+
             <TextView
-                    android:id="@+id/text_official_mirrors"
-                    android:visibility="gone"
-                    android:textColor="@android:color/black"
-                    style="@style/CaptionText" />
+                android:id="@+id/text_official_mirrors"
+                style="@style/CaptionText"
+                android:textColor="@android:color/black"
+                android:visibility="gone" />
 
             <!-- mirrors added by the user -->
             <TextView
-                    android:id="@+id/label_user_mirrors"
-                    android:visibility="gone"
-                    android:text="@string/repo_user_mirrors"
-                    style="@style/CaptionText" />
+                android:id="@+id/label_user_mirrors"
+                style="@style/CaptionText"
+                android:text="@string/repo_user_mirrors"
+                android:visibility="gone" />
+
             <TextView
-                    android:id="@+id/text_user_mirrors"
-                    android:visibility="gone"
-                    android:textColor="@android:color/black"
-                    style="@style/CaptionText" />
+                android:id="@+id/text_user_mirrors"
+                style="@style/CaptionText"
+                android:textColor="@android:color/black"
+                android:visibility="gone" />
 
             <!-- The credentials used to access this repo (optional) -->
             <TextView
                 android:id="@+id/label_username"
-                android:text="@string/login_name"
-                style="@style/CaptionText" />
+                style="@style/CaptionText"
+                android:text="@string/login_name" />
+
             <TextView
                 android:id="@+id/text_username"
                 style="@style/BodyText" />
+
             <Button
                 android:id="@+id/button_edit_credentials"
-                android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
-                android:text="@string/repo_edit_credentials"
-                android:onClick="showChangePasswordDialog" />
+                android:layout_height="wrap_content"
+                android:onClick="showChangePasswordDialog"
+                android:text="@string/repo_edit_credentials" />
 
             <!-- Signature (or "unsigned" if none) -->
             <TextView
                 android:id="@+id/label_repo_fingerprint"
-                android:text="@string/repo_fingerprint"
-                style="@style/CaptionText" />
+                style="@style/CaptionText"
+                android:text="@string/repo_fingerprint" />
+
             <TextView
                 android:id="@+id/text_repo_fingerprint"
-                android:typeface="monospace"
-                style="@style/BodyText" />
+                style="@style/BodyText"
+                android:typeface="monospace" />
+
             <TextView
                 android:id="@+id/text_repo_fingerprint_description"
                 style="@style/BodyText" />
 
             <TextView
                 android:id="@+id/text_not_yet_updated"
-                android:text="@string/repo_not_yet_updated"
-                style="@style/BodyText" />
+                style="@style/BodyText"
+                android:text="@string/repo_not_yet_updated" />
 
             <ImageView
                 android:id="@+id/qr_code"
-                android:src="@drawable/swap_qr_example"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingTop="16dp"/>
+                android:paddingTop="16dp"
+                android:src="@drawable/swap_qr_example" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c883929da..5d5eab894 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -10,8 +10,7 @@
         <item name="android:textColorLink">@color/fdroid_green</item>
         <item name="alertDialogTheme">@style/AlertDialogThemeDark</item>
         <item name="android:textViewStyle">@style/TextViewStyle</item>
-        <item name="actionBarTheme">@style/AppThemeLight.Toolbar</item>
-        <item name="actionBarPopupTheme">@style/AppThemeLight.Toolbar</item>
+        <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
         <item name="appDetailsBackground">?android:windowBackground</item>
         <item name="appDetailsCardBackground">#424242</item>
         <item name="categoryPreviewAppCardBackground">@drawable/category_preview_app_card_background_dark</item>
@@ -35,8 +34,7 @@
         <item name="android:textColorLink">@color/fdroid_green</item>
         <item name="alertDialogTheme">@style/AlertDialogThemeLight</item>
         <item name="android:textViewStyle">@style/TextViewStyle</item>
-        <item name="actionBarTheme">@style/AppThemeLight.Toolbar</item>
-        <item name="actionBarPopupTheme">@style/AppThemeLight.Toolbar</item>
+        <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
         <item name="appDetailsBackground">#fcfcfc</item>
         <item name="appDetailsCardBackground">#ffffff</item>
         <item name="categoryPreviewAppCardBackground">@drawable/category_preview_app_card_background_light</item>
@@ -107,10 +105,6 @@
         <item name="windowNoTitle">true</item>
     </style>
 
-    <style name="AppThemeLight.Toolbar" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
-        <item name="android:background">@color/fdroid_blue</item>
-    </style>
-
     <style name="TextViewStyle" parent="android:Widget.TextView">
         <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>