diff --git a/app/src/full/java/com/celzero/bravedns/ui/DnsSettingsFragment.kt b/app/src/full/java/com/celzero/bravedns/ui/DnsSettingsFragment.kt
index b831e13af..e937add58 100644
--- a/app/src/full/java/com/celzero/bravedns/ui/DnsSettingsFragment.kt
+++ b/app/src/full/java/com/celzero/bravedns/ui/DnsSettingsFragment.kt
@@ -134,9 +134,8 @@ class DnsSettingsFragment :
     private fun observeAppState() {
         VpnController.connectionStatus.observe(viewLifecycleOwner) {
             if (it == BraveVPNService.State.PAUSED) {
-                startActivity(
-                    context?.let { it1 -> Intent().setClass(it1, PauseActivity::class.java) }
-                )
+                val intent = Intent(requireContext(), PauseActivity::class.java)
+                startActivity(intent)
             }
         }
 
diff --git a/app/src/full/java/com/celzero/bravedns/ui/HomeScreenActivity.kt b/app/src/full/java/com/celzero/bravedns/ui/HomeScreenActivity.kt
index 2628b74d8..8ac86c675 100644
--- a/app/src/full/java/com/celzero/bravedns/ui/HomeScreenActivity.kt
+++ b/app/src/full/java/com/celzero/bravedns/ui/HomeScreenActivity.kt
@@ -82,15 +82,16 @@ import com.celzero.bravedns.util.Utilities.showToastUiCentered
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
-import java.io.File
-import java.util.Calendar
-import java.util.concurrent.Executor
-import java.util.concurrent.TimeUnit
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koin.android.ext.android.get
 import org.koin.android.ext.android.inject
+import java.io.File
+import java.util.Calendar
+import java.util.concurrent.Executor
+import java.util.concurrent.TimeUnit
+
 
 class HomeScreenActivity : AppCompatActivity(R.layout.activity_home_screen) {
     private val b by viewBinding(ActivityHomeScreenBinding::bind)
diff --git a/app/src/full/java/com/celzero/bravedns/ui/HomeScreenSettingBottomSheet.kt b/app/src/full/java/com/celzero/bravedns/ui/HomeScreenSettingBottomSheet.kt
index a2a59f15e..0717d9fb9 100644
--- a/app/src/full/java/com/celzero/bravedns/ui/HomeScreenSettingBottomSheet.kt
+++ b/app/src/full/java/com/celzero/bravedns/ui/HomeScreenSettingBottomSheet.kt
@@ -154,14 +154,6 @@ class HomeScreenSettingBottomSheet : BottomSheetDialogFragment() {
             handleDnsFirewallMode(checked)
         }
 
-        b.bsHsWireguardRl.setOnClickListener {
-            showToastUiCentered(
-                requireContext(),
-                getString(R.string.coming_soon_toast),
-                Toast.LENGTH_SHORT
-            )
-        }
-
         b.bsHomeScreenVpnLockdownDesc.setOnClickListener { openVpnProfile(requireContext()) }
     }
 
diff --git a/app/src/full/java/com/celzero/bravedns/ui/MiscSettingsActivity.kt b/app/src/full/java/com/celzero/bravedns/ui/MiscSettingsActivity.kt
index 9db6530c0..b2dafffd4 100644
--- a/app/src/full/java/com/celzero/bravedns/ui/MiscSettingsActivity.kt
+++ b/app/src/full/java/com/celzero/bravedns/ui/MiscSettingsActivity.kt
@@ -31,7 +31,6 @@ import android.widget.*
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresApi
-import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.biometric.BiometricManager
@@ -40,8 +39,8 @@ import androidx.core.net.toUri
 import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.lifecycleScope
 import by.kirich1409.viewbindingdelegate.viewBinding
-import com.celzero.bravedns.RethinkDnsApplication.Companion.DEBUG
 import com.celzero.bravedns.R
+import com.celzero.bravedns.RethinkDnsApplication.Companion.DEBUG
 import com.celzero.bravedns.backup.BackupHelper
 import com.celzero.bravedns.data.AppConfig
 import com.celzero.bravedns.databinding.ActivityMiscSettingsBinding
@@ -56,13 +55,13 @@ import com.celzero.bravedns.util.Utilities.isAtleastT
 import com.celzero.bravedns.util.Utilities.isFdroidFlavour
 import com.celzero.bravedns.util.Utilities.showToastUiCentered
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import org.koin.android.ext.android.inject
-import org.xmlpull.v1.XmlPullParser
-import org.xmlpull.v1.XmlPullParserException
 import java.io.*
 import java.text.SimpleDateFormat
 import java.util.*
 import java.util.concurrent.TimeUnit
+import org.koin.android.ext.android.inject
+import org.xmlpull.v1.XmlPullParser
+import org.xmlpull.v1.XmlPullParserException
 
 class MiscSettingsActivity : AppCompatActivity(R.layout.activity_misc_settings) {
     private val b by viewBinding(ActivityMiscSettingsBinding::bind)
diff --git a/app/src/full/res/layout/bottom_sheet_home_screen.xml b/app/src/full/res/layout/bottom_sheet_home_screen.xml
index 36a80d81a..96e81313a 100644
--- a/app/src/full/res/layout/bottom_sheet_home_screen.xml
+++ b/app/src/full/res/layout/bottom_sheet_home_screen.xml
@@ -265,77 +265,6 @@
                 android:padding="5dp"
                 android:text="" />
         </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/bs_hs_wireguard_rl"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingTop="5dp"
-            android:paddingBottom="5dp">
-
-            <ImageView
-                android:id="@+id/wireguard_icon"
-                android:layout_width="32dp"
-                android:layout_height="32dp"
-                android:layout_alignParentStart="true"
-                android:layout_centerVertical="true"
-                android:layout_gravity="center"
-                android:layout_marginStart="5dp"
-                android:layout_marginTop="5dp"
-                android:layout_marginEnd="5dp"
-                android:layout_marginBottom="5dp"
-                android:clickable="false"
-                android:contentDescription="@string/apps_icon_content_desc"
-                android:padding="5dp"
-                android:src="@drawable/ic_vpn" />
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_toStartOf="@id/bs_home_screen_radio_wireguard"
-                android:layout_toEndOf="@id/wireguard_icon"
-                android:alpha="0.5"
-                android:clickable="false"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/wireguard_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingStart="5dp"
-                    android:paddingEnd="5dp"
-                    android:text="@string/app_mode_wireguard"
-                    android:textColor="?attr/primaryTextColor"
-                    android:textSize="@dimen/large_font_text_view" />
-
-                <TextView
-                    android:id="@+id/wireguard_desc"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="center_vertical"
-                    android:paddingStart="5dp"
-                    android:paddingEnd="5dp"
-                    android:text="@string/wireguard_mode_info_explanation_new"
-                    android:textColor="?attr/primaryLightColorText"
-                    android:textSize="@dimen/default_font_text_view" />
-            </LinearLayout>
-
-            <com.google.android.material.radiobutton.MaterialRadioButton
-                android:id="@+id/bs_home_screen_radio_wireguard"
-                style="@style/CustomWidget.MaterialComponents.CompoundButton.Switch"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_centerVertical="true"
-                android:layout_margin="5dp"
-                android:layoutDirection="rtl"
-                android:clickable="false"
-                android:padding="5dp"
-                android:text="" />
-        </RelativeLayout>
     </RadioGroup>
 
     <RelativeLayout
diff --git a/app/src/full/res/layout/dialog_info_firewall_rules.xml b/app/src/full/res/layout/dialog_info_firewall_rules.xml
index 7027c1efe..e4e0305a4 100644
--- a/app/src/full/res/layout/dialog_info_firewall_rules.xml
+++ b/app/src/full/res/layout/dialog_info_firewall_rules.xml
@@ -72,6 +72,19 @@
             android:textSize="@dimen/large_font_text_view"
             app:drawableStartCompat="@drawable/ic_firewall_bypass_off" />
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:drawablePadding="10dp"
+            android:gravity="center_vertical"
+            android:padding="5dp"
+            android:text="@string/fapps_info_bypass_dns_firewall_msg"
+            android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+            android:textColor="?attr/primaryTextColor"
+            android:textSize="@dimen/large_font_text_view"
+            app:drawableStartCompat="@drawable/ic_bypass_dns_firewall_off" />
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/full/res/layout/dialog_set_custom_doh.xml b/app/src/full/res/layout/dialog_set_custom_doh.xml
index 981c5b86e..504408bf1 100644
--- a/app/src/full/res/layout/dialog_set_custom_doh.xml
+++ b/app/src/full/res/layout/dialog_set_custom_doh.xml
@@ -11,25 +11,20 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="10dp"
-        android:textSize="@dimen/large_font_text_view"
         android:text="@string/cd_doh_dialog_heading"
+        android:textSize="@dimen/large_font_text_view"
         app:layout_constraintTop_toTopOf="parent" />
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/text_input_layout_name"
         android:layout_width="match_parent"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-        app:boxCornerRadiusBottomEnd="8dp"
-        app:boxCornerRadiusBottomStart="8dp"
-        app:boxCornerRadiusTopEnd="8dp"
-        app:boxCornerRadiusTopStart="8dp"
-        android:layout_marginTop="10dp"
         android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
         android:hint="@string/cd_doh_dialog_resolver_name"
         app:hintTextColor="?attr/accentGood"
         app:layout_constraintTop_toBottomOf="@id/dialog_custom_url_top">
 
-        <EditText
+        <androidx.appcompat.widget.AppCompatEditText
             android:id="@+id/dialog_custom_name_edit_text"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
@@ -38,8 +33,8 @@
             android:layout_marginRight="10dp"
             android:layout_marginBottom="10dp"
             android:inputType="textNoSuggestions"
-            android:padding="10dp"
             android:maxLines="2"
+            android:padding="10dp"
             android:textColor="?attr/primaryTextColor"
             android:textSize="@dimen/large_font_text_view"
             app:layout_constraintRight_toLeftOf="parent"
@@ -49,17 +44,12 @@
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/text_input_layout1"
         android:layout_width="match_parent"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-        app:boxCornerRadiusBottomEnd="8dp"
-        app:boxCornerRadiusBottomStart="8dp"
-        app:boxCornerRadiusTopEnd="8dp"
-        app:boxCornerRadiusTopStart="8dp"
         android:layout_height="wrap_content"
         android:hint="@string/cd_doh_dialog_resolver_url"
         app:hintTextColor="?attr/accentGood"
         app:layout_constraintTop_toBottomOf="@id/text_input_layout_name">
 
-        <EditText
+        <androidx.appcompat.widget.AppCompatEditText
             android:id="@+id/dialog_custom_url_edit_text"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
@@ -68,11 +58,11 @@
             android:layout_marginRight="10dp"
             android:layout_marginBottom="10dp"
             android:inputType="textUri"
+            android:maxLines="2"
             android:padding="10dp"
-            android:textSize="@dimen/large_font_text_view"
             android:text="https://"
-            android:maxLines="2"
             android:textColor="?attr/primaryTextColor"
+            android:textSize="@dimen/large_font_text_view"
             app:layout_constraintRight_toLeftOf="parent"
             app:layout_constraintTop_toBottomOf="@id/text_input_layout_name" />
     </com.google.android.material.textfield.TextInputLayout>
@@ -88,8 +78,8 @@
         android:layout_marginBottom="10dp"
         android:padding="5dp"
         android:text="@string/settings_http_proxy_error_text4"
-        android:textSize="@dimen/default_font_text_view"
         android:textColor="@color/colorRed_A400"
+        android:textSize="@dimen/default_font_text_view"
         android:visibility="invisible"
         app:layout_constraintTop_toBottomOf="@id/text_input_layout1" />
 
@@ -102,9 +92,9 @@
         android:layout_marginTop="10dp"
         android:layout_marginRight="10dp"
         android:layout_marginBottom="10dp"
-        android:text="@string/cd_dialog_positive_btn"
-        android:textSize="@dimen/large_font_text_view"
+        android:text="@string/lbl_add"
         android:textColor="?attr/accentGood"
+        android:textSize="@dimen/large_font_text_view"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/dialog_custom_url_failure_text" />
 
@@ -118,8 +108,8 @@
         android:layout_marginBottom="10dp"
         android:gravity="center"
         android:text="@string/lbl_cancel"
-        android:textSize="@dimen/large_font_text_view"
         android:textColor="?attr/accentGood"
+        android:textSize="@dimen/large_font_text_view"
         app:layout_constraintEnd_toStartOf="@id/dialog_custom_url_ok_btn"
         app:layout_constraintTop_toBottomOf="@id/dialog_custom_url_failure_text" />
 
diff --git a/app/src/full/res/layout/dialog_set_dns_crypt.xml b/app/src/full/res/layout/dialog_set_dns_crypt.xml
index 6b059a9bf..cb2caf787 100644
--- a/app/src/full/res/layout/dialog_set_dns_crypt.xml
+++ b/app/src/full/res/layout/dialog_set_dns_crypt.xml
@@ -58,11 +58,6 @@
                 android:id="@+id/text_input_layout1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                app:boxCornerRadiusBottomEnd="8dp"
-                app:boxCornerRadiusBottomStart="8dp"
-                app:boxCornerRadiusTopEnd="8dp"
-                app:boxCornerRadiusTopStart="8dp"
                 android:hint="@string/cd_dns_crypt_dialog_name"
                 app:hintTextColor="?attr/accentGood"
                 app:layout_constraintTop_toBottomOf="@id/dialog_dns_proxy_radio_group">
@@ -80,11 +75,6 @@
                 android:id="@+id/text_input_layout2"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                app:boxCornerRadiusBottomEnd="8dp"
-                app:boxCornerRadiusBottomStart="8dp"
-                app:boxCornerRadiusTopEnd="8dp"
-                app:boxCornerRadiusTopStart="8dp"
                 android:hint="@string/cd_dns_crypt_dialog_stamp"
                 app:hintTextColor="?attr/accentGood"
                 app:layout_constraintTop_toBottomOf="@id/text_input_layout1">
@@ -100,11 +90,6 @@
                 android:id="@+id/text_input_layout3"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                app:boxCornerRadiusBottomEnd="8dp"
-                app:boxCornerRadiusBottomStart="8dp"
-                app:boxCornerRadiusTopEnd="8dp"
-                app:boxCornerRadiusTopStart="8dp"
                 android:hint="@string/cd_dns_crypt_dialog_desc"
                 app:hintTextColor="?attr/accentGood"
                 app:layout_constraintTop_toBottomOf="@id/text_input_layout2">
@@ -138,7 +123,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
         android:layout_marginBottom="10dp"
-        android:text="@string/cd_dialog_positive_btn"
+        android:text="@string/lbl_add"
         android:textSize="@dimen/large_font_text_view"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/dialog_dns_crypt_scroll" />
diff --git a/app/src/full/res/layout/dialog_set_dns_proxy.xml b/app/src/full/res/layout/dialog_set_dns_proxy.xml
index 9e53a93c1..f6f50fac0 100644
--- a/app/src/full/res/layout/dialog_set_dns_proxy.xml
+++ b/app/src/full/res/layout/dialog_set_dns_proxy.xml
@@ -161,7 +161,7 @@
             android:layout_height="wrap_content"
             android:layout_margin="5dp"
             android:gravity="center"
-            android:text="@string/dns_proxy_positive_btn"
+            android:text="@string/lbl_add"
             android:textSize="@dimen/large_font_text_view"
             android:textColor="?attr/accentGood" />
     </LinearLayout>
diff --git a/app/src/full/res/layout/dialog_set_http_proxy.xml b/app/src/full/res/layout/dialog_set_http_proxy.xml
index af1c09f8e..9799bfd7d 100644
--- a/app/src/full/res/layout/dialog_set_http_proxy.xml
+++ b/app/src/full/res/layout/dialog_set_http_proxy.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:padding="20dp">
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/dialog_http_proxy_top"
         style="@style/TextAppearance.AppCompat.Subhead"
         android:layout_width="match_parent"
@@ -16,7 +16,7 @@
         android:textSize="@dimen/large_font_text_view"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/dialog_http_proxy_explanation_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -29,16 +29,13 @@
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/dialog_http_proxy_ip_address"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-        app:boxCornerRadiusBottomEnd="8dp"
-        app:boxCornerRadiusBottomStart="8dp"
-        app:boxCornerRadiusTopEnd="8dp"
-        app:boxCornerRadiusTopStart="8dp"
+        android:layout_margin="4dp"
         android:hint="@string/settings_http_proxy_hostname"
         app:hintTextColor="?attr/accentGood"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/dialog_http_proxy_explanation_text">
 
         <com.google.android.material.textfield.TextInputEditText
@@ -50,25 +47,23 @@
             android:layout_marginRight="10dp"
             android:layout_marginBottom="10dp"
             android:inputType="none"
-            android:typeface="monospace"
             android:maxLines="1"
             android:padding="10dp"
             android:text=""
             android:textSize="@dimen/large_font_text_view"
+            android:typeface="monospace"
             app:layout_constraintRight_toLeftOf="parent" />
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/text_input_layout1"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-        app:boxCornerRadiusBottomEnd="8dp"
-        app:boxCornerRadiusBottomStart="8dp"
-        app:boxCornerRadiusTopEnd="8dp"
-        app:boxCornerRadiusTopStart="8dp"
+        android:layout_margin="4dp"
         android:hint="@string/settings_http_proxy_port"
         app:hintTextColor="?attr/accentGood"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/dialog_http_proxy_ip_address">
 
         <com.google.android.material.textfield.TextInputEditText
@@ -79,16 +74,16 @@
             android:layout_marginTop="10dp"
             android:layout_marginRight="10dp"
             android:layout_marginBottom="10dp"
-            android:inputType="number"
-            android:typeface="monospace"
+            android:inputType="none"
             android:maxLines="1"
             android:padding="10dp"
+            android:text=""
             android:textSize="@dimen/large_font_text_view"
+            android:typeface="monospace"
             app:layout_constraintRight_toLeftOf="parent" />
     </com.google.android.material.textfield.TextInputLayout>
 
-
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/dialog_http_proxy_failure_text"
         style="@style/TextAppearance.AppCompat.Body1"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_dns_configure.xml b/app/src/main/res/layout/fragment_dns_configure.xml
index cf0cd4a48..9fd68d64a 100644
--- a/app/src/main/res/layout/fragment_dns_configure.xml
+++ b/app/src/main/res/layout/fragment_dns_configure.xml
@@ -323,7 +323,7 @@
             android:layout_marginStart="55dp"
             android:fontFamily="sans-serif-smallcaps"
             android:padding="5dp"
-            android:text="@string/dc_other_settings_heading"
+            android:text="@string/lbl_advanced"
             android:textColor="?attr/accentGood"
             android:textSize="@dimen/extra_large_font_text_view"
             android:textStyle="bold" />
diff --git a/app/src/main/res/layout/fragment_rethink_blocklist.xml b/app/src/main/res/layout/fragment_rethink_blocklist.xml
index ed01cb0e9..c19c08606 100644
--- a/app/src/main/res/layout/fragment_rethink_blocklist.xml
+++ b/app/src/main/res/layout/fragment_rethink_blocklist.xml
@@ -43,7 +43,7 @@
                 android:layout_height="wrap_content"
                 android:minWidth="125dp"
                 android:tag="2"
-                android:text="@string/rt_list_adv_btn_txt"
+                android:text="@string/lbl_advanced"
                 android:textColor="?attr/defaultToggleBtnTxt"
                 app:cornerRadius="16dp" />
         </com.google.android.material.button.MaterialButtonToggleGroup>