diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 54b36931c..3d280e78e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -401,7 +401,6 @@
             android:label="@string/app_details"
             android:exported="true"
             android:parentActivityName=".FDroid"
-            android:theme="@style/AppThemeLight.NoActionBar"
             android:configChanges="layoutDirection|locale" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
diff --git a/app/src/main/java/org/fdroid/fdroid/FDroid.java b/app/src/main/java/org/fdroid/fdroid/FDroid.java
index 519424ba6..f8a6a30ff 100644
--- a/app/src/main/java/org/fdroid/fdroid/FDroid.java
+++ b/app/src/main/java/org/fdroid/fdroid/FDroid.java
@@ -242,7 +242,7 @@ public class FDroid extends AppCompatActivity implements SearchView.OnQueryTextL
 
         if (!TextUtils.isEmpty(packageName)) {
             Utils.debugLog(TAG, "FDroid launched via app link for '" + packageName + "'");
-            Intent intentToInvoke = new Intent(this, AppDetails.class);
+            Intent intentToInvoke = new Intent(this, AppDetails2.class);
             intentToInvoke.putExtra(AppDetails.EXTRA_APPID, packageName);
             startActivity(intentToInvoke);
             finish();
diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java
index 3da0e8428..3f2692349 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java
@@ -17,6 +17,7 @@ import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;
 
 import org.fdroid.fdroid.AppDetails;
+import org.fdroid.fdroid.AppDetails2;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.Utils;
 import org.fdroid.fdroid.data.ApkProvider;
@@ -123,7 +124,7 @@ public class AppListItemController extends RecyclerView.ViewHolder {
                 return;
             }
 
-            Intent intent = new Intent(activity, AppDetails.class);
+            Intent intent = new Intent(activity, AppDetails2.class);
             intent.putExtra(AppDetails.EXTRA_APPID, currentApp.packageName);
             if (Build.VERSION.SDK_INT >= 21) {
                 Pair<View, String> iconTransitionPair = Pair.create((View) icon, activity.getString(R.string.transition_app_item_icon));
diff --git a/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java b/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java
index 4c1d54008..b625ec1bd 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java
@@ -22,6 +22,7 @@ import com.nostra13.universalimageloader.core.assist.FailReason;
 import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
 
 import org.fdroid.fdroid.AppDetails;
+import org.fdroid.fdroid.AppDetails2;
 import org.fdroid.fdroid.Preferences;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.Utils;
@@ -119,7 +120,7 @@ public class AppCardController extends RecyclerView.ViewHolder implements ImageL
     }
 
     /**
-     * When the user clicks/touches an app card, we launch the {@link AppDetails} activity in response.
+     * When the user clicks/touches an app card, we launch the {@link AppDetails2} activity in response.
      */
     @Override
     public void onClick(View v) {
@@ -127,7 +128,7 @@ public class AppCardController extends RecyclerView.ViewHolder implements ImageL
             return;
         }
 
-        Intent intent = new Intent(activity, AppDetails.class);
+        Intent intent = new Intent(activity, AppDetails2.class);
         intent.putExtra(AppDetails.EXTRA_APPID, currentApp.packageName);
         if (Build.VERSION.SDK_INT >= 21) {
             Pair<View, String> iconTransitionPair = Pair.create((View) icon, activity.getString(R.string.transition_app_item_icon));