diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
index aea76f8ab..b7943f7ae 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
@@ -911,7 +911,7 @@ public class AppDetailsRecyclerViewAdapter
 
             int margin = context.getResources().getDimensionPixelSize(R.dimen.layout_horizontal_margin);
             int padding = context.getResources().getDimensionPixelSize(R.dimen.details_activity_padding);
-            ViewCompat.setPaddingRelative(view, margin + padding + ViewCompat.getPaddingStart(view), view.getPaddingTop(), ViewCompat.getPaddingEnd(view), view.getPaddingBottom());
+            ViewCompat.setPaddingRelative(view, margin + padding + ViewCompat.getPaddingStart(view), view.getPaddingTop(), margin + padding + ViewCompat.getPaddingEnd(view), view.getPaddingBottom());
         }
 
         public void bindModel(final Apk apk) {
diff --git a/app/src/main/res/drawable-hdpi/ic_az_black.png b/app/src/main/res/drawable-hdpi/ic_az_black.png
index 6f43e9a73..414c3551e 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_az_black.png and b/app/src/main/res/drawable-hdpi/ic_az_black.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_az_white.png b/app/src/main/res/drawable-hdpi/ic_az_white.png
index 0a988e88c..e522ee8ad 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_az_white.png and b/app/src/main/res/drawable-hdpi/ic_az_white.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_last_updated_black.png b/app/src/main/res/drawable-hdpi/ic_last_updated_black.png
index ab7c530ab..fa2d7a4af 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_last_updated_black.png and b/app/src/main/res/drawable-hdpi/ic_last_updated_black.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_last_updated_white.png b/app/src/main/res/drawable-hdpi/ic_last_updated_white.png
index 4f9d5122d..e6a9efb96 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_last_updated_white.png and b/app/src/main/res/drawable-hdpi/ic_last_updated_white.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_az_black.png b/app/src/main/res/drawable-mdpi/ic_az_black.png
index 50aaae3df..1ea97fd97 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_az_black.png and b/app/src/main/res/drawable-mdpi/ic_az_black.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_az_white.png b/app/src/main/res/drawable-mdpi/ic_az_white.png
index 4d968ce4e..96e832ce2 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_az_white.png and b/app/src/main/res/drawable-mdpi/ic_az_white.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_last_updated_black.png b/app/src/main/res/drawable-mdpi/ic_last_updated_black.png
index 49f8ba055..684d0a366 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_last_updated_black.png and b/app/src/main/res/drawable-mdpi/ic_last_updated_black.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_last_updated_white.png b/app/src/main/res/drawable-mdpi/ic_last_updated_white.png
index 50847f0a5..90a98f47e 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_last_updated_white.png and b/app/src/main/res/drawable-mdpi/ic_last_updated_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_az_black.png b/app/src/main/res/drawable-xhdpi/ic_az_black.png
index bb0425833..c967497c1 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_az_black.png and b/app/src/main/res/drawable-xhdpi/ic_az_black.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_az_white.png b/app/src/main/res/drawable-xhdpi/ic_az_white.png
index 595a4a447..8cce35e16 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_az_white.png and b/app/src/main/res/drawable-xhdpi/ic_az_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_last_updated_black.png b/app/src/main/res/drawable-xhdpi/ic_last_updated_black.png
index cf727c3a5..3cf2beee4 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_last_updated_black.png and b/app/src/main/res/drawable-xhdpi/ic_last_updated_black.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_last_updated_white.png b/app/src/main/res/drawable-xhdpi/ic_last_updated_white.png
index 5fde29b9a..5d70620f3 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_last_updated_white.png and b/app/src/main/res/drawable-xhdpi/ic_last_updated_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_az_black.png b/app/src/main/res/drawable-xxhdpi/ic_az_black.png
index d90a8cd13..b32e7392e 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_az_black.png and b/app/src/main/res/drawable-xxhdpi/ic_az_black.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_az_white.png b/app/src/main/res/drawable-xxhdpi/ic_az_white.png
index c509cd2a3..843b669b2 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_az_white.png and b/app/src/main/res/drawable-xxhdpi/ic_az_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_last_updated_black.png b/app/src/main/res/drawable-xxhdpi/ic_last_updated_black.png
index 5f9ee5613..385350e98 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_last_updated_black.png and b/app/src/main/res/drawable-xxhdpi/ic_last_updated_black.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_last_updated_white.png b/app/src/main/res/drawable-xxhdpi/ic_last_updated_white.png
index 31d603e6d..cf98bf6b7 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_last_updated_white.png and b/app/src/main/res/drawable-xxhdpi/ic_last_updated_white.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_az_black.png b/app/src/main/res/drawable-xxxhdpi/ic_az_black.png
index 2ac5c87f3..9fe0d3c63 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_az_black.png and b/app/src/main/res/drawable-xxxhdpi/ic_az_black.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_az_white.png b/app/src/main/res/drawable-xxxhdpi/ic_az_white.png
index 6efdc7a33..46734834f 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_az_white.png and b/app/src/main/res/drawable-xxxhdpi/ic_az_white.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_last_updated_black.png b/app/src/main/res/drawable-xxxhdpi/ic_last_updated_black.png
index 70e27b7c2..04f128144 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_last_updated_black.png and b/app/src/main/res/drawable-xxxhdpi/ic_last_updated_black.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_last_updated_white.png b/app/src/main/res/drawable-xxxhdpi/ic_last_updated_white.png
index 7212497b9..9db7bd40d 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_last_updated_white.png and b/app/src/main/res/drawable-xxxhdpi/ic_last_updated_white.png differ
diff --git a/app/src/main/res/layout/app_details2_donate.xml b/app/src/main/res/layout/app_details2_donate.xml
index 994eec35e..2472fc32f 100644
--- a/app/src/main/res/layout/app_details2_donate.xml
+++ b/app/src/main/res/layout/app_details2_donate.xml
@@ -1,29 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="fill_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="@dimen/details_activity_padding"
-    android:clickable="true"
-    android:orientation="vertical"
-    android:background="?attr/detailPanel"
-    android:padding="@dimen/details_activity_padding">
+    app:cardBackgroundColor="?attr/appDetailsCardBackground"
+    app:cardCornerRadius="3dp"
+    app:cardElevation="3dp">
 
-    <TextView
-        android:id="@+id/donate_header"
-        android:layout_width="match_parent"
+    <LinearLayout
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:textSize="15sp"
-        android:textAlignment="center"
-        android:gravity="center"
-        tools:text="F-Droid is created by F-Droid Limited and Contributors. Buy them a coffee!"
-        android:layout_marginBottom="12dp" />
+        android:orientation="vertical"
+        android:padding="@dimen/details_activity_padding">
 
-    <android.support.v7.widget.GridLayout
-        android:id="@+id/donation_options"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:columnCount="3" />
+        <TextView
+            android:id="@+id/donate_header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="12dp"
+            android:gravity="center"
+            android:textAlignment="center"
+            android:textSize="15sp"
+            tools:text="F-Droid is created by F-Droid Limited and Contributors. Buy them a coffee!" />
 
-</LinearLayout>
+        <android.support.v7.widget.GridLayout
+            android:id="@+id/donation_options"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:columnCount="3" />
+
+    </LinearLayout>
+</android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_details2_screenshot_item.xml b/app/src/main/res/layout/app_details2_screenshot_item.xml
index ce727453f..83264402b 100644
--- a/app/src/main/res/layout/app_details2_screenshot_item.xml
+++ b/app/src/main/res/layout/app_details2_screenshot_item.xml
@@ -6,6 +6,7 @@
     android:layout_margin="@dimen/details_screenshot_margin"
     android:padding="10dp"
     app:cardBackgroundColor="#ffffff"
+    app:cardCornerRadius="0dp"
     app:cardElevation="3dp">
 
     <ImageView
@@ -14,6 +15,6 @@
         android:layout_height="match_parent"
         android:adjustViewBounds="true"
         android:minWidth="@dimen/details_screenshot_width"
-        android:scaleType="fitCenter" />
+        android:scaleType="centerCrop" />
 
 </android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_details2_version_item.xml b/app/src/main/res/layout/app_details2_version_item.xml
index 57ac5405a..633a530bc 100644
--- a/app/src/main/res/layout/app_details2_version_item.xml
+++ b/app/src/main/res/layout/app_details2_version_item.xml
@@ -9,8 +9,7 @@
         android:paddingBottom="5dp"
         android:paddingLeft="10dp"
         android:paddingRight="10dp"
-        android:background="?attr/selectableItemBackground"
-        >
+        android:background="?attr/selectableItemBackground">
 
       <TextView android:id="@+id/version"
             android:textStyle="bold"
@@ -100,7 +99,6 @@
             tools:text=""
             tools:visibility="gone" />
 
-
       <TextView android:id="@+id/incompatible_reasons"
             android:textSize="13sp"
             android:layout_below="@id/container_added_nativecode"
diff --git a/app/src/main/res/layout/donate_bitcoin.xml b/app/src/main/res/layout/donate_bitcoin.xml
index 9beef29cb..3730e1c38 100644
--- a/app/src/main/res/layout/donate_bitcoin.xml
+++ b/app/src/main/res/layout/donate_bitcoin.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ImageView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="80dp"
-    android:layout_height="20dp"
-    android:layout_marginLeft="12dp"
-    android:layout_marginStart="12dp"
-    android:layout_marginEnd="12dp"
-    android:layout_marginRight="12dp"
+    android:layout_height="30dp"
+    android:padding="4dp"
+    android:layout_marginStart="4dp"
+    android:layout_marginLeft="4dp"
+    android:layout_marginEnd="4dp"
+    android:layout_marginRight="4dp"
     android:src="@drawable/donation_option_bitcoin"
     android:contentDescription="@string/menu_bitcoin" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/donate_flattr.xml b/app/src/main/res/layout/donate_flattr.xml
index aaf3631b9..113c1774a 100644
--- a/app/src/main/res/layout/donate_flattr.xml
+++ b/app/src/main/res/layout/donate_flattr.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ImageView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="80dp"
-    android:layout_height="16dp"
-    android:layout_marginLeft="12dp"
-    android:layout_marginStart="12dp"
-    android:layout_marginEnd="12dp"
-    android:layout_marginRight="12dp"
+    android:layout_height="30dp"
+    android:padding="6dp"
+    android:layout_marginStart="4dp"
+    android:layout_marginLeft="4dp"
+    android:layout_marginEnd="4dp"
+    android:layout_marginRight="4dp"
     android:src="@drawable/donation_option_flattr"
     android:contentDescription="@string/menu_flattr" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/donate_generic.xml b/app/src/main/res/layout/donate_generic.xml
index a683887ef..25ef78208 100644
--- a/app/src/main/res/layout/donate_generic.xml
+++ b/app/src/main/res/layout/donate_generic.xml
@@ -6,5 +6,9 @@
     android:drawableLeft="@drawable/ic_donate"
     android:drawableStart="@drawable/ic_donate"
     android:drawablePadding="4dp"
+    android:layout_marginStart="4dp"
+    android:layout_marginLeft="4dp"
+    android:layout_marginEnd="4dp"
+    android:layout_marginRight="4dp"
     android:gravity="center_vertical"
     android:text="@string/menu_donate" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/donate_litecoin.xml b/app/src/main/res/layout/donate_litecoin.xml
index e9bba5956..297a40c6b 100644
--- a/app/src/main/res/layout/donate_litecoin.xml
+++ b/app/src/main/res/layout/donate_litecoin.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ImageView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="80dp"
-    android:layout_height="20dp"
+    android:layout_height="30dp"
+    android:padding="2dp"
+    android:layout_marginStart="4dp"
+    android:layout_marginLeft="4dp"
+    android:layout_marginEnd="4dp"
+    android:layout_marginRight="4dp"
     android:src="@drawable/donation_option_litecoin"
     android:contentDescription="@string/menu_litecoin" />
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_calculator_launcher.png b/app/src/main/res/mipmap-hdpi/ic_calculator_launcher.png
index 15d6c7058..90860fd77 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_calculator_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_calculator_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_calculator_launcher.png b/app/src/main/res/mipmap-mdpi/ic_calculator_launcher.png
index 895a4ea06..b39e44bd6 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_calculator_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_calculator_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_calculator_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_calculator_launcher.png
index 96d438e6c..48526a57b 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_calculator_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_calculator_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_calculator_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_calculator_launcher.png
index 0d56e0187..6156455c1 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_calculator_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_calculator_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_calculator_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_calculator_launcher.png
index 375e4ad6d..eb0ab1301 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_calculator_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_calculator_launcher.png differ
diff --git a/metadata/en-US/images/phoneScreenshots/screenshot-dark-details.png b/metadata/en-US/images/phoneScreenshots/screenshot-dark-details.png
new file mode 100644
index 000000000..a09000392
Binary files /dev/null and b/metadata/en-US/images/phoneScreenshots/screenshot-dark-details.png differ
diff --git a/metadata/en-US/images/phoneScreenshots/screenshot-dark-home.png b/metadata/en-US/images/phoneScreenshots/screenshot-dark-home.png
new file mode 100644
index 000000000..692dc78ab
Binary files /dev/null and b/metadata/en-US/images/phoneScreenshots/screenshot-dark-home.png differ
diff --git a/metadata/en-US/images/phoneScreenshots/screenshot-dark-knownvuln.png b/metadata/en-US/images/phoneScreenshots/screenshot-dark-knownvuln.png
new file mode 100644
index 000000000..105bb9bfd
Binary files /dev/null and b/metadata/en-US/images/phoneScreenshots/screenshot-dark-knownvuln.png differ
diff --git a/metadata/en-US/images/phoneScreenshots/screenshot-knownvuln.png b/metadata/en-US/images/phoneScreenshots/screenshot-knownvuln.png
index 7f86bb9c3..1b2fa80c0 100644
Binary files a/metadata/en-US/images/phoneScreenshots/screenshot-knownvuln.png and b/metadata/en-US/images/phoneScreenshots/screenshot-knownvuln.png differ
diff --git a/tools/png-pre-compress b/tools/png-pre-compress
index 3edb26db9..fe9a8f411 100755
--- a/tools/png-pre-compress
+++ b/tools/png-pre-compress
@@ -7,5 +7,12 @@ for f in `find $(dirname $0)/../app/src/ -type f -name \*.png`; do
     echo $f | grep -Eo '\.9\.png$' && continue  # do not optimized 9-patch, it breaks them
     tmpfile=$(mktemp)
     aapt singleCrunch -v -i $f -o $tmpfile
+    exiftool -all= $tmpfile
     mv $tmpfile $f
 done
+
+for f in metadata/*/images/*Screenshots/*.png; do
+    exiftool -all= $f
+    tmpfile=$(mktemp)
+    (zopflipng --filters=01234mepb --lossy_8bit --lossy_transparent -y $f $tmpfile && mv $tmpfile $f) &
+done