diff --git a/app/src/main/res/layout/fragment_screenshot.xml b/app/src/main/res/layout/fragment_screenshot.xml
index 0cc5a6714..23483cc48 100644
--- a/app/src/main/res/layout/fragment_screenshot.xml
+++ b/app/src/main/res/layout/fragment_screenshot.xml
@@ -17,20 +17,21 @@
   ~
   -->
 
-<RelativeLayout 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"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context=".view.ui.details.ScreenshotFragment">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/colorTransparent"
+        android:minHeight="?attr/actionBarSize"
         android:translationZ="1dp"
-        app:layout_scrollFlags="enterAlways|exitUntilCollapsed" />
+        app:navigationIcon="@drawable/ic_arrow_back" />
 
     <com.airbnb.epoxy.EpoxyRecyclerView
         android:id="@+id/recycler_view"
@@ -39,4 +40,4 @@
         android:orientation="horizontal"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         tools:listitem="@layout/view_screenshot" />
-</RelativeLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/view_screenshot_large.xml b/app/src/main/res/layout/view_screenshot_large.xml
index 921e4b1cf..51d05c47e 100644
--- a/app/src/main/res/layout/view_screenshot_large.xml
+++ b/app/src/main/res/layout/view_screenshot_large.xml
@@ -17,13 +17,12 @@
   ~
   -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/img"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true" />
-</RelativeLayout>
\ No newline at end of file
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>