diff --git a/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueViewModel.kt b/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueViewModel.kt
index a10bc941b..7a701dffa 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueViewModel.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueViewModel.kt
@@ -26,6 +26,7 @@ import org.oxycblt.auxio.playback.state.PlaybackStateManager
 
 /**
  * Class enabling more advanced queue list functionality and queue editing.
+ * TODO: Allow editing previous parts of the queue
  * @author OxygenCobalt
  */
 class QueueViewModel : ViewModel(), PlaybackStateManager.Callback {
diff --git a/app/src/main/java/org/oxycblt/auxio/ui/fastscroll/FastScrollRecyclerView.kt b/app/src/main/java/org/oxycblt/auxio/ui/fastscroll/FastScrollRecyclerView.kt
index f1ba7b2d7..b26f16296 100644
--- a/app/src/main/java/org/oxycblt/auxio/ui/fastscroll/FastScrollRecyclerView.kt
+++ b/app/src/main/java/org/oxycblt/auxio/ui/fastscroll/FastScrollRecyclerView.kt
@@ -526,7 +526,6 @@ constructor(context: Context, attrs: AttributeSet? = null, @AttrRes defStyleAttr
             }
 
     companion object {
-        private const val ANIM_MILLIS = 150L
         private const val AUTO_HIDE_SCROLLBAR_DELAY_MILLIS = 1500
     }
 }
diff --git a/app/src/main/res/layout-h600dp/item_detail.xml b/app/src/main/res/layout-h600dp/item_detail.xml
index b842bc76f..7a10c0ac9 100644
--- a/app/src/main/res/layout-h600dp/item_detail.xml
+++ b/app/src/main/res/layout-h600dp/item_detail.xml
@@ -4,8 +4,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="@dimen/spacing_medium">
-
+    android:paddingTop="@dimen/spacing_medium"
+    android:paddingStart="@dimen/spacing_medium"
+    android:paddingEnd="@dimen/spacing_medium"
+    android:paddingBottom="@dimen/spacing_mid_medium">
     <org.oxycblt.auxio.image.StyledImageView
         android:id="@+id/detail_cover"
         style="@style/Widget.Auxio.Image.Huge"
diff --git a/app/src/main/res/layout-land/item_detail.xml b/app/src/main/res/layout-land/item_detail.xml
index fe28ad216..e95b3c9c8 100644
--- a/app/src/main/res/layout-land/item_detail.xml
+++ b/app/src/main/res/layout-land/item_detail.xml
@@ -4,7 +4,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="@dimen/spacing_medium">
+    android:paddingTop="@dimen/spacing_medium"
+    android:paddingStart="@dimen/spacing_medium"
+    android:paddingEnd="@dimen/spacing_medium"
+    android:paddingBottom="@dimen/spacing_mid_medium">
 
     <org.oxycblt.auxio.image.StyledImageView
         android:id="@+id/detail_cover"
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index 65ddcfd2c..6c99a4f20 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -42,6 +42,7 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
+                    android:paddingBottom="@dimen/spacing_tiny"
                     android:layout_height="match_parent">
 
                     <ImageView
@@ -98,7 +99,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/spacing_medium"
-                        android:layout_marginTop="@dimen/spacing_medium"
+                        android:layout_marginTop="@dimen/spacing_mid_medium"
                         android:text="@string/lbl_version"
                         android:textAppearance="@style/TextAppearance.Auxio.BodyLarge"
                         app:layout_constraintBottom_toTopOf="@+id/about_version"
@@ -115,13 +116,12 @@
                         app:layout_constraintTop_toBottomOf="@+id/about_version_title"
                         tools:text="16.16.16" />
 
-
                     <TextView
                         android:id="@+id/about_code"
                         style="@style/Widget.Auxio.TextView.Icon.Clickable"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/spacing_medium"
+                        android:layout_marginTop="@dimen/spacing_mid_medium"
                         android:text="@string/lbl_code"
                         app:drawableStartCompat="@drawable/ic_code_24"
                         app:layout_constraintBottom_toTopOf="@+id/about_faq"
@@ -174,6 +174,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
+                android:paddingBottom="@dimen/spacing_tiny"
                     android:orientation="vertical">
 
                     <TextView
diff --git a/app/src/main/res/layout/item_album_song.xml b/app/src/main/res/layout/item_album_song.xml
index 005c25303..02880a2cc 100644
--- a/app/src/main/res/layout/item_album_song.xml
+++ b/app/src/main/res/layout/item_album_song.xml
@@ -53,7 +53,7 @@
         style="@style/Widget.Auxio.TextView.Item.Primary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/spacing_small"
+        android:layout_marginEnd="@dimen/spacing_mid_medium"
         android:textColor="@color/sel_selectable_text_primary"
         app:layout_constraintBottom_toTopOf="@+id/song_duration"
         app:layout_constraintEnd_toStartOf="@+id/song_menu"
diff --git a/app/src/main/res/layout/item_detail.xml b/app/src/main/res/layout/item_detail.xml
index 6eb9d6855..73f15620d 100644
--- a/app/src/main/res/layout/item_detail.xml
+++ b/app/src/main/res/layout/item_detail.xml
@@ -5,7 +5,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="@dimen/spacing_medium">
+    android:paddingTop="@dimen/spacing_medium"
+    android:paddingStart="@dimen/spacing_medium"
+    android:paddingEnd="@dimen/spacing_medium"
+    android:paddingBottom="@dimen/spacing_mid_medium">
 
     <org.oxycblt.auxio.image.StyledImageView
         android:id="@+id/detail_cover"
diff --git a/app/src/main/res/layout/item_music_dir.xml b/app/src/main/res/layout/item_music_dir.xml
index aeed696bc..a68bf2fdc 100644
--- a/app/src/main/res/layout/item_music_dir.xml
+++ b/app/src/main/res/layout/item_music_dir.xml
@@ -13,12 +13,10 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/spacing_large"
-        android:layout_marginEnd="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_mid_medium"
         android:layout_weight="1"
         android:gravity="center"
         android:maxLines="@null"
-        android:paddingTop="@dimen/spacing_small"
-        android:paddingBottom="@dimen/spacing_small"
         android:textAppearance="@style/TextAppearance.Auxio.BodyLarge"
         tools:text="primary:path/to/music" />
 
@@ -27,7 +25,7 @@
         style="@style/Widget.Auxio.Button.Icon.Small"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/spacing_mid_medium"
+        android:layout_marginEnd="@dimen/spacing_mid_large"
         android:contentDescription="@string/desc_music_dir_delete"
         app:icon="@drawable/ic_delete_24"
         app:tint="?attr/colorControlNormal" />
diff --git a/app/src/main/res/layout/item_tab.xml b/app/src/main/res/layout/item_tab.xml
index 13bd18e2c..20896521f 100644
--- a/app/src/main/res/layout/item_tab.xml
+++ b/app/src/main/res/layout/item_tab.xml
@@ -8,15 +8,15 @@
     android:clickable="true"
     android:focusable="true"
     android:orientation="horizontal"
-    android:paddingTop="@dimen/spacing_small"
-    android:paddingBottom="@dimen/spacing_small">
+    android:paddingTop="@dimen/spacing_tiny"
+    android:paddingBottom="@dimen/spacing_tiny">
 
     <com.google.android.material.checkbox.MaterialCheckBox
         android:id="@+id/tab_icon"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/spacing_medium"
-        android:layout_marginEnd="@dimen/spacing_tiny"
+        android:layout_marginEnd="@dimen/spacing_mid_medium"
         android:layout_weight="1"
         android:clickable="false"
         android:focusable="false"
@@ -31,7 +31,7 @@
         style="@style/Widget.Auxio.Button.Icon.Small"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/spacing_mid_medium"
+        android:layout_marginEnd="@dimen/spacing_mid_large"
         android:contentDescription="@string/desc_tab_handle"
         app:icon="@drawable/ic_handle_24" />
 
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 6d9be19b9..d803852f4 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -258,6 +258,7 @@
     <plurals name="fmt_artist_count">
         <item quantity="one">%d umělec</item>
         <item quantity="few">%d umělci</item>
+        <item quantity="many">%d umělců</item>
         <item quantity="other">%d umělců</item>
     </plurals>
     <string name="err_did_not_wipe">Nepodařilo se vymazat stav</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 64bb49892..285025058 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -74,7 +74,7 @@
     <string name="set_content">Contenido</string>
     <string name="set_save_state">Guardar estado de reproducción</string>
     <string name="set_save_desc">Guardar el estado de reproduccion ahora</string>
-    <string name="set_reindex">Actualizar musica</string>
+    <string name="set_reindex">Actualizar música</string>
     <string name="set_reindex_desc">Recargar la biblioteca musical, utilizando las etiquetas en caché cuando sea posible</string>
     <!-- Error Namespace | Error Labels -->
     <string name="err_no_music">Sin música</string>
@@ -129,12 +129,10 @@
     <string name="fmt_lib_song_count">Canciones cargadas: %d</string>
     <plurals name="fmt_song_count">
         <item quantity="one">%d canción</item>
-        <item quantity="many">%d canciones</item>
         <item quantity="other">%d canciones</item>
     </plurals>
     <plurals name="fmt_album_count">
         <item quantity="one">%d álbum</item>
-        <item quantity="many">%d álbumes</item>
         <item quantity="other">%d álbumes</item>
     </plurals>
     <string name="lbl_size">Tamaño</string>
@@ -252,7 +250,6 @@
     <string name="set_hide_collaborators">Ocultar colaboradores</string>
     <plurals name="fmt_artist_count">
         <item quantity="one">%d artista</item>
-        <item quantity="many">%d artistas</item>
         <item quantity="other">%d artistas</item>
     </plurals>
     <string name="err_did_not_save">Imposible guardar el estado</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 482af7eb6..e22f007e8 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -136,12 +136,10 @@
     <string name="fmt_lib_total_duration">Durata totale: %s</string>
     <plurals name="fmt_song_count">
         <item quantity="one">%d canzone</item>
-        <item quantity="many">%d canzoni</item>
         <item quantity="other">%d canzoni</item>
     </plurals>
     <plurals name="fmt_album_count">
         <item quantity="one">%d disco</item>
-        <item quantity="many">%d dischi</item>
         <item quantity="other">%d dischi</item>
     </plurals>
     <string name="set_dirs_mode">Modo</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index ae627a653..5b3027ff1 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -97,6 +97,7 @@
     <plurals name="fmt_album_count">
         <item quantity="one">%d albumas</item>
         <item quantity="few">%d albumai</item>
+        <item quantity="many">%d albumų</item>
         <item quantity="other">%d albumų</item>
     </plurals>
     <string name="lbl_remix_group">Remiksai</string>
@@ -107,6 +108,7 @@
     <plurals name="fmt_song_count">
         <item quantity="one">%d daina</item>
         <item quantity="few">%d dainos</item>
+        <item quantity="many">%d albumų</item>
         <item quantity="other">%d dainų</item>
     </plurals>
     <string name="clr_dynamic">Dinaminis</string>
@@ -246,6 +248,7 @@
     <plurals name="fmt_artist_count">
         <item quantity="one">%d atlikėjas</item>
         <item quantity="few">%d atlikėjai</item>
+        <item quantity="many">%d albumų</item>
         <item quantity="other">%d atlikėjų</item>
     </plurals>
     <string name="set_rescan">Perskenuoti muziką</string>
diff --git a/app/src/main/res/values/styles_ui.xml b/app/src/main/res/values/styles_ui.xml
index e5f822760..b189acd93 100644
--- a/app/src/main/res/values/styles_ui.xml
+++ b/app/src/main/res/values/styles_ui.xml
@@ -177,7 +177,10 @@
 
     <style name="Widget.Auxio.TextView.Icon" parent="Widget.Auxio.TextView.Base">
         <item name="android:drawablePadding">@dimen/spacing_medium</item>
-        <item name="android:padding">@dimen/spacing_medium</item>
+        <item name="android:paddingTop">@dimen/spacing_mid_medium</item>
+        <item name="android:paddingStart">@dimen/spacing_medium</item>
+        <item name="android:paddingBottom">@dimen/spacing_mid_medium</item>
+        <item name="android:paddingEnd">@dimen/spacing_medium</item>
         <item name="android:textAppearance">@style/TextAppearance.Auxio.BodyLarge</item>
     </style>