diff --git a/app/src/main/res/layouts/main_layouts/layout-land/repo_file_header_layout.xml b/app/src/main/res/layouts/main_layouts/layout-land/repo_file_header_layout.xml
index b666eaa7..76888dd1 100644
--- a/app/src/main/res/layouts/main_layouts/layout-land/repo_file_header_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout-land/repo_file_header_layout.xml
@@ -25,6 +25,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:background="?selectableItemBackgroundBorderless"
             android:contentDescription="@string/home"
             android:padding="@dimen/spacing_normal"
             android:src="@drawable/ic_home"/>
diff --git a/app/src/main/res/layouts/main_layouts/layout-large/repo_file_header_layout.xml b/app/src/main/res/layouts/main_layouts/layout-large/repo_file_header_layout.xml
index b666eaa7..76888dd1 100644
--- a/app/src/main/res/layouts/main_layouts/layout-large/repo_file_header_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout-large/repo_file_header_layout.xml
@@ -25,6 +25,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:background="?selectableItemBackgroundBorderless"
             android:contentDescription="@string/home"
             android:padding="@dimen/spacing_normal"
             android:src="@drawable/ic_home"/>
diff --git a/app/src/main/res/layouts/main_layouts/layout/editor_layout.xml b/app/src/main/res/layouts/main_layouts/layout/editor_layout.xml
index 2fbd733f..a232fb8a 100644
--- a/app/src/main/res/layouts/main_layouts/layout/editor_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/editor_layout.xml
@@ -60,9 +60,9 @@
                     android:id="@+id/headerOne"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:background="?selectableItemBackgroundBorderless"
                     android:contentDescription="@string/header_one"
-                    android:foreground="?selectableItemBackgroundBorderless"
-                    android:padding="@dimen/spacing_xs_large"
+                    android:padding="@dimen/spacing_normal"
                     android:scaleType="centerCrop"
                     android:src="@drawable/ic_header_one"/>
 
@@ -70,9 +70,9 @@
                     android:id="@+id/headerTwo"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:background="?selectableItemBackgroundBorderless"
                     android:contentDescription="@string/header_two"
-                    android:foreground="?selectableItemBackgroundBorderless"
-                    android:padding="@dimen/spacing_xs_large"
+                    android:padding="@dimen/spacing_normal"
                     android:scaleType="centerCrop"
                     android:src="@drawable/ic_header_two"/>
 
@@ -80,9 +80,9 @@
                     android:id="@+id/headerThree"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:background="?selectableItemBackgroundBorderless"
                     android:contentDescription="@string/header_three"
-                    android:foreground="?selectableItemBackgroundBorderless"
-                    android:padding="@dimen/spacing_xs_large"
+                    android:padding="@dimen/spacing_normal"
                     android:scaleType="centerCrop"
                     android:src="@drawable/ic_header_three"/>
 
@@ -90,9 +90,9 @@
                     android:id="@+id/bold"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:background="?selectableItemBackgroundBorderless"
                     android:contentDescription="@string/bold"
-                    android:foreground="?selectableItemBackgroundBorderless"
-                    android:padding="@dimen/spacing_xs_large"
+                    android:padding="@dimen/spacing_normal"
                     android:scaleType="centerCrop"
                     android:src="@drawable/ic_format_bold"/>
 
@@ -100,9 +100,9 @@
                     android:id="@+id/italic"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:background="?selectableItemBackgroundBorderless"
                     android:contentDescription="@string/italic"
-                    android:foreground="?selectableItemBackgroundBorderless"
-                    android:padding="@dimen/spacing_xs_large"
+                    android:padding="@dimen/spacing_normal"
                     android:scaleType="centerCrop"
                     android:src="@drawable/ic_format_italic"/>
 
@@ -110,9 +110,9 @@
                     android:id="@+id/strikethrough"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:background="?selectableItemBackgroundBorderless"
                     android:contentDescription="@string/strike_through"
-                    android:foreground="?selectableItemBackgroundBorderless"
-                    android:padding="@dimen/spacing_xs_large"
+                    android:padding="@dimen/spacing_normal"
                     android:scaleType="centerCrop"
                     android:src="@drawable/ic_format_strikethrough"/>
 
@@ -120,9 +120,9 @@
                     android:id="@+id/bullet"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:background="?selectableItemBackgroundBorderless"
                     android:contentDescription="@string/bullet"
-                    android:foreground="?selectableItemBackgroundBorderless"
-                    android:padding="@dimen/spacing_xs_large"
+                    android:padding="@dimen/spacing_normal"
                     android:scaleType="centerCrop"
                     android:src="@drawable/ic_format_list_bulleted"/>
 
@@ -130,9 +130,9 @@
                     android:id="@+id/numbered"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:background="?selectableItemBackgroundBorderless"
                     android:contentDescription="@string/numbered_list"
-                    android:foreground="?selectableItemBackgroundBorderless"
-                    android:padding="@dimen/spacing_xs_large"
+                    android:padding="@dimen/spacing_normal"
                     android:scaleType="centerCrop"
                     android:src="@drawable/ic_list_numbers"/>
 
@@ -140,9 +140,9 @@
                     android:id="@+id/header"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:background="?selectableItemBackgroundBorderless"
                     android:contentDescription="@string/header"
-                    android:foreground="?selectableItemBackgroundBorderless"
-                    android:padding="@dimen/spacing_xs_large"
+                    android:padding="@dimen/spacing_normal"
                     android:scaleType="centerCrop"
                     android:src="@drawable/ic_minus"/>
 
@@ -150,9 +150,9 @@
                     android:id="@+id/code"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:background="?selectableItemBackgroundBorderless"
                     android:contentDescription="@string/code"
-                    android:foreground="?selectableItemBackgroundBorderless"
-                    android:padding="@dimen/spacing_xs_large"
+                    android:padding="@dimen/spacing_normal"
                     android:scaleType="centerCrop"
                     android:src="@drawable/ic_code"/>
 
@@ -160,9 +160,9 @@
                     android:id="@+id/quote"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:background="?selectableItemBackgroundBorderless"
                     android:contentDescription="@string/quote"
-                    android:foreground="?selectableItemBackgroundBorderless"
-                    android:padding="@dimen/spacing_xs_large"
+                    android:padding="@dimen/spacing_normal"
                     android:scaleType="centerCrop"
                     android:src="@drawable/ic_format_quote"/>
 
@@ -170,9 +170,9 @@
                     android:id="@+id/link"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:background="?selectableItemBackgroundBorderless"
                     android:contentDescription="@string/link"
-                    android:foreground="?selectableItemBackgroundBorderless"
-                    android:padding="@dimen/spacing_xs_large"
+                    android:padding="@dimen/spacing_normal"
                     android:scaleType="centerCrop"
                     android:src="@drawable/ic_insert_link"/>
 
@@ -180,9 +180,9 @@
                     android:id="@+id/image"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:background="?selectableItemBackgroundBorderless"
                     android:contentDescription="@string/image"
-                    android:foreground="?selectableItemBackgroundBorderless"
-                    android:padding="@dimen/spacing_xs_large"
+                    android:padding="@dimen/spacing_normal"
                     android:scaleType="centerCrop"
                     android:src="@drawable/ic_image"/>
             </LinearLayout>
@@ -194,9 +194,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end|center"
+            android:background="?selectableItemBackgroundBorderless"
             android:contentDescription="@string/preview"
-            android:foreground="?selectableItemBackgroundBorderless"
-            android:padding="@dimen/spacing_xs_large"
+            android:padding="@dimen/spacing_normal"
             android:scaleType="centerCrop"
             android:src="@drawable/ic_eye"/>
     </FrameLayout>
diff --git a/app/src/main/res/layouts/main_layouts/layout/gists_pager_layout.xml b/app/src/main/res/layouts/main_layouts/layout/gists_pager_layout.xml
index e78db848..2218bb2f 100644
--- a/app/src/main/res/layouts/main_layouts/layout/gists_pager_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/gists_pager_layout.xml
@@ -36,7 +36,7 @@
                     android:layout_height="match_parent"
                     android:layout_gravity="center|end"
                     android:contentDescription="@string/star"
-                    android:foreground="?selectableItemBackgroundBorderless"
+                    android:background="?selectableItemBackgroundBorderless"
                     android:padding="@dimen/spacing_xs_large"
                     android:scaleType="centerCrop"
                     android:src="@drawable/ic_star"/>
@@ -47,7 +47,7 @@
                     android:layout_height="match_parent"
                     android:layout_gravity="center|end"
                     android:contentDescription="@string/fork"
-                    android:foreground="?selectableItemBackgroundBorderless"
+                    android:background="?selectableItemBackgroundBorderless"
                     android:padding="@dimen/spacing_xs_large"
                     android:scaleType="centerCrop"
                     android:src="@drawable/ic_fork"/>
diff --git a/app/src/main/res/layouts/main_layouts/layout/issue_pager_activity.xml b/app/src/main/res/layouts/main_layouts/layout/issue_pager_activity.xml
index 9693b227..2836dda5 100644
--- a/app/src/main/res/layouts/main_layouts/layout/issue_pager_activity.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/issue_pager_activity.xml
@@ -36,7 +36,7 @@
                     android:layout_height="match_parent"
                     android:layout_gravity="center|end"
                     android:contentDescription="@string/star"
-                    android:foreground="?selectableItemBackgroundBorderless"
+                    android:background="?selectableItemBackgroundBorderless"
                     android:padding="@dimen/spacing_xs_large"
                     android:scaleType="centerCrop"
                     android:src="@drawable/ic_star"/>
@@ -47,7 +47,7 @@
                     android:layout_height="match_parent"
                     android:layout_gravity="center|end"
                     android:contentDescription="@string/fork"
-                    android:foreground="?selectableItemBackgroundBorderless"
+                    android:background="?selectableItemBackgroundBorderless"
                     android:padding="@dimen/spacing_xs_large"
                     android:scaleType="centerCrop"
                     android:src="@drawable/ic_fork"/>
diff --git a/app/src/main/res/layouts/main_layouts/layout/repo_file_header_layout.xml b/app/src/main/res/layouts/main_layouts/layout/repo_file_header_layout.xml
index 37f525e6..bb86fe1d 100644
--- a/app/src/main/res/layouts/main_layouts/layout/repo_file_header_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/repo_file_header_layout.xml
@@ -22,6 +22,7 @@
             android:id="@+id/toParentFolder"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:background="?selectableItemBackgroundBorderless"
             android:layout_gravity="center"
             android:contentDescription="@string/home"
             android:padding="@dimen/spacing_normal"
diff --git a/app/src/main/res/layouts/main_layouts/layout/search_layout.xml b/app/src/main/res/layouts/main_layouts/layout/search_layout.xml
index fa3cefeb..52d6020a 100644
--- a/app/src/main/res/layouts/main_layouts/layout/search_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/search_layout.xml
@@ -56,7 +56,7 @@
                         android:layout_height="match_parent"
                         android:layout_gravity="center"
                         android:contentDescription="@string/clear"
-                        android:foreground="?selectableItemBackgroundBorderless"
+                        android:background="?selectableItemBackgroundBorderless"
                         android:paddingBottom="@dimen/spacing_xs_large"
                         android:paddingEnd="@dimen/spacing_xs_large"
                         android:paddingStart="@dimen/spacing_xs_large"
diff --git a/app/src/main/res/layouts/other_layouts/layout/appbar_search_elevation.xml b/app/src/main/res/layouts/other_layouts/layout/appbar_search_elevation.xml
index 66f77ce6..107d8418 100644
--- a/app/src/main/res/layouts/other_layouts/layout/appbar_search_elevation.xml
+++ b/app/src/main/res/layouts/other_layouts/layout/appbar_search_elevation.xml
@@ -31,7 +31,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="center"
-            android:foreground="?selectableItemBackgroundBorderless"
+            android:background="?selectableItemBackgroundBorderless"
             android:scaleType="centerCrop"
             android:padding="@dimen/spacing_xs_large"
             android:src="@drawable/ic_search"/>
@@ -57,7 +57,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="center"
-            android:foreground="?selectableItemBackgroundBorderless"
+            android:background="?selectableItemBackgroundBorderless"
             android:scaleType="centerCrop"
             android:src="@drawable/ic_clear"
             tools:visibility="visible"
diff --git a/app/src/main/res/layouts/other_layouts/layout/simple_footer_list_dialog.xml b/app/src/main/res/layouts/other_layouts/layout/simple_footer_list_dialog.xml
index 0c7d0d23..9b374414 100644
--- a/app/src/main/res/layouts/other_layouts/layout/simple_footer_list_dialog.xml
+++ b/app/src/main/res/layouts/other_layouts/layout/simple_footer_list_dialog.xml
@@ -26,7 +26,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:contentDescription="@string/back"
-                android:foreground="?selectableItemBackgroundBorderless"
+                android:background="?selectableItemBackgroundBorderless"
                 android:padding="@dimen/spacing_normal"
                 android:scaleType="centerCrop"
                 android:src="@drawable/ic_clear"/>
@@ -48,7 +48,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:contentDescription="@string/done"
-                android:foreground="?selectableItemBackgroundBorderless"
+                android:background="?selectableItemBackgroundBorderless"
                 android:padding="@dimen/spacing_normal"
                 android:scaleType="centerCrop"
                 android:src="@drawable/ic_done"/>
diff --git a/app/src/main/res/layouts/row_layouts/layout/releases_row_item.xml b/app/src/main/res/layouts/row_layouts/layout/releases_row_item.xml
index b7175d78..a75c320f 100644
--- a/app/src/main/res/layouts/row_layouts/layout/releases_row_item.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/releases_row_item.xml
@@ -63,7 +63,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:foreground="?selectableItemBackgroundBorderless"
+                    android:background="?selectableItemBackgroundBorderless"
                     android:padding="@dimen/spacing_normal"
                     android:scaleType="centerCrop"
                     android:src="@drawable/ic_download"/>
diff --git a/app/src/main/res/layouts/row_layouts/layout/repo_files_row_item.xml b/app/src/main/res/layouts/row_layouts/layout/repo_files_row_item.xml
index bf8f3bbc..864f6394 100644
--- a/app/src/main/res/layouts/row_layouts/layout/repo_files_row_item.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/repo_files_row_item.xml
@@ -23,6 +23,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:background="?selectableItemBackgroundBorderless"
             android:contentDescription="@string/file"
             android:padding="@dimen/spacing_normal"
             tools:src="@drawable/ic_file_document"/>
@@ -41,8 +42,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/spacing_xs_large"
                 android:layout_marginStart="@dimen/spacing_xs_large"
-                android:maxLines="3"
                 android:ellipsize="end"
+                android:maxLines="3"
                 android:textColor="@color/primary_text"
                 tools:text="File Name"/>
 
@@ -62,8 +63,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:background="?selectableItemBackgroundBorderless"
             android:contentDescription="@string/file_menu"
-            android:foreground="?selectableItemBackgroundBorderless"
             android:padding="@dimen/spacing_normal"
             android:scaleType="centerCrop"
             android:src="@drawable/ic_overflow"/>