diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b5efba744..3081a7847 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -24,13 +24,15 @@
         <activity
             android:name=".util.Player"
             android:configChanges="orientation|screenSize"
-            android:exported="false"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+            android:exported="false" />
         <activity
-            android:name=".SettingsActivity"
+            android:name=".activities.NoInternetActivity"
+            android:label="@string/noInternet"/>
+        <activity
+            android:name=".activities.SettingsActivity"
             android:label="@string/settings" />
         <activity
-            android:name=".MainActivity"
+            android:name=".activities.MainActivity"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
             android:exported="true"
             android:hardwareAccelerated="true"
@@ -53,7 +55,7 @@
             android:label="@string/app_name"
             android:roundIcon="@mipmap/ic_gradient_round"
             android:supportsPictureInPicture="true"
-            android:targetActivity=".MainActivity">
+            android:targetActivity=".activities.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -70,7 +72,7 @@
             android:label="@string/app_name"
             android:roundIcon="@mipmap/ic_fire_round"
             android:supportsPictureInPicture="true"
-            android:targetActivity=".MainActivity">
+            android:targetActivity=".activities.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -87,7 +89,7 @@
             android:label="@string/app_name"
             android:roundIcon="@mipmap/ic_flame_round"
             android:supportsPictureInPicture="true"
-            android:targetActivity=".MainActivity">
+            android:targetActivity=".activities.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -104,7 +106,7 @@
             android:label="@string/app_name"
             android:roundIcon="@mipmap/ic_shaped_round"
             android:supportsPictureInPicture="true"
-            android:targetActivity=".MainActivity">
+            android:targetActivity=".activities.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -121,7 +123,7 @@
             android:label="@string/app_name"
             android:roundIcon="@mipmap/ic_torch_round"
             android:supportsPictureInPicture="true"
-            android:targetActivity=".MainActivity">
+            android:targetActivity=".activities.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -138,7 +140,7 @@
             android:label="@string/app_name"
             android:roundIcon="@mipmap/ic_legacy_round"
             android:supportsPictureInPicture="true"
-            android:targetActivity=".MainActivity">
+            android:targetActivity=".activities.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -155,7 +157,7 @@
             android:label="@string/app_name"
             android:roundIcon="@mipmap/ic_bird_round"
             android:supportsPictureInPicture="true"
-            android:targetActivity=".MainActivity">
+            android:targetActivity=".activities.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -163,7 +165,7 @@
         </activity-alias>
 
         <activity
-            android:name=".RouterActivity"
+            android:name=".activities.RouterActivity"
             android:exported="true"
             android:launchMode="singleInstance">
             <intent-filter>
diff --git a/app/src/main/java/com/github/libretube/MainActivity.kt b/app/src/main/java/com/github/libretube/activities/MainActivity.kt
similarity index 95%
rename from app/src/main/java/com/github/libretube/MainActivity.kt
rename to app/src/main/java/com/github/libretube/activities/MainActivity.kt
index 459bb8d4a..e47cc3605 100644
--- a/app/src/main/java/com/github/libretube/MainActivity.kt
+++ b/app/src/main/java/com/github/libretube/activities/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.github.libretube
+package com.github.libretube.activities
 
 import android.app.Activity
 import android.content.Context
@@ -19,11 +19,8 @@ import android.view.WindowInsets
 import android.view.WindowInsetsController
 import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
-import android.widget.Button
-import android.widget.ImageView
 import android.widget.LinearLayout
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.Toolbar
 import androidx.constraintlayout.motion.widget.MotionLayout
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.os.bundleOf
@@ -32,6 +29,7 @@ import androidx.fragment.app.Fragment
 import androidx.navigation.NavController
 import androidx.navigation.findNavController
 import androidx.navigation.ui.setupWithNavController
+import com.github.libretube.R
 import com.github.libretube.databinding.ActivityMainBinding
 import com.github.libretube.fragments.PlayerFragment
 import com.github.libretube.fragments.isFullScreen
@@ -50,7 +48,6 @@ class MainActivity : AppCompatActivity() {
     lateinit var binding: ActivityMainBinding
 
     private lateinit var bottomNavigationView: BottomNavigationView
-    private lateinit var toolbar: Toolbar
     lateinit var navController: NavController
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -70,14 +67,8 @@ class MainActivity : AppCompatActivity() {
 
         // show noInternet Activity if no internet available on app startup
         if (!isNetworkAvailable(this)) {
-            setContentView(R.layout.activity_nointernet)
-            findViewById<Button>(R.id.retry_button).setOnClickListener {
-                recreate()
-            }
-            findViewById<ImageView>(R.id.noInternet_settingsImageView).setOnClickListener {
-                val intent = Intent(this, SettingsActivity::class.java)
-                startActivity(intent)
-            }
+            val noInternetIntent = Intent(this, NoInternetActivity::class.java)
+            startActivity(noInternetIntent)
         } else {
             binding = ActivityMainBinding.inflate(layoutInflater)
             setContentView(binding.root)
@@ -286,7 +277,6 @@ class MainActivity : AppCompatActivity() {
                 navController.popBackStack()
             }
         } catch (e: Exception) {
-            // try catch to prevent nointernet activity to crash
             try {
                 navController.popBackStack()
                 moveTaskToBack(true)
@@ -364,10 +354,6 @@ fun Fragment.hideKeyboard() {
     view?.let { activity?.hideKeyboard(it) }
 }
 
-fun Activity.hideKeyboard() {
-    hideKeyboard(currentFocus ?: View(this))
-}
-
 fun Context.hideKeyboard(view: View) {
     val inputMethodManager = getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager
     inputMethodManager.hideSoftInputFromWindow(view.windowToken, 0)
diff --git a/app/src/main/java/com/github/libretube/activities/NoInternetActivity.kt b/app/src/main/java/com/github/libretube/activities/NoInternetActivity.kt
new file mode 100644
index 000000000..cc2dcbe5a
--- /dev/null
+++ b/app/src/main/java/com/github/libretube/activities/NoInternetActivity.kt
@@ -0,0 +1,31 @@
+package com.github.libretube.activities
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import com.github.libretube.databinding.ActivityNointernetBinding
+import com.github.libretube.util.ThemeHelper
+import com.google.android.material.color.DynamicColors
+
+class NoInternetActivity : AppCompatActivity() {
+    private lateinit var binding: ActivityNointernetBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        DynamicColors.applyToActivityIfAvailable(this)
+        super.onCreate(savedInstanceState)
+        binding = ActivityNointernetBinding.inflate(layoutInflater)
+        binding.retryButton.setOnClickListener {
+            ThemeHelper.restartMainActivity(this)
+        }
+        binding.noInternetSettingsImageView.setOnClickListener {
+            val intent = Intent(this, SettingsActivity::class.java)
+            startActivity(intent)
+        }
+        setContentView(binding.root)
+    }
+
+    override fun onBackPressed() {
+        finishAffinity()
+        super.onBackPressed()
+    }
+}
diff --git a/app/src/main/java/com/github/libretube/RouterActivity.kt b/app/src/main/java/com/github/libretube/activities/RouterActivity.kt
similarity index 96%
rename from app/src/main/java/com/github/libretube/RouterActivity.kt
rename to app/src/main/java/com/github/libretube/activities/RouterActivity.kt
index 3033fcfbb..a90e218da 100644
--- a/app/src/main/java/com/github/libretube/RouterActivity.kt
+++ b/app/src/main/java/com/github/libretube/activities/RouterActivity.kt
@@ -1,4 +1,4 @@
-package com.github.libretube
+package com.github.libretube.activities
 
 import android.content.Intent
 import android.content.pm.PackageManager
@@ -6,6 +6,7 @@ import android.net.Uri
 import android.os.Bundle
 import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
+import com.github.libretube.R
 import com.github.libretube.util.ThemeHelper
 
 class RouterActivity : AppCompatActivity() {
diff --git a/app/src/main/java/com/github/libretube/SettingsActivity.kt b/app/src/main/java/com/github/libretube/activities/SettingsActivity.kt
similarity index 97%
rename from app/src/main/java/com/github/libretube/SettingsActivity.kt
rename to app/src/main/java/com/github/libretube/activities/SettingsActivity.kt
index d091b6d20..db89c7dd7 100644
--- a/app/src/main/java/com/github/libretube/SettingsActivity.kt
+++ b/app/src/main/java/com/github/libretube/activities/SettingsActivity.kt
@@ -1,10 +1,11 @@
-package com.github.libretube
+package com.github.libretube.activities
 
 import android.app.NotificationManager
 import android.os.Build
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
+import com.github.libretube.R
 import com.github.libretube.databinding.ActivitySettingsBinding
 import com.github.libretube.preferences.MainSettings
 import com.github.libretube.util.ThemeHelper
diff --git a/app/src/main/java/com/github/libretube/adapters/CommentsAdapter.kt b/app/src/main/java/com/github/libretube/adapters/CommentsAdapter.kt
index 200aae14c..b66c0a207 100644
--- a/app/src/main/java/com/github/libretube/adapters/CommentsAdapter.kt
+++ b/app/src/main/java/com/github/libretube/adapters/CommentsAdapter.kt
@@ -9,8 +9,8 @@ import androidx.constraintlayout.motion.widget.MotionLayout
 import androidx.core.os.bundleOf
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.github.libretube.MainActivity
 import com.github.libretube.R
+import com.github.libretube.activities.MainActivity
 import com.github.libretube.databinding.CommentsRowBinding
 import com.github.libretube.obj.Comment
 import com.github.libretube.obj.CommentsPage
diff --git a/app/src/main/java/com/github/libretube/adapters/PlaylistsAdapter.kt b/app/src/main/java/com/github/libretube/adapters/PlaylistsAdapter.kt
index 49a2fa274..94a9dea29 100644
--- a/app/src/main/java/com/github/libretube/adapters/PlaylistsAdapter.kt
+++ b/app/src/main/java/com/github/libretube/adapters/PlaylistsAdapter.kt
@@ -7,8 +7,8 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.os.bundleOf
 import androidx.recyclerview.widget.RecyclerView
-import com.github.libretube.MainActivity
 import com.github.libretube.R
+import com.github.libretube.activities.MainActivity
 import com.github.libretube.databinding.PlaylistsRowBinding
 import com.github.libretube.obj.PlaylistId
 import com.github.libretube.obj.Playlists
diff --git a/app/src/main/java/com/github/libretube/adapters/RepliesAdapter.kt b/app/src/main/java/com/github/libretube/adapters/RepliesAdapter.kt
index edbdca36a..534ae0267 100644
--- a/app/src/main/java/com/github/libretube/adapters/RepliesAdapter.kt
+++ b/app/src/main/java/com/github/libretube/adapters/RepliesAdapter.kt
@@ -6,8 +6,8 @@ import android.view.ViewGroup
 import androidx.constraintlayout.motion.widget.MotionLayout
 import androidx.core.os.bundleOf
 import androidx.recyclerview.widget.RecyclerView
-import com.github.libretube.MainActivity
 import com.github.libretube.R
+import com.github.libretube.activities.MainActivity
 import com.github.libretube.databinding.RepliesRowBinding
 import com.github.libretube.obj.Comment
 import com.github.libretube.util.formatShort
diff --git a/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt b/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt
index d7a8d465d..3706143eb 100644
--- a/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt
+++ b/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt
@@ -11,8 +11,11 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.os.bundleOf
 import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.RecyclerView
-import com.github.libretube.MainActivity
 import com.github.libretube.R
+import com.github.libretube.activities.MainActivity
+import com.github.libretube.databinding.ChannelSearchRowBinding
+import com.github.libretube.databinding.PlaylistSearchRowBinding
+import com.github.libretube.databinding.VideoSearchRowBinding
 import com.github.libretube.dialogs.PlaylistOptionsDialog
 import com.github.libretube.dialogs.VideoOptionsDialog
 import com.github.libretube.fragments.PlayerFragment
@@ -37,15 +40,15 @@ class SearchAdapter(
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SearchViewHolder {
-        val layout = when (viewType) {
-            0 -> R.layout.video_search_row
-            1 -> R.layout.channel_search_row
-            2 -> R.layout.playlist_search_row
+        val layoutInflater = LayoutInflater.from(parent.context)
+
+        val binding = when (viewType) {
+            0 -> VideoSearchRowBinding.inflate(layoutInflater, parent, false)
+            1 -> ChannelSearchRowBinding.inflate(layoutInflater, parent, false)
+            2 -> PlaylistSearchRowBinding.inflate(layoutInflater, parent, false)
             else -> throw IllegalArgumentException("Invalid type")
         }
-        val layoutInflater = LayoutInflater.from(parent.context)
-        val cell = layoutInflater.inflate(layout, parent, false)
-        return SearchViewHolder(cell, childFragmentManager)
+        return SearchViewHolder(binding.root, childFragmentManager)
     }
 
     override fun onBindViewHolder(holder: SearchViewHolder, position: Int) {
diff --git a/app/src/main/java/com/github/libretube/adapters/SubscriptionAdapter.kt b/app/src/main/java/com/github/libretube/adapters/SubscriptionAdapter.kt
index 7462b580f..a0813914c 100644
--- a/app/src/main/java/com/github/libretube/adapters/SubscriptionAdapter.kt
+++ b/app/src/main/java/com/github/libretube/adapters/SubscriptionAdapter.kt
@@ -10,8 +10,8 @@ import androidx.constraintlayout.motion.widget.MotionLayout
 import androidx.core.os.bundleOf
 import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.RecyclerView
-import com.github.libretube.MainActivity
 import com.github.libretube.R
+import com.github.libretube.activities.MainActivity
 import com.github.libretube.databinding.TrendingRowBinding
 import com.github.libretube.dialogs.VideoOptionsDialog
 import com.github.libretube.fragments.PlayerFragment
diff --git a/app/src/main/java/com/github/libretube/adapters/SubscriptionChannelAdapter.kt b/app/src/main/java/com/github/libretube/adapters/SubscriptionChannelAdapter.kt
index 6a4586ff6..de1e78664 100644
--- a/app/src/main/java/com/github/libretube/adapters/SubscriptionChannelAdapter.kt
+++ b/app/src/main/java/com/github/libretube/adapters/SubscriptionChannelAdapter.kt
@@ -7,8 +7,8 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.os.bundleOf
 import androidx.recyclerview.widget.RecyclerView
-import com.github.libretube.MainActivity
 import com.github.libretube.R
+import com.github.libretube.activities.MainActivity
 import com.github.libretube.databinding.ChannelSubscriptionRowBinding
 import com.github.libretube.obj.Subscribe
 import com.github.libretube.obj.Subscription
diff --git a/app/src/main/java/com/github/libretube/adapters/TrendingAdapter.kt b/app/src/main/java/com/github/libretube/adapters/TrendingAdapter.kt
index f79a21cce..7baaf336e 100644
--- a/app/src/main/java/com/github/libretube/adapters/TrendingAdapter.kt
+++ b/app/src/main/java/com/github/libretube/adapters/TrendingAdapter.kt
@@ -10,8 +10,8 @@ import androidx.constraintlayout.motion.widget.MotionLayout
 import androidx.core.os.bundleOf
 import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.RecyclerView
-import com.github.libretube.MainActivity
 import com.github.libretube.R
+import com.github.libretube.activities.MainActivity
 import com.github.libretube.databinding.TrendingRowBinding
 import com.github.libretube.dialogs.VideoOptionsDialog
 import com.github.libretube.fragments.PlayerFragment
diff --git a/app/src/main/java/com/github/libretube/dialogs/DeleteAccountDialog.kt b/app/src/main/java/com/github/libretube/dialogs/DeleteAccountDialog.kt
index d815c490d..f8f62cc86 100644
--- a/app/src/main/java/com/github/libretube/dialogs/DeleteAccountDialog.kt
+++ b/app/src/main/java/com/github/libretube/dialogs/DeleteAccountDialog.kt
@@ -9,9 +9,9 @@ import androidx.core.text.HtmlCompat
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
 import com.github.libretube.R
+import com.github.libretube.activities.requireMainActivityRestart
 import com.github.libretube.databinding.DialogDeleteAccountBinding
 import com.github.libretube.obj.DeleteUserRequest
-import com.github.libretube.requireMainActivityRestart
 import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.RetrofitInstance
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
diff --git a/app/src/main/java/com/github/libretube/dialogs/DownloadDialog.kt b/app/src/main/java/com/github/libretube/dialogs/DownloadDialog.kt
index 3c5cc2677..394ed4b6a 100644
--- a/app/src/main/java/com/github/libretube/dialogs/DownloadDialog.kt
+++ b/app/src/main/java/com/github/libretube/dialogs/DownloadDialog.kt
@@ -13,8 +13,8 @@ import android.widget.ArrayAdapter
 import androidx.core.app.ActivityCompat
 import androidx.core.text.HtmlCompat
 import androidx.fragment.app.DialogFragment
-import com.github.libretube.MainActivity
 import com.github.libretube.R
+import com.github.libretube.activities.MainActivity
 import com.github.libretube.databinding.DialogDownloadBinding
 import com.github.libretube.obj.Streams
 import com.github.libretube.services.DownloadService
diff --git a/app/src/main/java/com/github/libretube/dialogs/VideoOptionsDialog.kt b/app/src/main/java/com/github/libretube/dialogs/VideoOptionsDialog.kt
index da87f5551..db6eb4948 100644
--- a/app/src/main/java/com/github/libretube/dialogs/VideoOptionsDialog.kt
+++ b/app/src/main/java/com/github/libretube/dialogs/VideoOptionsDialog.kt
@@ -6,8 +6,8 @@ import android.os.Bundle
 import android.widget.ArrayAdapter
 import android.widget.Toast
 import androidx.fragment.app.DialogFragment
-import com.github.libretube.BackgroundMode
 import com.github.libretube.R
+import com.github.libretube.util.BackgroundMode
 import com.github.libretube.util.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
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 6e7b0186e..e2575af2c 100644
--- a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
@@ -19,11 +19,6 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
-import android.widget.FrameLayout
-import android.widget.ImageButton
-import android.widget.LinearLayout
-import android.widget.TextView
 import android.widget.Toast
 import androidx.constraintlayout.motion.widget.MotionLayout
 import androidx.core.net.toUri
@@ -33,8 +28,9 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.github.libretube.MainActivity
 import com.github.libretube.R
+import com.github.libretube.activities.MainActivity
+import com.github.libretube.activities.hideKeyboard
 import com.github.libretube.adapters.ChaptersAdapter
 import com.github.libretube.adapters.CommentsAdapter
 import com.github.libretube.adapters.TrendingAdapter
@@ -42,7 +38,6 @@ import com.github.libretube.databinding.FragmentPlayerBinding
 import com.github.libretube.dialogs.AddtoPlaylistDialog
 import com.github.libretube.dialogs.DownloadDialog
 import com.github.libretube.dialogs.ShareDialog
-import com.github.libretube.hideKeyboard
 import com.github.libretube.obj.ChapterSegment
 import com.github.libretube.obj.PipedStream
 import com.github.libretube.obj.Playlist
@@ -80,7 +75,6 @@ import com.google.android.exoplayer2.upstream.DefaultDataSource
 import com.google.android.exoplayer2.upstream.DefaultHttpDataSource
 import com.google.android.exoplayer2.util.RepeatModeUtil
 import com.google.android.material.button.MaterialButton
-import com.google.android.material.card.MaterialCardView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.squareup.picasso.Picasso
 import kotlinx.coroutines.CoroutineScope
@@ -233,7 +227,7 @@ class PlayerFragment : Fragment() {
                 .remove(this)
                 .commit()
         }
-        view.findViewById<ImageButton>(R.id.close_imageButton).setOnClickListener {
+        binding.player.binding.closeImageButton.setOnClickListener {
             isMiniPlayerVisible = false
             binding.playerMotionLayout.transitionToEnd()
             val mainActivity = activity as MainActivity
@@ -261,13 +255,12 @@ class PlayerFragment : Fragment() {
                 if (binding.descLinLayout.isVisible) View.GONE else View.VISIBLE
         }
 
-        view.findViewById<MaterialCardView>(R.id.comments_toggle)
-            .setOnClickListener {
-                toggleComments()
-            }
+        binding.commentsToggle.setOnClickListener {
+            toggleComments()
+        }
 
-        val fullScreenButton = view.findViewById<ImageButton>(R.id.fullscreen)
-        val exoTitle = view.findViewById<TextView>(R.id.exo_title)
+        val fullScreenButton = binding.player.binding.fullscreen
+        val exoTitle = binding.player.binding.exoTitle
 
         // FullScreen button trigger
         fullScreenButton.setOnClickListener {
@@ -303,7 +296,8 @@ class PlayerFragment : Fragment() {
         }
 
         // switching between original aspect ratio (black bars) and zoomed to fill device screen
-        view.findViewById<ImageButton>(R.id.aspect_ratio_button).setOnClickListener {
+        val aspectRatioButton = binding.player.binding.aspectRatioButton
+        aspectRatioButton.setOnClickListener {
             if (isZoomed) {
                 exoPlayerView.resizeMode = AspectRatioFrameLayout.RESIZE_MODE_FIT
                 isZoomed = false
@@ -314,7 +308,7 @@ class PlayerFragment : Fragment() {
         }
 
         // lock and unlock the player
-        val lockPlayerButton = view.findViewById<ImageButton>(R.id.lock_player)
+        val lockPlayerButton = binding.player.binding.lockPlayer
         lockPlayerButton.setOnClickListener {
             // change the locked/unlocked icon
             if (!isPlayerLocked) {
@@ -630,7 +624,7 @@ class PlayerFragment : Fragment() {
         binding.playerTitle.text = response.title
         binding.playerDescription.text = response.description
 
-        view.findViewById<TextView>(R.id.exo_title).text = response.title
+        binding.player.binding.exoTitle.text = response.title
 
         // Listener for play and pause icon change
         exoPlayer.addListener(object : Player.Listener {
@@ -802,8 +796,8 @@ class PlayerFragment : Fragment() {
             PreferenceHelper.getString(requireContext(), "player_video_format", "WEBM")
         val defres = PreferenceHelper.getString(requireContext(), "default_res", "")!!
 
-        val qualityText = view.findViewById<TextView>(R.id.quality_text)
-        val qualitySelect = view.findViewById<LinearLayout>(R.id.quality_linLayout)
+        val qualityText = binding.player.binding.qualityText
+        val qualitySelect = binding.player.binding.qualitySelect
 
         var videosNameArray: Array<CharSequence> = arrayOf()
         var videosUrlArray: Array<Uri> = arrayOf()
@@ -987,12 +981,12 @@ class PlayerFragment : Fragment() {
 
     private fun lockPlayer(isLocked: Boolean) {
         val visibility = if (isLocked) View.VISIBLE else View.INVISIBLE
-        exoPlayerView.findViewById<LinearLayout>(R.id.exo_top_bar_right).visibility = visibility
-        exoPlayerView.findViewById<ImageButton>(R.id.exo_play_pause).visibility = visibility
-        exoPlayerView.findViewById<Button>(R.id.exo_ffwd_with_amount).visibility = visibility
-        exoPlayerView.findViewById<Button>(R.id.exo_rew_with_amount).visibility = visibility
-        exoPlayerView.findViewById<FrameLayout>(R.id.exo_bottom_bar).visibility = visibility
-        exoPlayerView.findViewById<TextView>(R.id.exo_title).visibility =
+        binding.player.binding.exoTopBarRight.visibility = visibility
+        binding.player.binding.exoPlayPause.visibility = visibility
+        binding.player.binding.exoFfwdWithAmount.visibility = visibility
+        binding.player.binding.exoRewWithAmount.visibility = visibility
+        binding.player.binding.exoBottomBar.visibility = visibility
+        binding.player.binding.exoTitle.visibility =
             if (isLocked && isFullScreen) View.VISIBLE else View.INVISIBLE
     }
 
@@ -1154,7 +1148,7 @@ class PlayerFragment : Fragment() {
                 enableTransition(R.id.yt_transition, false)
             }
             binding.mainContainer.isClickable = true
-            view?.findViewById<LinearLayout>(R.id.exo_top_bar)?.visibility = View.GONE
+            binding.player.binding.exoTopBar.visibility = View.GONE
             val mainActivity = activity as MainActivity
             mainActivity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT
             isFullScreen = false
@@ -1166,7 +1160,7 @@ class PlayerFragment : Fragment() {
             exoPlayerView.showController()
             exoPlayerView.useController = true
             binding.mainContainer.isClickable = false
-            view?.findViewById<LinearLayout>(R.id.exo_top_bar)?.visibility = View.VISIBLE
+            binding.player.binding.exoTopBar.visibility = View.VISIBLE
         }
     }
 
diff --git a/app/src/main/java/com/github/libretube/fragments/SearchFragment.kt b/app/src/main/java/com/github/libretube/fragments/SearchFragment.kt
index e6a9fd737..1671d1995 100644
--- a/app/src/main/java/com/github/libretube/fragments/SearchFragment.kt
+++ b/app/src/main/java/com/github/libretube/fragments/SearchFragment.kt
@@ -20,11 +20,11 @@ import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.github.libretube.R
+import com.github.libretube.activities.hideKeyboard
 import com.github.libretube.adapters.SearchAdapter
 import com.github.libretube.adapters.SearchHistoryAdapter
 import com.github.libretube.adapters.SearchSuggestionsAdapter
 import com.github.libretube.databinding.FragmentSearchBinding
-import com.github.libretube.hideKeyboard
 import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.RetrofitInstance
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
diff --git a/app/src/main/java/com/github/libretube/preferences/AboutFragment.kt b/app/src/main/java/com/github/libretube/preferences/AboutFragment.kt
index cfd62721b..45682558d 100644
--- a/app/src/main/java/com/github/libretube/preferences/AboutFragment.kt
+++ b/app/src/main/java/com/github/libretube/preferences/AboutFragment.kt
@@ -9,14 +9,14 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import com.github.libretube.AUTHORS_URL
-import com.github.libretube.CONTRIBUTING_URL
-import com.github.libretube.DONATE_URL
-import com.github.libretube.PIPED_GITHUB_URL
 import com.github.libretube.R
-import com.github.libretube.SettingsActivity
-import com.github.libretube.WEBSITE_URL
+import com.github.libretube.activities.SettingsActivity
 import com.github.libretube.databinding.FragmentAboutBinding
+import com.github.libretube.util.AUTHORS_URL
+import com.github.libretube.util.CONTRIBUTING_URL
+import com.github.libretube.util.DONATE_URL
+import com.github.libretube.util.PIPED_GITHUB_URL
+import com.github.libretube.util.WEBSITE_URL
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class AboutFragment : Fragment() {
diff --git a/app/src/main/java/com/github/libretube/preferences/AdvancedSettings.kt b/app/src/main/java/com/github/libretube/preferences/AdvancedSettings.kt
index 0f03b9736..3fb39c7e8 100644
--- a/app/src/main/java/com/github/libretube/preferences/AdvancedSettings.kt
+++ b/app/src/main/java/com/github/libretube/preferences/AdvancedSettings.kt
@@ -4,8 +4,8 @@ import android.os.Bundle
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import com.github.libretube.R
-import com.github.libretube.SettingsActivity
-import com.github.libretube.requireMainActivityRestart
+import com.github.libretube.activities.SettingsActivity
+import com.github.libretube.activities.requireMainActivityRestart
 import com.github.libretube.util.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
diff --git a/app/src/main/java/com/github/libretube/preferences/AppearanceSettings.kt b/app/src/main/java/com/github/libretube/preferences/AppearanceSettings.kt
index 380424bd4..a43d17d86 100644
--- a/app/src/main/java/com/github/libretube/preferences/AppearanceSettings.kt
+++ b/app/src/main/java/com/github/libretube/preferences/AppearanceSettings.kt
@@ -6,8 +6,8 @@ import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreference
 import com.github.libretube.R
-import com.github.libretube.SettingsActivity
-import com.github.libretube.requireMainActivityRestart
+import com.github.libretube.activities.SettingsActivity
+import com.github.libretube.activities.requireMainActivityRestart
 import com.github.libretube.util.ThemeHelper
 
 class AppearanceSettings : PreferenceFragmentCompat() {
diff --git a/app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt b/app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt
index 728beed24..5fa8b51a1 100644
--- a/app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt
+++ b/app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt
@@ -18,12 +18,12 @@ import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import com.github.libretube.R
-import com.github.libretube.SettingsActivity
+import com.github.libretube.activities.SettingsActivity
+import com.github.libretube.activities.requireMainActivityRestart
 import com.github.libretube.dialogs.CustomInstanceDialog
 import com.github.libretube.dialogs.DeleteAccountDialog
 import com.github.libretube.dialogs.LoginDialog
 import com.github.libretube.dialogs.LogoutDialog
-import com.github.libretube.requireMainActivityRestart
 import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.RetrofitInstance
 import org.json.JSONObject
diff --git a/app/src/main/java/com/github/libretube/preferences/MainSettings.kt b/app/src/main/java/com/github/libretube/preferences/MainSettings.kt
index a8ceef736..075b35643 100644
--- a/app/src/main/java/com/github/libretube/preferences/MainSettings.kt
+++ b/app/src/main/java/com/github/libretube/preferences/MainSettings.kt
@@ -8,8 +8,8 @@ import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import com.github.libretube.BuildConfig
 import com.github.libretube.R
-import com.github.libretube.isCurrentViewMainSettings
-import com.github.libretube.requireMainActivityRestart
+import com.github.libretube.activities.isCurrentViewMainSettings
+import com.github.libretube.activities.requireMainActivityRestart
 import com.github.libretube.util.ThemeHelper
 import com.github.libretube.util.checkUpdate
 
diff --git a/app/src/main/java/com/github/libretube/preferences/PlayerSettings.kt b/app/src/main/java/com/github/libretube/preferences/PlayerSettings.kt
index 16fd72aa7..5fbcae5a9 100644
--- a/app/src/main/java/com/github/libretube/preferences/PlayerSettings.kt
+++ b/app/src/main/java/com/github/libretube/preferences/PlayerSettings.kt
@@ -3,7 +3,7 @@ package com.github.libretube.preferences
 import android.os.Bundle
 import androidx.preference.PreferenceFragmentCompat
 import com.github.libretube.R
-import com.github.libretube.SettingsActivity
+import com.github.libretube.activities.SettingsActivity
 
 class PlayerSettings : PreferenceFragmentCompat() {
     val TAG = "PlayerSettings"
diff --git a/app/src/main/java/com/github/libretube/preferences/SponsorBlockSettings.kt b/app/src/main/java/com/github/libretube/preferences/SponsorBlockSettings.kt
index 02c4479c7..51cb7f77b 100644
--- a/app/src/main/java/com/github/libretube/preferences/SponsorBlockSettings.kt
+++ b/app/src/main/java/com/github/libretube/preferences/SponsorBlockSettings.kt
@@ -3,7 +3,7 @@ package com.github.libretube.preferences
 import android.os.Bundle
 import androidx.preference.PreferenceFragmentCompat
 import com.github.libretube.R
-import com.github.libretube.SettingsActivity
+import com.github.libretube.activities.SettingsActivity
 
 class SponsorBlockSettings : PreferenceFragmentCompat() {
     private val TAG = "SponsorBlockSettings"
diff --git a/app/src/main/java/com/github/libretube/BackgroundMode.kt b/app/src/main/java/com/github/libretube/util/BackgroundMode.kt
similarity index 97%
rename from app/src/main/java/com/github/libretube/BackgroundMode.kt
rename to app/src/main/java/com/github/libretube/util/BackgroundMode.kt
index a95a8801d..617cafa4d 100644
--- a/app/src/main/java/com/github/libretube/BackgroundMode.kt
+++ b/app/src/main/java/com/github/libretube/util/BackgroundMode.kt
@@ -1,12 +1,9 @@
-package com.github.libretube
+package com.github.libretube.util
 
 import android.app.NotificationManager
 import android.content.Context
 import android.support.v4.media.session.MediaSessionCompat
 import com.github.libretube.obj.Streams
-import com.github.libretube.util.DescriptionAdapter
-import com.github.libretube.util.PreferenceHelper
-import com.github.libretube.util.RetrofitInstance
 import com.google.android.exoplayer2.C
 import com.google.android.exoplayer2.ExoPlayer
 import com.google.android.exoplayer2.MediaItem
diff --git a/app/src/main/java/com/github/libretube/Constants.kt b/app/src/main/java/com/github/libretube/util/Constants.kt
similarity index 92%
rename from app/src/main/java/com/github/libretube/Constants.kt
rename to app/src/main/java/com/github/libretube/util/Constants.kt
index 52a5d0ef3..90a13a619 100644
--- a/app/src/main/java/com/github/libretube/Constants.kt
+++ b/app/src/main/java/com/github/libretube/util/Constants.kt
@@ -1,4 +1,4 @@
-package com.github.libretube
+package com.github.libretube.util
 
 const val GITHUB_API_URL = "https://api.github.com/repos/libre-tube/LibreTube/releases/latest"
 const val WEBSITE_URL = "https://libre-tube.github.io/"
diff --git a/app/src/main/java/com/github/libretube/util/CustomExoPlayerView.kt b/app/src/main/java/com/github/libretube/util/CustomExoPlayerView.kt
index 25ba13df8..acb87ce11 100644
--- a/app/src/main/java/com/github/libretube/util/CustomExoPlayerView.kt
+++ b/app/src/main/java/com/github/libretube/util/CustomExoPlayerView.kt
@@ -4,12 +4,14 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.util.AttributeSet
 import android.view.MotionEvent
+import com.github.libretube.databinding.ExoStyledPlayerControlViewBinding
 import com.google.android.exoplayer2.ui.StyledPlayerView
 
 internal class CustomExoPlayerView(
     context: Context,
     attributeSet: AttributeSet? = null
 ) : StyledPlayerView(context, attributeSet) {
+    val binding: ExoStyledPlayerControlViewBinding = ExoStyledPlayerControlViewBinding.bind(this)
 
     @SuppressLint("ClickableViewAccessibility")
     override fun onTouchEvent(event: MotionEvent): Boolean {
diff --git a/app/src/main/java/com/github/libretube/util/DescriptionAdapter.kt b/app/src/main/java/com/github/libretube/util/DescriptionAdapter.kt
index a7c9c1ec9..6bc27bf40 100644
--- a/app/src/main/java/com/github/libretube/util/DescriptionAdapter.kt
+++ b/app/src/main/java/com/github/libretube/util/DescriptionAdapter.kt
@@ -5,7 +5,7 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
-import com.github.libretube.MainActivity
+import com.github.libretube.activities.MainActivity
 import com.google.android.exoplayer2.Player
 import com.google.android.exoplayer2.ui.PlayerNotificationManager
 import java.net.URL
diff --git a/app/src/main/java/com/github/libretube/util/UpdateChecker.kt b/app/src/main/java/com/github/libretube/util/UpdateChecker.kt
index 3513a636d..4fa20c45e 100644
--- a/app/src/main/java/com/github/libretube/util/UpdateChecker.kt
+++ b/app/src/main/java/com/github/libretube/util/UpdateChecker.kt
@@ -3,7 +3,6 @@ package com.github.libretube.util
 import android.util.Log
 import androidx.fragment.app.FragmentManager
 import com.github.libretube.BuildConfig
-import com.github.libretube.GITHUB_API_URL
 import com.github.libretube.dialogs.NoUpdateAvailableDialog
 import com.github.libretube.dialogs.UpdateAvailableDialog
 import com.github.libretube.obj.UpdateInfo
diff --git a/app/src/main/res/layout/activity_nointernet.xml b/app/src/main/res/layout/activity_nointernet.xml
index 69874d73e..c0fde8737 100644
--- a/app/src/main/res/layout/activity_nointernet.xml
+++ b/app/src/main/res/layout/activity_nointernet.xml
@@ -6,10 +6,12 @@
 
     <ImageView
         android:id="@+id/noInternet_settingsImageView"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
+        android:padding="3dp"
+        android:layout_width="33dp"
+        android:layout_height="33dp"
         android:layout_margin="16dp"
         android:src="@drawable/ic_settings"
+        android:background="?attr/selectableItemBackgroundBorderless"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />