diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 971a2c861..a16a03c53 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }
 
 android {
@@ -29,7 +29,7 @@ android {
         minSdk = 16
         targetSdk = 35
         versionCode = 121
-        versionName = "2.37.0"
+        versionName = "2.37.1"
     }
 
     buildTypes {
diff --git a/app/src/main/java/com/github/andreyasadchy/xtra/ui/follow/games/FollowedGamesAdapter.kt b/app/src/main/java/com/github/andreyasadchy/xtra/ui/follow/games/FollowedGamesAdapter.kt
index e04504a56..966706b93 100644
--- a/app/src/main/java/com/github/andreyasadchy/xtra/ui/follow/games/FollowedGamesAdapter.kt
+++ b/app/src/main/java/com/github/andreyasadchy/xtra/ui/follow/games/FollowedGamesAdapter.kt
@@ -22,6 +22,7 @@ import com.github.andreyasadchy.xtra.ui.games.GamePagerFragmentDirections
 import com.github.andreyasadchy.xtra.ui.games.GamesFragmentDirections
 import com.github.andreyasadchy.xtra.util.C
 import com.github.andreyasadchy.xtra.util.TwitchApiHelper
+import com.github.andreyasadchy.xtra.util.convertDpToPixels
 import com.github.andreyasadchy.xtra.util.gone
 import com.github.andreyasadchy.xtra.util.loadImage
 import com.github.andreyasadchy.xtra.util.prefs
@@ -126,6 +127,8 @@ class FollowedGamesAdapter(
                                     ))
                                 }
                             }
+                            val padding = context.convertDpToPixels(5f)
+                            text.setPadding(padding, 0, padding, 0)
                             tagsLayout.addView(text)
                         }
                         tagsFlowLayout.referencedIds = ids.toIntArray()
diff --git a/app/src/main/java/com/github/andreyasadchy/xtra/ui/games/GamesAdapter.kt b/app/src/main/java/com/github/andreyasadchy/xtra/ui/games/GamesAdapter.kt
index ca0376f59..4277f7d69 100644
--- a/app/src/main/java/com/github/andreyasadchy/xtra/ui/games/GamesAdapter.kt
+++ b/app/src/main/java/com/github/andreyasadchy/xtra/ui/games/GamesAdapter.kt
@@ -18,6 +18,7 @@ import com.github.andreyasadchy.xtra.databinding.FragmentGamesListItemBinding
 import com.github.andreyasadchy.xtra.model.ui.Game
 import com.github.andreyasadchy.xtra.util.C
 import com.github.andreyasadchy.xtra.util.TwitchApiHelper
+import com.github.andreyasadchy.xtra.util.convertDpToPixels
 import com.github.andreyasadchy.xtra.util.gone
 import com.github.andreyasadchy.xtra.util.loadImage
 import com.github.andreyasadchy.xtra.util.prefs
@@ -120,6 +121,8 @@ class GamesAdapter(
                                     ))
                                 }
                             }
+                            val padding = context.convertDpToPixels(5f)
+                            text.setPadding(padding, 0, padding, 0)
                             tagsLayout.addView(text)
                         }
                         tagsFlowLayout.referencedIds = ids.toIntArray()
diff --git a/app/src/main/java/com/github/andreyasadchy/xtra/ui/streams/StreamsAdapter.kt b/app/src/main/java/com/github/andreyasadchy/xtra/ui/streams/StreamsAdapter.kt
index acddec4ad..f40f307ed 100644
--- a/app/src/main/java/com/github/andreyasadchy/xtra/ui/streams/StreamsAdapter.kt
+++ b/app/src/main/java/com/github/andreyasadchy/xtra/ui/streams/StreamsAdapter.kt
@@ -26,6 +26,7 @@ import com.github.andreyasadchy.xtra.ui.main.MainActivity
 import com.github.andreyasadchy.xtra.ui.top.TopFragmentDirections
 import com.github.andreyasadchy.xtra.util.C
 import com.github.andreyasadchy.xtra.util.TwitchApiHelper
+import com.github.andreyasadchy.xtra.util.convertDpToPixels
 import com.github.andreyasadchy.xtra.util.gone
 import com.github.andreyasadchy.xtra.util.loadImage
 import com.github.andreyasadchy.xtra.util.prefs
@@ -187,6 +188,8 @@ class StreamsAdapter(
                                     ))
                                 }
                             }
+                            val padding = context.convertDpToPixels(5f)
+                            text.setPadding(padding, 0, padding, 0)
                             tagsLayout.addView(text)
                         }
                         tagsFlowLayout.referencedIds = ids.toIntArray()
diff --git a/app/src/main/java/com/github/andreyasadchy/xtra/ui/streams/StreamsCompactAdapter.kt b/app/src/main/java/com/github/andreyasadchy/xtra/ui/streams/StreamsCompactAdapter.kt
index 3d7a8e434..fa828cc65 100644
--- a/app/src/main/java/com/github/andreyasadchy/xtra/ui/streams/StreamsCompactAdapter.kt
+++ b/app/src/main/java/com/github/andreyasadchy/xtra/ui/streams/StreamsCompactAdapter.kt
@@ -23,6 +23,7 @@ import com.github.andreyasadchy.xtra.ui.games.GamePagerFragmentDirections
 import com.github.andreyasadchy.xtra.ui.main.MainActivity
 import com.github.andreyasadchy.xtra.util.C
 import com.github.andreyasadchy.xtra.util.TwitchApiHelper
+import com.github.andreyasadchy.xtra.util.convertDpToPixels
 import com.github.andreyasadchy.xtra.util.gone
 import com.github.andreyasadchy.xtra.util.loadImage
 import com.github.andreyasadchy.xtra.util.prefs
@@ -172,6 +173,8 @@ class StreamsCompactAdapter(
                                     tags = arrayOf(tag),
                                 ))
                             }
+                            val padding = context.convertDpToPixels(5f)
+                            text.setPadding(padding, 0, padding, 0)
                             tagsLayout.addView(text)
                         }
                         tagsFlowLayout.referencedIds = ids.toIntArray()
diff --git a/app/src/main/java/com/github/andreyasadchy/xtra/ui/videos/VideosAdapter.kt b/app/src/main/java/com/github/andreyasadchy/xtra/ui/videos/VideosAdapter.kt
index 9c0331d62..7bf42bf2a 100644
--- a/app/src/main/java/com/github/andreyasadchy/xtra/ui/videos/VideosAdapter.kt
+++ b/app/src/main/java/com/github/andreyasadchy/xtra/ui/videos/VideosAdapter.kt
@@ -24,12 +24,13 @@ import com.github.andreyasadchy.xtra.ui.games.GameMediaFragmentDirections
 import com.github.andreyasadchy.xtra.ui.games.GamePagerFragmentDirections
 import com.github.andreyasadchy.xtra.ui.main.MainActivity
 import com.github.andreyasadchy.xtra.util.C
+import com.github.andreyasadchy.xtra.util.FragmentUtils
 import com.github.andreyasadchy.xtra.util.TwitchApiHelper
+import com.github.andreyasadchy.xtra.util.convertDpToPixels
 import com.github.andreyasadchy.xtra.util.gone
 import com.github.andreyasadchy.xtra.util.loadImage
 import com.github.andreyasadchy.xtra.util.prefs
 import com.github.andreyasadchy.xtra.util.visible
-import com.github.andreyasadchy.xtra.util.FragmentUtils
 
 class VideosAdapter(
     private val fragment: Fragment,
@@ -191,6 +192,8 @@ class VideosAdapter(
                                     ))
                                 }
                             }
+                            val padding = context.convertDpToPixels(5f)
+                            text.setPadding(padding, 0, padding, 0)
                             tagsLayout.addView(text)
                         }
                         tagsFlowLayout.referencedIds = ids.toIntArray()
diff --git a/app/src/main/java/com/github/andreyasadchy/xtra/ui/videos/channel/ChannelVideosAdapter.kt b/app/src/main/java/com/github/andreyasadchy/xtra/ui/videos/channel/ChannelVideosAdapter.kt
index 18feefed9..eee22994f 100644
--- a/app/src/main/java/com/github/andreyasadchy/xtra/ui/videos/channel/ChannelVideosAdapter.kt
+++ b/app/src/main/java/com/github/andreyasadchy/xtra/ui/videos/channel/ChannelVideosAdapter.kt
@@ -24,12 +24,13 @@ import com.github.andreyasadchy.xtra.ui.games.GamePagerFragmentDirections
 import com.github.andreyasadchy.xtra.ui.main.MainActivity
 import com.github.andreyasadchy.xtra.ui.videos.BaseVideosAdapter
 import com.github.andreyasadchy.xtra.util.C
+import com.github.andreyasadchy.xtra.util.FragmentUtils
 import com.github.andreyasadchy.xtra.util.TwitchApiHelper
+import com.github.andreyasadchy.xtra.util.convertDpToPixels
 import com.github.andreyasadchy.xtra.util.gone
 import com.github.andreyasadchy.xtra.util.loadImage
 import com.github.andreyasadchy.xtra.util.prefs
 import com.github.andreyasadchy.xtra.util.visible
-import com.github.andreyasadchy.xtra.util.FragmentUtils
 
 class ChannelVideosAdapter(
     private val fragment: Fragment,
@@ -169,6 +170,8 @@ class ChannelVideosAdapter(
                                     ))
                                 }
                             }
+                            val padding = context.convertDpToPixels(5f)
+                            text.setPadding(padding, 0, padding, 0)
                             tagsLayout.addView(text)
                         }
                         tagsFlowLayout.referencedIds = ids.toIntArray()
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a8bf5558b..0446b5fc5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,14 +1,14 @@
 [versions]
-android-gradle-plugin = "8.6.1"
+android-gradle-plugin = "8.7.1"
 apollo = "3.8.5"
 appcompat = "1.7.0"
-checker-qual = "3.47.0"
+checker-qual = "3.48.1"
 coil = "2.7.0"
 constraintlayout = "2.1.4"
 core = "1.13.1"
 coroutines = "1.9.0"
 draglistview = "1.7.3"
-fragment = "1.8.3"
+fragment = "1.8.4"
 glide = "4.16.0"
 glide-webpdecoder = "2.6.4.16.0"
 hilt = "2.52"
@@ -19,7 +19,7 @@ ksp = "2.0.20-1.0.25"
 lifecycle = "2.8.6"
 material = "1.12.0"
 media3 = "1.4.1"
-navigation = "2.8.1"
+navigation = "2.8.2"
 okhttp = "5.0.0-alpha.14"
 okio = "3.9.1"
 paging = "3.3.2"
@@ -28,8 +28,8 @@ retrofit = "2.11.0"
 room = "2.6.1"
 serialization = "1.7.3"
 swiperefreshlayout = "1.1.0"
-webkit = "1.12.0"
-work = "2.10.0-alpha04"
+webkit = "1.12.1"
+work = "2.10.0-beta01"
 
 [libraries]
 apollo-runtime = { module = "com.apollographql.apollo3:apollo-runtime", version.ref = "apollo" }