diff --git a/app/src/main/res/layout/subscription_groups_header.xml b/app/src/main/res/layout/subscription_groups_header.xml
index b290d9dda..e59e63c73 100644
--- a/app/src/main/res/layout/subscription_groups_header.xml
+++ b/app/src/main/res/layout/subscription_groups_header.xml
@@ -2,11 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingLeft="16dp"
-    android:paddingTop="12dp"
-    android:paddingRight="16dp"
-    android:paddingBottom="12dp">
+    android:layout_height="wrap_content">
 
     <org.schabi.newpipe.views.NewPipeTextView
         android:id="@+id/header_title"
@@ -17,6 +13,8 @@
         android:gravity="start|center_vertical"
         android:maxLines="2"
         android:minHeight="24dp"
+        android:paddingHorizontal="16dp"
+        android:paddingVertical="12dp"
         android:textColor="?android:attr/textColorPrimary"
         android:textSize="16sp"
         android:textStyle="bold"
@@ -24,17 +22,20 @@
 
     <ImageButton
         android:id="@+id/header_toggle_view_mode"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_marginStart="16dp"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
         android:background="?attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/list_view_mode"
+        android:padding="8dp"
         tools:src="@drawable/ic_apps" />
 
     <ImageButton
         android:id="@+id/header_sort"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_marginStart="16dp"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_marginEnd="4dp"
         android:background="?attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/sort"
+        android:padding="8dp"
         android:src="@drawable/ic_sort" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e685ca081..2bf3e0d60 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -751,4 +751,5 @@
     <string name="unknown_quality">Unknown quality</string>
     <string name="feed_toggle_show_future_items">Show future items</string>
     <string name="feed_toggle_hide_future_items">Hide future items</string>
+    <string name="sort">Sort</string>
 </resources>
\ No newline at end of file