diff --git a/app/src/main/java/com/github/libretube/api/ResettableLazy.kt b/app/src/main/java/com/github/libretube/api/ResettableLazy.kt
index 129e27de6..432dff009 100644
--- a/app/src/main/java/com/github/libretube/api/ResettableLazy.kt
+++ b/app/src/main/java/com/github/libretube/api/ResettableLazy.kt
@@ -1,7 +1,7 @@
 package com.github.libretube.util
 
-import java.util.*
 import kotlin.reflect.KProperty
+import java.util.*
 
 class ResettableLazyManager {
     // we synchronize to make sure the timing of a reset() call and new inits do not collide
diff --git a/app/src/main/java/com/github/libretube/dialogs/AddToPlaylistDialog.kt b/app/src/main/java/com/github/libretube/dialogs/AddToPlaylistDialog.kt
index 6d840997e..29511a227 100644
--- a/app/src/main/java/com/github/libretube/dialogs/AddToPlaylistDialog.kt
+++ b/app/src/main/java/com/github/libretube/dialogs/AddToPlaylistDialog.kt
@@ -72,7 +72,8 @@ class AddToPlaylistDialog : DialogFragment() {
                     if (viewModel.lastSelectedPlaylistId != null) {
                         var selectionIndex = 0
                         response.forEachIndexed { index, playlist ->
-                            if (playlist.id == viewModel.lastSelectedPlaylistId) selectionIndex = index
+                            if (playlist.id == viewModel.lastSelectedPlaylistId) selectionIndex =
+                                index
                         }
                         binding.playlistsSpinner.setSelection(selectionIndex)
                     }
diff --git a/app/src/main/java/com/github/libretube/fragments/LibraryFragment.kt b/app/src/main/java/com/github/libretube/fragments/LibraryFragment.kt
index 8df79aa2f..0db99547b 100644
--- a/app/src/main/java/com/github/libretube/fragments/LibraryFragment.kt
+++ b/app/src/main/java/com/github/libretube/fragments/LibraryFragment.kt
@@ -68,8 +68,12 @@ class LibraryFragment : BaseFragment() {
         }
 
         if (token != "") {
+            binding.boogh.setImageResource(R.drawable.ic_list)
+            binding.textLike.text = getString(R.string.emptyList)
+
             binding.loginOrRegister.visibility = View.GONE
             fetchPlaylists()
+
             binding.playlistRefresh.isEnabled = true
             binding.playlistRefresh.setOnRefreshListener {
                 fetchPlaylists()
@@ -123,7 +127,6 @@ class LibraryFragment : BaseFragment() {
                     playlistsAdapter.registerAdapterDataObserver(object :
                             RecyclerView.AdapterDataObserver() {
                             override fun onChanged() {
-                                Log.e(TAG(), playlistsAdapter.itemCount.toString())
                                 if (playlistsAdapter.itemCount == 0) {
                                     binding.loginOrRegister.visibility = View.VISIBLE
                                 }
@@ -135,8 +138,6 @@ class LibraryFragment : BaseFragment() {
                 } else {
                     runOnUiThread {
                         binding.loginOrRegister.visibility = View.VISIBLE
-                        binding.boogh.setImageResource(R.drawable.ic_list)
-                        binding.textLike.text = getString(R.string.emptyList)
                     }
                 }
             }
diff --git a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
index 95fdbb90b..bd3dc3f4f 100644
--- a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
@@ -95,6 +95,7 @@ import com.google.android.exoplayer2.upstream.DefaultHttpDataSource
 import com.google.android.exoplayer2.util.RepeatModeUtil
 import com.google.android.exoplayer2.video.VideoSize
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import kotlin.math.abs
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -102,7 +103,6 @@ import org.chromium.net.CronetEngine
 import retrofit2.HttpException
 import java.io.IOException
 import java.util.concurrent.Executors
-import kotlin.math.abs
 
 class PlayerFragment : BaseFragment() {
 
diff --git a/app/src/main/res/layout/channel_row.xml b/app/src/main/res/layout/channel_row.xml
index 702c892d0..72e496255 100644
--- a/app/src/main/res/layout/channel_row.xml
+++ b/app/src/main/res/layout/channel_row.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="16dp"
-    android:background="?android:attr/selectableItemBackground"
-    android:orientation="horizontal">
+    style="@style/ItemRow">
 
     <de.hdodenhof.circleimageview.CircleImageView
         android:id="@+id/search_channel_image"
diff --git a/app/src/main/res/layout/channel_subscription_row.xml b/app/src/main/res/layout/channel_subscription_row.xml
index 7959fbefa..149a38dd5 100644
--- a/app/src/main/res/layout/channel_subscription_row.xml
+++ b/app/src/main/res/layout/channel_subscription_row.xml
@@ -4,11 +4,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="8dp"
-    android:layout_marginTop="4dp"
-    android:layout_marginRight="8dp"
-    android:layout_marginBottom="4dp"
-    android:background="?android:attr/selectableItemBackground">
+    android:background="?android:attr/selectableItemBackground"
+    android:paddingHorizontal="8dp"
+    android:paddingVertical="4dp">
 
     <de.hdodenhof.circleimageview.CircleImageView
         android:id="@+id/subscription_channel_image"
diff --git a/app/src/main/res/layout/fragment_search_result.xml b/app/src/main/res/layout/fragment_search_result.xml
index 2b1cd3735..cfb982d23 100644
--- a/app/src/main/res/layout/fragment_search_result.xml
+++ b/app/src/main/res/layout/fragment_search_result.xml
@@ -80,7 +80,7 @@
             android:id="@+id/search_recycler"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="10dp" />
+            android:layout_marginVertical="10dp" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_watch_history.xml b/app/src/main/res/layout/fragment_watch_history.xml
index da62ec3cc..8efd89276 100644
--- a/app/src/main/res/layout/fragment_watch_history.xml
+++ b/app/src/main/res/layout/fragment_watch_history.xml
@@ -30,7 +30,6 @@
         android:id="@+id/watchHistoryRecView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp"
         android:nestedScrollingEnabled="false"
         android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/playlist_row.xml b/app/src/main/res/layout/playlist_row.xml
index 9a69f8594..8b3374adf 100644
--- a/app/src/main/res/layout/playlist_row.xml
+++ b/app/src/main/res/layout/playlist_row.xml
@@ -2,12 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/video_search"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:layout_marginBottom="16dp"
-    android:background="?android:attr/selectableItemBackground">
+    style="@style/ItemRow">
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline"
diff --git a/app/src/main/res/layout/playlist_search_row.xml b/app/src/main/res/layout/playlist_search_row.xml
index 7c8625c95..f5b4bbd83 100644
--- a/app/src/main/res/layout/playlist_search_row.xml
+++ b/app/src/main/res/layout/playlist_search_row.xml
@@ -2,10 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout 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="wrap_content"
-    android:layout_marginBottom="16dp"
-    android:background="?android:attr/selectableItemBackground">
+    style="@style/ItemRow">
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline"
diff --git a/app/src/main/res/layout/playlists_row.xml b/app/src/main/res/layout/playlists_row.xml
index c7be905ae..ed0450a84 100644
--- a/app/src/main/res/layout/playlists_row.xml
+++ b/app/src/main/res/layout/playlists_row.xml
@@ -3,11 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/playlist"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:layout_marginBottom="16dp"
-    android:background="?android:attr/selectableItemBackground">
+    style="@style/ItemRow">
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline"
diff --git a/app/src/main/res/layout/video_row.xml b/app/src/main/res/layout/video_row.xml
index c94c725c5..b97a197f0 100644
--- a/app/src/main/res/layout/video_row.xml
+++ b/app/src/main/res/layout/video_row.xml
@@ -2,11 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/video_search"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="16dp"
-    android:background="?android:attr/selectableItemBackground">
+    style="@style/ItemRow">
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline"
diff --git a/app/src/main/res/layout/watch_history_row.xml b/app/src/main/res/layout/watch_history_row.xml
index 935836a85..370d13595 100644
--- a/app/src/main/res/layout/watch_history_row.xml
+++ b/app/src/main/res/layout/watch_history_row.xml
@@ -2,11 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/video_search"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="16dp"
-    android:background="?android:attr/selectableItemBackground">
+    style="@style/ItemRow">
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline"
diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml
index 7a478392e..db760efc0 100644
--- a/app/src/main/res/values/style.xml
+++ b/app/src/main/res/values/style.xml
@@ -162,4 +162,17 @@
 
     </style>
 
+    <style name="ItemRow">
+
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:paddingLeft">6dp</item>
+        <item name="android:paddingRight">6dp</item>
+        <item name="android:paddingTop">8dp</item>
+        <item name="android:paddingBottom">8dp</item>
+        <item name="android:background">?attr/selectableItemBackground</item>
+        <item name="android:orientation">horizontal</item>
+
+    </style>
+
 </resources>
\ No newline at end of file