diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsHeaderAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsHeaderAdapter.kt
index 93099bbbd0..b65d74ade1 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsHeaderAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsHeaderAdapter.kt
@@ -34,25 +34,25 @@ class ExtensionDetailsHeaderAdapter(private val presenter: ExtensionDetailsPrese
             val extension = presenter.extension ?: return
             val context = view.context
 
-            extension.getApplicationIcon(context)?.let { binding.extensionIcon.setImageDrawable(it) }
-            binding.extensionTitle.text = extension.name
-            binding.extensionVersion.text = context.getString(R.string.ext_version_info, extension.versionName)
-            binding.extensionLang.text = context.getString(R.string.ext_language_info, LocaleHelper.getSourceDisplayName(extension.lang, context))
-            binding.extensionNsfw.isVisible = extension.isNsfw
-            binding.extensionPkg.text = extension.pkgName
+            extension.getApplicationIcon(context)?.let { binding.icon.setImageDrawable(it) }
+            binding.title.text = extension.name
+            binding.version.text = context.getString(R.string.ext_version_info, extension.versionName)
+            binding.lang.text = context.getString(R.string.ext_language_info, LocaleHelper.getSourceDisplayName(extension.lang, context))
+            binding.nsfw.isVisible = extension.isNsfw
+            binding.pkgname.text = extension.pkgName
 
-            binding.extensionUninstallButton.clicks()
+            binding.btnUninstall.clicks()
                 .onEach { presenter.uninstallExtension() }
                 .launchIn(presenter.presenterScope)
 
             if (extension.isObsolete) {
-                binding.extensionWarningBanner.isVisible = true
-                binding.extensionWarningBanner.setText(R.string.obsolete_extension_message)
+                binding.warningBanner.isVisible = true
+                binding.warningBanner.setText(R.string.obsolete_extension_message)
             }
 
             if (extension.isUnofficial) {
-                binding.extensionWarningBanner.isVisible = true
-                binding.extensionWarningBanner.setText(R.string.unofficial_extension_message)
+                binding.warningBanner.isVisible = true
+                binding.warningBanner.setText(R.string.unofficial_extension_message)
             }
         }
     }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceHolder.kt
index 04ad60af4e..bf956f1f02 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceHolder.kt
@@ -3,14 +3,14 @@ package eu.kanade.tachiyomi.ui.browse.migration.sources
 import android.view.View
 import androidx.core.view.isVisible
 import eu.davidea.viewholders.FlexibleViewHolder
-import eu.kanade.tachiyomi.databinding.SourceMainControllerCardItemBinding
+import eu.kanade.tachiyomi.databinding.SourceMainControllerItemBinding
 import eu.kanade.tachiyomi.source.icon
 import eu.kanade.tachiyomi.util.system.LocaleHelper
 
 class SourceHolder(view: View, val adapter: SourceAdapter) :
     FlexibleViewHolder(view, adapter) {
 
-    private val binding = SourceMainControllerCardItemBinding.bind(view)
+    private val binding = SourceMainControllerItemBinding.bind(view)
 
     fun bind(item: SourceItem) {
         val source = item.source
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceItem.kt
index 4494ac1dbc..08dd118469 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceItem.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceItem.kt
@@ -21,7 +21,7 @@ data class SourceItem(val source: Source, val mangaCount: Int, val header: Selec
      * Returns the layout resource of this item.
      */
     override fun getLayoutRes(): Int {
-        return R.layout.source_main_controller_card_item
+        return R.layout.source_main_controller_item
     }
 
     /**
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceHolder.kt
index 0f05512e0e..2a5a02f437 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceHolder.kt
@@ -4,7 +4,7 @@ import android.view.View
 import androidx.core.view.isVisible
 import eu.davidea.viewholders.FlexibleViewHolder
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.databinding.SourceMainControllerCardItemBinding
+import eu.kanade.tachiyomi.databinding.SourceMainControllerItemBinding
 import eu.kanade.tachiyomi.source.LocalSource
 import eu.kanade.tachiyomi.source.icon
 import eu.kanade.tachiyomi.util.system.LocaleHelper
@@ -13,7 +13,7 @@ import eu.kanade.tachiyomi.util.view.setVectorCompat
 class SourceHolder(private val view: View, val adapter: SourceAdapter) :
     FlexibleViewHolder(view, adapter) {
 
-    private val binding = SourceMainControllerCardItemBinding.bind(view)
+    private val binding = SourceMainControllerItemBinding.bind(view)
 
     init {
         binding.sourceLatest.setOnClickListener {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceItem.kt
index c5a2094f9b..5360f582a6 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceItem.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceItem.kt
@@ -21,23 +21,14 @@ data class SourceItem(
 ) :
     AbstractSectionableItem<SourceHolder, LangItem>(header) {
 
-    /**
-     * Returns the layout resource of this item.
-     */
     override fun getLayoutRes(): Int {
-        return R.layout.source_main_controller_card_item
+        return R.layout.source_main_controller_item
     }
 
-    /**
-     * Creates a new view holder for this item.
-     */
     override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<RecyclerView.ViewHolder>>): SourceHolder {
         return SourceHolder(view, adapter as SourceAdapter)
     }
 
-    /**
-     * Binds this item to the given view holder.
-     */
     override fun bindViewHolder(
         adapter: FlexibleAdapter<IFlexible<RecyclerView.ViewHolder>>,
         holder: SourceHolder,
diff --git a/app/src/main/res/layout/extension_detail_header.xml b/app/src/main/res/layout/extension_detail_header.xml
index 95bf05f95f..8abf18b1ec 100644
--- a/app/src/main/res/layout/extension_detail_header.xml
+++ b/app/src/main/res/layout/extension_detail_header.xml
@@ -7,7 +7,7 @@
     android:orientation="vertical">
 
     <TextView
-        android:id="@+id/extension_warning_banner"
+        android:id="@+id/warning_banner"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?attr/colorError"
@@ -25,52 +25,52 @@
         android:padding="16dp">
 
         <ImageView
-            android:id="@+id/extension_icon"
+            android:id="@+id/icon"
             android:layout_width="56dp"
             android:layout_height="56dp"
             android:src="@mipmap/ic_launcher"
-            app:layout_constraintBottom_toBottomOf="@id/extension_pkg"
+            app:layout_constraintBottom_toBottomOf="@id/pkgname"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:ignore="ContentDescription" />
 
         <TextView
-            android:id="@+id/extension_title"
+            android:id="@+id/title"
             style="@style/TextAppearance.Regular.SubHeading"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:elevation="3dp"
-            app:layout_constraintStart_toEndOf="@id/extension_icon"
+            app:layout_constraintStart_toEndOf="@id/icon"
             app:layout_constraintTop_toTopOf="parent"
             tools:text="Tachiyomi: Extension" />
 
         <TextView
-            android:id="@+id/extension_version"
+            android:id="@+id/version"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_weight="1"
             android:elevation="3dp"
             android:gravity="center"
-            app:layout_constraintStart_toStartOf="@id/extension_title"
-            app:layout_constraintTop_toBottomOf="@id/extension_title"
+            app:layout_constraintStart_toStartOf="@id/title"
+            app:layout_constraintTop_toBottomOf="@id/title"
             tools:text="Version: 1.0.0" />
 
         <TextView
-            android:id="@+id/extension_lang"
+            android:id="@+id/lang"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_weight="1"
             android:elevation="3dp"
             android:gravity="center"
-            app:layout_constraintStart_toStartOf="@id/extension_title"
-            app:layout_constraintTop_toBottomOf="@id/extension_version"
+            app:layout_constraintStart_toStartOf="@id/title"
+            app:layout_constraintTop_toBottomOf="@id/version"
             tools:text="Language: English" />
 
         <TextView
-            android:id="@+id/extension_nsfw"
+            android:id="@+id/nsfw"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -80,32 +80,31 @@
             android:text="@string/ext_nsfw_warning"
             android:textColor="?attr/colorError"
             android:visibility="gone"
-            app:layout_constraintStart_toStartOf="@id/extension_title"
-            app:layout_constraintTop_toBottomOf="@id/extension_lang"
+            app:layout_constraintStart_toStartOf="@id/title"
+            app:layout_constraintTop_toBottomOf="@id/lang"
             tools:visibility="visible" />
 
         <TextView
-            android:id="@+id/extension_pkg"
+            android:id="@+id/pkgname"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:elevation="3dp"
             android:ellipsize="middle"
             android:singleLine="true"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@id/extension_title"
-            app:layout_constraintTop_toBottomOf="@id/extension_nsfw"
+            app:layout_constraintStart_toStartOf="@id/title"
+            app:layout_constraintTop_toBottomOf="@id/nsfw"
             tools:text="eu.kanade.tachiyomi.extension.en.myext" />
 
         <Button
-            android:id="@+id/extension_uninstall_button"
+            android:id="@+id/btn_uninstall"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
-            android:paddingStart="32dp"
-            android:paddingEnd="32dp"
             android:text="@string/ext_uninstall"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/extension_pkg" />
+            app:layout_constraintTop_toBottomOf="@id/pkgname" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/source_main_controller_card_item.xml b/app/src/main/res/layout/source_main_controller_item.xml
similarity index 100%
rename from app/src/main/res/layout/source_main_controller_card_item.xml
rename to app/src/main/res/layout/source_main_controller_item.xml