diff --git a/app/src/main/java/ani/dantotsu/settings/Settings.kt b/app/src/main/java/ani/dantotsu/settings/Settings.kt
index 86b8c6f0..a4d50ee3 100644
--- a/app/src/main/java/ani/dantotsu/settings/Settings.kt
+++ b/app/src/main/java/ani/dantotsu/settings/Settings.kt
@@ -1,8 +1,8 @@
 package ani.dantotsu.settings
 
+import android.view.ViewGroup
 import ani.dantotsu.databinding.ItemSettingsBinding
 import ani.dantotsu.databinding.ItemSettingsSwitchBinding
-import java.lang.reflect.Array
 
 data class Settings(
     val type: Int,
@@ -14,5 +14,6 @@ data class Settings(
     var isChecked : Boolean = false,
     val switch: ((isChecked:Boolean , view: ItemSettingsSwitchBinding ) -> Unit)? = null,
     val isVisible: Boolean = true,
-    val isActivity: Boolean = false
+    val isActivity: Boolean = false,
+    val attach:((ViewGroup) -> Unit)? = null
 )
\ No newline at end of file
diff --git a/app/src/main/java/ani/dantotsu/settings/SettingsAdapter.kt b/app/src/main/java/ani/dantotsu/settings/SettingsAdapter.kt
index add55912..3d37c055 100644
--- a/app/src/main/java/ani/dantotsu/settings/SettingsAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/settings/SettingsAdapter.kt
@@ -63,6 +63,8 @@ class SettingsAdapter(private val settings: ArrayList<Settings>) :
                 b.settingsLayout.visibility = if (settings.isVisible) View.VISIBLE else View.GONE
                 b.settingsIconRight.visibility =
                     if (settings.isActivity) View.VISIBLE else View.GONE
+                b.attachView.visibility = if (settings.attach != null) View.VISIBLE else View.GONE
+                settings.attach?.invoke(b.attachView)
             }
 
             2 -> {
diff --git a/app/src/main/java/ani/dantotsu/settings/SettingsExtensionsActivity.kt b/app/src/main/java/ani/dantotsu/settings/SettingsExtensionsActivity.kt
index 8bb190e0..45a09ad4 100644
--- a/app/src/main/java/ani/dantotsu/settings/SettingsExtensionsActivity.kt
+++ b/app/src/main/java/ani/dantotsu/settings/SettingsExtensionsActivity.kt
@@ -48,7 +48,13 @@ class SettingsExtensionsActivity: AppCompatActivity() {
         binding = ActivitySettingsExtensionsBinding.inflate(layoutInflater)
         setContentView(binding.root)
         binding.apply {
-
+            settingsExtensionsLayout.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+                topMargin = statusBarHeight
+                bottomMargin = navBarHeight
+            }
+            extensionSettingsBack.setOnClickListener{
+                onBackPressedDispatcher.onBackPressed()
+            }
             fun setExtensionOutput(repoInventory: ViewGroup, type: MediaType) {
                 repoInventory.removeAllViews()
                 val prefName: PrefName? = when (type) {
@@ -70,7 +76,7 @@ class SettingsExtensionsActivity: AppCompatActivity() {
                             LayoutInflater.from(repoInventory.context), repoInventory, true
                         )
                         view.repositoryItem.text =
-                            item.removePrefix("https://raw.githubusercontent.com")
+                            item.removePrefix("https://raw.githubusercontent.com/")
                         view.repositoryItem.setOnClickListener {
                             AlertDialog.Builder(context, R.style.MyPopup)
                                 .setTitle(R.string.rem_repository).setMessage(item)
@@ -107,7 +113,7 @@ class SettingsExtensionsActivity: AppCompatActivity() {
                 }
             }
 
-            fun processUserInput(input: String, mediaType: MediaType) {
+            fun processUserInput(input: String, mediaType: MediaType, view: ViewGroup) {
                 val entry =
                     if (input.endsWith("/") || input.endsWith("index.min.json")) input.substring(
                         0,
@@ -120,7 +126,7 @@ class SettingsExtensionsActivity: AppCompatActivity() {
                     CoroutineScope(Dispatchers.IO).launch {
                         animeExtensionManager.findAvailableExtensions()
                     }
-                    setExtensionOutput(animeRepoInventory, MediaType.ANIME)
+                    setExtensionOutput(view, MediaType.ANIME)
                 }
                 if (mediaType == MediaType.MANGA) {
                     val manga =
@@ -129,17 +135,17 @@ class SettingsExtensionsActivity: AppCompatActivity() {
                     CoroutineScope(Dispatchers.IO).launch {
                         mangaExtensionManager.findAvailableExtensions()
                     }
-                    setExtensionOutput(mangaRepoInventory, MediaType.MANGA)
+                    setExtensionOutput(view, MediaType.MANGA)
                 }
             }
 
-            fun processEditorAction(dialog: AlertDialog, editText: EditText, mediaType: MediaType) {
+            fun processEditorAction(dialog: AlertDialog, editText: EditText, mediaType: MediaType, view: ViewGroup) {
                 editText.setOnEditorActionListener { textView, action, keyEvent ->
                     if (action == EditorInfo.IME_ACTION_SEARCH || action == EditorInfo.IME_ACTION_DONE || (keyEvent?.action == KeyEvent.ACTION_UP && keyEvent.keyCode == KeyEvent.KEYCODE_ENTER)) {
                         return@setOnEditorActionListener if (textView.text.isNullOrBlank()) {
                             false
                         } else {
-                            processUserInput(textView.text.toString(), mediaType)
+                            processUserInput(textView.text.toString(), mediaType, view)
                             dialog.dismiss()
                             true
                         }
@@ -147,131 +153,141 @@ class SettingsExtensionsActivity: AppCompatActivity() {
                     false
                 }
             }
-            settingsExtensionsLayout.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-                topMargin = statusBarHeight
-                bottomMargin = navBarHeight
-            }
-            extensionSettingsBack.setOnClickListener{
-                onBackPressedDispatcher.onBackPressed()
-            }
-            setExtensionOutput(animeRepoInventory, MediaType.ANIME)
-            setExtensionOutput(mangaRepoInventory, MediaType.MANGA)
-            animeAddRepository.setOnClickListener {
-                val dialogView = layoutInflater.inflate(R.layout.dialog_user_agent, null)
-                val editText =
-                    dialogView.findViewById<TextInputEditText>(R.id.userAgentTextBox).apply {
-                        hint = getString(R.string.anime_add_repository)
-                    }
-                val alertDialog = AlertDialog.Builder(context, R.style.MyPopup)
-                    .setTitle(R.string.anime_add_repository).setView(dialogView)
-                    .setPositiveButton(getString(R.string.ok)) { dialog, _ ->
-                        if (!editText.text.isNullOrBlank()) processUserInput(
-                            editText.text.toString(),
-                            MediaType.ANIME
-                        )
-                        dialog.dismiss()
-                    }.setNegativeButton(getString(R.string.cancel)) { dialog, _ ->
-                        dialog.dismiss()
-                    }.create()
+            settingsRecyclerView.adapter = SettingsAdapter(
+                arrayListOf(
+                    Settings(
+                        type = 1,
+                        name = getString(R.string.anime_add_repository),
+                        desc = getString(R.string.anime_add_repository),
+                        icon = R.drawable.ic_github,
+                        onClick = {
+                            val dialogView = layoutInflater.inflate(R.layout.dialog_user_agent, null)
+                            val editText =
+                                dialogView.findViewById<TextInputEditText>(R.id.userAgentTextBox).apply {
+                                    hint = getString(R.string.anime_add_repository)
+                                }
+                            val alertDialog = AlertDialog.Builder(context, R.style.MyPopup)
+                                .setTitle(R.string.anime_add_repository).setView(dialogView)
+                                .setPositiveButton(getString(R.string.ok)) { dialog, _ ->
+                                    if (!editText.text.isNullOrBlank()) processUserInput(
+                                        editText.text.toString(),
+                                        MediaType.ANIME,
+                                        it.attachView
+                                    )
+                                    dialog.dismiss()
+                                }.setNegativeButton(getString(R.string.cancel)) { dialog, _ ->
+                                    dialog.dismiss()
+                                }.create()
 
-                processEditorAction(alertDialog, editText, MediaType.ANIME)
-                alertDialog.show()
-                alertDialog.window?.setDimAmount(0.8f)
-            }
-
-            mangaAddRepository.setOnClickListener {
-                val dialogView = layoutInflater.inflate(R.layout.dialog_user_agent, null)
-                val editText =
-                    dialogView.findViewById<TextInputEditText>(R.id.userAgentTextBox).apply {
-                        hint = getString(R.string.manga_add_repository)
-                    }
-                val alertDialog = AlertDialog.Builder(context, R.style.MyPopup)
-                    .setTitle(R.string.manga_add_repository).setView(dialogView)
-                    .setPositiveButton(getString(R.string.ok)) { dialog, _ ->
-                        if (!editText.text.isNullOrBlank()) processUserInput(
-                            editText.text.toString(),
-                            MediaType.MANGA
-                        )
-                        dialog.dismiss()
-                    }.setNegativeButton(getString(R.string.cancel)) { dialog, _ ->
-                        dialog.dismiss()
-                    }.create()
-
-                processEditorAction(alertDialog, editText, MediaType.MANGA)
-                alertDialog.show()
-                alertDialog.window?.setDimAmount(0.8f)
-            }
-        }
-
-        binding.settingsRecyclerView.adapter = SettingsAdapter(
-            arrayListOf(
-                Settings(
-                    type = 1,
-                    name = getString(R.string.user_agent),
-                    desc = getString(R.string.NSFWExtention),
-                    icon = R.drawable.ic_round_video_settings_24,
-                    onClick = {
-                        val dialogView = DialogUserAgentBinding.inflate(layoutInflater)
-                        val editText = dialogView.userAgentTextBox
-                        editText.setText(PrefManager.getVal<String>(PrefName.DefaultUserAgent))
-                        val alertDialog = AlertDialog.Builder(context, R.style.MyPopup)
-                            .setTitle(R.string.user_agent).setView(dialogView.root)
-                            .setPositiveButton(getString(R.string.ok)) { dialog, _ ->
-                                PrefManager.setVal(PrefName.DefaultUserAgent, editText.text.toString())
-                                dialog.dismiss()
-                            }.setNeutralButton(getString(R.string.reset)) { dialog, _ ->
-                                PrefManager.removeVal(PrefName.DefaultUserAgent)
-                                editText.setText("")
-                                dialog.dismiss()
-                            }.setNegativeButton(getString(R.string.cancel)) { dialog, _ ->
-                                dialog.dismiss()
-                            }.create()
-
-                        alertDialog.show()
-                        alertDialog.window?.setDimAmount(0.8f)
-                    }
-                ),
-                Settings(
-                    type = 2,
-                    name = getString(R.string.force_legacy_installer),
-                    desc = getString(R.string.force_legacy_installer),
-                    icon = R.drawable.ic_round_new_releases_24,
-                    isChecked =  extensionInstaller.get() == BasePreferences.ExtensionInstaller.LEGACY,
-                    switch = { isChecked, _ ->
-                        if (isChecked) {
-                            extensionInstaller.set(BasePreferences.ExtensionInstaller.LEGACY)
-                        } else {
-                            extensionInstaller.set(BasePreferences.ExtensionInstaller.PACKAGEINSTALLER)
+                            processEditorAction(alertDialog, editText, MediaType.ANIME, it.attachView)
+                            alertDialog.show()
+                            alertDialog.window?.setDimAmount(0.8f)
+                        },
+                        attach = { view ->
+                            setExtensionOutput(view, MediaType.ANIME)
                         }
-                    }
+                    ),
+                    Settings(
+                        type = 1,
+                        name = getString(R.string.manga_add_repository),
+                        desc = getString(R.string.manga_add_repository),
+                        icon = R.drawable.ic_github,
+                        onClick = {
+                            val dialogView = layoutInflater.inflate(R.layout.dialog_user_agent, null)
+                            val editText =
+                                dialogView.findViewById<TextInputEditText>(R.id.userAgentTextBox).apply {
+                                    hint = getString(R.string.manga_add_repository)
+                                }
+                            val alertDialog = AlertDialog.Builder(context, R.style.MyPopup)
+                                .setTitle(R.string.manga_add_repository).setView(dialogView)
+                                .setPositiveButton(getString(R.string.ok)) { dialog, _ ->
+                                    if (!editText.text.isNullOrBlank()) processUserInput(
+                                        editText.text.toString(),
+                                        MediaType.MANGA,
+                                        it.attachView
+                                    )
+                                    dialog.dismiss()
+                                }.setNegativeButton(getString(R.string.cancel)) { dialog, _ ->
+                                    dialog.dismiss()
+                                }.create()
 
-                ),
-                Settings(
-                    type = 2,
-                    name = getString(R.string.skip_loading_extension_icons),
-                    desc = getString(R.string.skip_loading_extension_icons),
-                    icon = R.drawable.ic_round_no_icon_24,
-                    isChecked = PrefManager.getVal(PrefName.SkipExtensionIcons),
-                    switch = { isChecked, _ ->
-                        PrefManager.setVal(PrefName.SkipExtensionIcons, isChecked)
-                    }
-                ),
-                Settings(
-                    type = 2,
-                    name = getString(R.string.NSFWExtention),
-                    desc = getString(R.string.NSFWExtention),
-                    icon = R.drawable.ic_round_nsfw_24,
-                    isChecked = PrefManager.getVal(PrefName.NSFWExtension),
-                    switch = { isChecked, _ ->
-                        PrefManager.setVal(PrefName.NSFWExtension, isChecked)
-                    }
+                            processEditorAction(alertDialog, editText, MediaType.MANGA, it.attachView)
+                            alertDialog.show()
+                            alertDialog.window?.setDimAmount(0.8f)
+                        },
+                        attach = { view ->
+                            setExtensionOutput(view, MediaType.MANGA)
+                        }
+                    ),
+                    Settings(
+                        type = 1,
+                        name = getString(R.string.user_agent),
+                        desc = getString(R.string.NSFWExtention),
+                        icon = R.drawable.ic_round_video_settings_24,
+                        onClick = {
+                            val dialogView = DialogUserAgentBinding.inflate(layoutInflater)
+                            val editText = dialogView.userAgentTextBox
+                            editText.setText(PrefManager.getVal<String>(PrefName.DefaultUserAgent))
+                            val alertDialog = AlertDialog.Builder(context, R.style.MyPopup)
+                                .setTitle(R.string.user_agent).setView(dialogView.root)
+                                .setPositiveButton(getString(R.string.ok)) { dialog, _ ->
+                                    PrefManager.setVal(PrefName.DefaultUserAgent, editText.text.toString())
+                                    dialog.dismiss()
+                                }.setNeutralButton(getString(R.string.reset)) { dialog, _ ->
+                                    PrefManager.removeVal(PrefName.DefaultUserAgent)
+                                    editText.setText("")
+                                    dialog.dismiss()
+                                }.setNegativeButton(getString(R.string.cancel)) { dialog, _ ->
+                                    dialog.dismiss()
+                                }.create()
 
+                            alertDialog.show()
+                            alertDialog.window?.setDimAmount(0.8f)
+                        }
+                    ),
+                    Settings(
+                        type = 2,
+                        name = getString(R.string.force_legacy_installer),
+                        desc = getString(R.string.force_legacy_installer),
+                        icon = R.drawable.ic_round_new_releases_24,
+                        isChecked =  extensionInstaller.get() == BasePreferences.ExtensionInstaller.LEGACY,
+                        switch = { isChecked, _ ->
+                            if (isChecked) {
+                                extensionInstaller.set(BasePreferences.ExtensionInstaller.LEGACY)
+                            } else {
+                                extensionInstaller.set(BasePreferences.ExtensionInstaller.PACKAGEINSTALLER)
+                            }
+                        }
+
+                    ),
+                    Settings(
+                        type = 2,
+                        name = getString(R.string.skip_loading_extension_icons),
+                        desc = getString(R.string.skip_loading_extension_icons),
+                        icon = R.drawable.ic_round_no_icon_24,
+                        isChecked = PrefManager.getVal(PrefName.SkipExtensionIcons),
+                        switch = { isChecked, _ ->
+                            PrefManager.setVal(PrefName.SkipExtensionIcons, isChecked)
+                        }
+                    ),
+                    Settings(
+                        type = 2,
+                        name = getString(R.string.NSFWExtention),
+                        desc = getString(R.string.NSFWExtention),
+                        icon = R.drawable.ic_round_nsfw_24,
+                        isChecked = PrefManager.getVal(PrefName.NSFWExtension),
+                        switch = { isChecked, _ ->
+                            PrefManager.setVal(PrefName.NSFWExtension, isChecked)
+                        }
+
+                    )
                 )
             )
-        )
-        binding.settingsRecyclerView.apply {
-            layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
-            setHasFixedSize(true)
+            settingsRecyclerView.apply {
+                layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+                setHasFixedSize(true)
+            }
         }
+
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_settings_anime.xml b/app/src/main/res/layout/activity_settings_anime.xml
index 8565d548..c9cb2086 100644
--- a/app/src/main/res/layout/activity_settings_anime.xml
+++ b/app/src/main/res/layout/activity_settings_anime.xml
@@ -63,7 +63,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
-            android:layout_marginHorizontal="32dp"
+            android:layout_marginHorizontal="16dp"
             android:gravity="center"
             android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/activity_settings_common.xml b/app/src/main/res/layout/activity_settings_common.xml
index d59e42f4..f668d982 100644
--- a/app/src/main/res/layout/activity_settings_common.xml
+++ b/app/src/main/res/layout/activity_settings_common.xml
@@ -63,7 +63,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="32dp"
+            android:layout_marginHorizontal="16dp"
             android:layout_marginBottom="8dp"
             android:gravity="center"
             android:orientation="horizontal">
@@ -135,7 +135,7 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="32dp"
+            android:layout_marginHorizontal="16dp"
             android:alpha="0.58"
             android:fontFamily="@font/poppins_bold"
             android:text="@string/selected_dns" />
@@ -144,7 +144,7 @@
             style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="32dp"
+            android:layout_marginHorizontal="16dp"
             android:layout_marginBottom="8dp"
             app:boxCornerRadiusBottomEnd="8dp"
             app:boxCornerRadiusBottomStart="8dp"
diff --git a/app/src/main/res/layout/activity_settings_extensions.xml b/app/src/main/res/layout/activity_settings_extensions.xml
index 0e8e51fb..07aa599d 100644
--- a/app/src/main/res/layout/activity_settings_extensions.xml
+++ b/app/src/main/res/layout/activity_settings_extensions.xml
@@ -60,71 +60,6 @@
 
         </LinearLayout>
 
-        <Button
-            android:layout_marginHorizontal="12dp"
-            android:id="@+id/animeAddRepository"
-            android:layout_width="match_parent"
-            android:layout_height="64dp"
-            android:background="@drawable/ui_bg"
-            android:backgroundTint="?attr/colorSecondary"
-            android:backgroundTintMode="src_atop"
-            android:fontFamily="@font/poppins_bold"
-            android:insetTop="0dp"
-            android:insetBottom="0dp"
-            android:paddingHorizontal="31dp"
-            android:text="@string/anime_add_repository"
-            android:textAlignment="viewStart"
-            android:textAllCaps="false"
-            android:textColor="?attr/colorOnBackground"
-            app:cornerRadius="0dp"
-            app:icon="@drawable/ic_github"
-            app:iconPadding="16dp"
-            app:iconSize="24dp"
-            app:iconTint="?attr/colorPrimary" />
-
-
-        <LinearLayout
-            android:id="@+id/animeRepoInventory"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:orientation="vertical"
-            android:paddingStart="36dp"
-            android:visibility="gone"
-            tools:ignore="RtlSymmetry" />
-
-        <Button
-            android:id="@+id/mangaAddRepository"
-            android:layout_width="match_parent"
-            android:layout_height="64dp"
-            android:layout_marginHorizontal="12dp"
-            android:background="@drawable/ui_bg"
-            android:backgroundTint="?attr/colorSecondary"
-            android:backgroundTintMode="src_atop"
-            android:fontFamily="@font/poppins_bold"
-            android:insetTop="0dp"
-            android:insetBottom="0dp"
-            android:paddingHorizontal="31dp"
-            android:text="@string/manga_add_repository"
-            android:textAlignment="viewStart"
-            android:textAllCaps="false"
-            android:textColor="?attr/colorOnBackground"
-            app:cornerRadius="0dp"
-            app:icon="@drawable/ic_github"
-            app:iconPadding="16dp"
-            app:iconSize="24dp"
-            app:iconTint="?attr/colorPrimary" />
-
-        <LinearLayout
-            android:id="@+id/mangaRepoInventory"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:orientation="vertical"
-            android:paddingStart="36dp"
-            android:visibility="gone"
-            tools:ignore="RtlSymmetry" />
-
         <ani.dantotsu.FadingEdgeRecyclerView
             android:id="@+id/settingsRecyclerView"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_settings_manga.xml b/app/src/main/res/layout/activity_settings_manga.xml
index 3e1615b0..ee3e1c1d 100644
--- a/app/src/main/res/layout/activity_settings_manga.xml
+++ b/app/src/main/res/layout/activity_settings_manga.xml
@@ -63,7 +63,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="32dp"
+            android:layout_marginHorizontal="16dp"
             android:layout_marginTop="16dp"
             android:gravity="center"
             android:orientation="horizontal">
diff --git a/app/src/main/res/layout/activity_settings_theme.xml b/app/src/main/res/layout/activity_settings_theme.xml
index 7b8e270f..3f26f7e8 100644
--- a/app/src/main/res/layout/activity_settings_theme.xml
+++ b/app/src/main/res/layout/activity_settings_theme.xml
@@ -65,7 +65,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
-            android:layout_marginHorizontal="32dp"
+            android:layout_marginHorizontal="16dp"
             android:gravity="center"
             android:orientation="horizontal">
 
@@ -139,7 +139,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="8dp"
-            android:layout_marginHorizontal="32dp"
+            android:layout_marginHorizontal="16dp"
             app:boxCornerRadiusBottomEnd="8dp"
             app:boxCornerRadiusBottomStart="8dp"
             app:boxCornerRadiusTopEnd="8dp"
diff --git a/app/src/main/res/layout/item_repository.xml b/app/src/main/res/layout/item_repository.xml
index 4ec666c9..a49310b6 100644
--- a/app/src/main/res/layout/item_repository.xml
+++ b/app/src/main/res/layout/item_repository.xml
@@ -10,9 +10,9 @@
         android:id="@+id/repositoryItem"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fontFamily="@font/poppins_semi_bold"
         android:textSize="12sp"
         android:ellipsize="end"
+        android:alpha="0.66"
         android:textAlignment="viewStart"
         android:textColor="?attr/colorOnBackground"
         android:singleLine="true"
diff --git a/app/src/main/res/layout/item_settings.xml b/app/src/main/res/layout/item_settings.xml
index 7ee96eba..75427311 100644
--- a/app/src/main/res/layout/item_settings.xml
+++ b/app/src/main/res/layout/item_settings.xml
@@ -13,7 +13,8 @@
         android:id="@+id/settingsIcon"
         android:layout_width="24dp"
         android:layout_height="24dp"
-        android:layout_margin="24dp"
+        android:layout_marginVertical="24dp"
+        android:layout_marginEnd="24dp"
         app:srcCompat="@drawable/ic_circle_add"
         app:tint="?attr/colorPrimary"
         tools:ignore="ContentDescription" />
@@ -32,7 +33,7 @@
             android:fontFamily="@font/poppins_bold"
             android:text="@string/name"
             android:textColor="?attr/colorOnSurface"
-            android:textSize="18sp" />
+            android:textSize="16sp" />
 
         <TextView
             android:id="@+id/settingsDesc"
@@ -42,13 +43,19 @@
             android:fontFamily="@font/poppins_semi_bold"
             android:text="@string/slogan"
             android:textColor="?attr/colorOnSurfaceVariant" />
-
+        <LinearLayout
+            android:id="@+id/attachView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:orientation="vertical"
+            android:visibility="gone"
+            tools:ignore="RtlSymmetry" />
     </LinearLayout>
     <ImageView
         android:id="@+id/settingsIconRight"
         android:layout_width="24dp"
         android:layout_height="24dp"
-        android:layout_marginEnd="16dp"
         android:visibility="gone"
         tools:visibility="visible"
         app:srcCompat="@drawable/ic_round_arrow_back_ios_new_24"
diff --git a/app/src/main/res/layout/item_settings_switch.xml b/app/src/main/res/layout/item_settings_switch.xml
index f1f10a70..9ec085b9 100644
--- a/app/src/main/res/layout/item_settings_switch.xml
+++ b/app/src/main/res/layout/item_settings_switch.xml
@@ -13,7 +13,8 @@
         android:id="@+id/settingsIcon"
         android:layout_width="24dp"
         android:layout_height="24dp"
-        android:layout_margin="24dp"
+        android:layout_marginVertical="24dp"
+        android:layout_marginEnd="24dp"
         app:srcCompat="@drawable/ic_circle_add"
         app:tint="?attr/colorPrimary"
         tools:ignore="ContentDescription" />
@@ -30,10 +31,9 @@
             android:layout_height="12dp"
             android:checked="false"
             android:elegantTextHeight="true"
-            android:layout_marginEnd="24dp"
             android:fontFamily="@font/poppins_bold"
             android:text="@string/name"
-            android:textSize="18sp"
+            android:textSize="16sp"
             android:textAlignment="viewStart"
             android:textColor="?attr/colorOnBackground"
             app:cornerRadius="0dp"
@@ -45,7 +45,7 @@
             android:id="@+id/settingsDesc"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="64dp"
+            android:layout_marginEnd="32dp"
             android:alpha="0.66"
             android:fontFamily="@font/poppins_semi_bold"
             android:text="@string/slogan"