diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
deleted file mode 100644
index 83808c54..00000000
--- a/app/src/main/res/drawable/ic_back.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0"
-    android:autoMirrored="true"
-    android:tint="?attr/colorControlNormal">
-    <path
-        android:pathData="M20,11L7.8,11l5.6,-5.6L12,4l-8,8l8,8l1.4,-1.4L7.8,13L20,13L20,11z"
-        android:fillColor="@android:color/white"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw640dp/fragment_view_thread.xml b/app/src/main/res/layout-sw640dp/fragment_view_thread.xml
index a74cc83b..ec023062 100644
--- a/app/src/main/res/layout-sw640dp/fragment_view_thread.xml
+++ b/app/src/main/res/layout-sw640dp/fragment_view_thread.xml
@@ -8,15 +8,16 @@
         android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:elevation="@dimen/actionbar_elevation" >
+        android:elevation="@dimen/actionbar_elevation">
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             app:title="@string/title_view_thread"
-            app:navigationIcon="@drawable/ic_back"
-            app:menu="@menu/view_thread_toolbar"/>
+            app:navigationIcon="?attr/homeAsUpIndicator"
+            app:navigationContentDescription="@string/abc_action_bar_up_description"
+            app:menu="@menu/view_thread_toolbar" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -40,7 +41,7 @@
         android:id="@+id/progressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"/>
+        android:layout_gravity="center" />
 
     <com.keylesspalace.tusky.view.BackgroundMessageView
         android:id="@+id/statusView"
diff --git a/app/src/main/res/layout/fragment_view_thread.xml b/app/src/main/res/layout/fragment_view_thread.xml
index 9915740a..b00fa7f8 100644
--- a/app/src/main/res/layout/fragment_view_thread.xml
+++ b/app/src/main/res/layout/fragment_view_thread.xml
@@ -8,15 +8,16 @@
         android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:elevation="@dimen/actionbar_elevation" >
+        android:elevation="@dimen/actionbar_elevation">
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             app:title="@string/title_view_thread"
-            app:navigationIcon="@drawable/ic_back"
-            app:menu="@menu/view_thread_toolbar"/>
+            app:navigationIcon="?attr/homeAsUpIndicator"
+            app:navigationContentDescription="@string/abc_action_bar_up_description"
+            app:menu="@menu/view_thread_toolbar" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -40,7 +41,7 @@
         android:id="@+id/progressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"/>
+        android:layout_gravity="center" />
 
     <com.keylesspalace.tusky.view.BackgroundMessageView
         android:id="@+id/statusView"