diff --git a/app/src/main/java/org/fdroid/fdroid/AppDetails2.java b/app/src/main/java/org/fdroid/fdroid/AppDetails2.java
index d62c43e36..90384fc31 100644
--- a/app/src/main/java/org/fdroid/fdroid/AppDetails2.java
+++ b/app/src/main/java/org/fdroid/fdroid/AppDetails2.java
@@ -39,6 +39,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.design.widget.AppBarLayout;
 import android.support.design.widget.CoordinatorLayout;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
@@ -110,6 +111,8 @@ public class AppDetails2 extends AppCompatActivity implements ShareChooserDialog
         setContentView(R.layout.app_details2);
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         toolbar.setTitle(""); // Nice and clean toolbar
+        toolbar.setNavigationIcon(R.drawable.ic_back);
+        toolbar.setOverflowIcon(ContextCompat.getDrawable(this, R.drawable.ic_more));
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         supportPostponeEnterTransition();
diff --git a/app/src/main/res/drawable-mdpi/ic_back.png b/app/src/main/res/drawable-mdpi/ic_back.png
new file mode 100644
index 000000000..53d6d9277
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_back.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_more.png b/app/src/main/res/drawable-mdpi/ic_more.png
new file mode 100644
index 000000000..c0769c7e4
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_more.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_share_white.png b/app/src/main/res/drawable-mdpi/ic_share_white.png
index e944fd70c..6c29d7c5c 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_share_white.png and b/app/src/main/res/drawable-mdpi/ic_share_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_back.png b/app/src/main/res/drawable-xhdpi/ic_back.png
new file mode 100644
index 000000000..997e69162
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_back.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_more.png b/app/src/main/res/drawable-xhdpi/ic_more.png
new file mode 100644
index 000000000..0b2f5d65c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_more.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_share_white.png b/app/src/main/res/drawable-xhdpi/ic_share_white.png
index 22a8783e7..d4c6683bb 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_share_white.png and b/app/src/main/res/drawable-xhdpi/ic_share_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_back.png b/app/src/main/res/drawable-xxhdpi/ic_back.png
new file mode 100644
index 000000000..5daf7676d
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_back.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_more.png b/app/src/main/res/drawable-xxhdpi/ic_more.png
new file mode 100644
index 000000000..4a69e0605
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_more.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_share_white.png b/app/src/main/res/drawable-xxhdpi/ic_share_white.png
index a35b3cd14..cd78cefce 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_share_white.png and b/app/src/main/res/drawable-xxhdpi/ic_share_white.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_share_white.png b/app/src/main/res/drawable-xxxhdpi/ic_share_white.png
deleted file mode 100644
index e351c7beb..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_share_white.png and /dev/null differ