diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomizeCommentFilterActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomizeCommentFilterActivity.java
index 19c3a25e..a4dde6b8 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomizeCommentFilterActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomizeCommentFilterActivity.java
@@ -20,6 +20,10 @@ import android.widget.Toast;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
+import androidx.core.graphics.Insets;
+import androidx.core.view.OnApplyWindowInsetsListener;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
@@ -81,8 +85,36 @@ public class CustomizeCommentFilterActivity extends BaseActivity {
 
         applyCustomTheme();
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && isChangeStatusBarIconColor()) {
-            addOnOffsetChangedListener(binding.appbarLayoutCustomizeCommentFilterActivity);
+        if (isImmersiveInterface()) {
+            if (isChangeStatusBarIconColor()) {
+                addOnOffsetChangedListener(binding.appbarLayoutCustomizeCommentFilterActivity);
+            }
+
+            ViewCompat.setOnApplyWindowInsetsListener(binding.getRoot(), new OnApplyWindowInsetsListener() {
+                @NonNull
+                @Override
+                public WindowInsetsCompat onApplyWindowInsets(@NonNull View v, @NonNull WindowInsetsCompat insets) {
+                    Insets allInsets = insets.getInsets(
+                            WindowInsetsCompat.Type.systemBars()
+                                    | WindowInsetsCompat.Type.displayCutout()
+                    );
+
+                    setMargins(binding.toolbarCustomizeCommentFilterActivity,
+                            allInsets.left,
+                            allInsets.top,
+                            allInsets.right,
+                            BaseActivity.IGNORE_MARGIN);
+
+                    binding.contentWrapperViewCustomizeCommentFilterActivity.setPadding(
+                            allInsets.left,
+                            0,
+                            allInsets.right,
+                            allInsets.bottom
+                    );
+
+                    return WindowInsetsCompat.CONSUMED;
+                }
+            });
         }
 
         setSupportActionBar(binding.toolbarCustomizeCommentFilterActivity);
@@ -182,14 +214,14 @@ public class CustomizeCommentFilterActivity extends BaseActivity {
         int primaryIconColor = mCustomThemeWrapper.getPrimaryIconColor();
         int filledCardViewBackgroundColor = mCustomThemeWrapper.getFilledCardViewBackgroundColor();
 
-        binding.nameCardViewCustomizePostFilterActivity.setCardBackgroundColor(filledCardViewBackgroundColor);
-        binding.nameExplanationTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor);
+        binding.nameCardViewCustomizeCommentFilterActivity.setCardBackgroundColor(filledCardViewBackgroundColor);
+        binding.nameExplanationTextViewCustomizeCommentFilterActivity.setTextColor(primaryTextColor);
         binding.nameTextInputLayoutCustomizeCommentFilterActivity.setBoxStrokeColor(primaryTextColor);
         binding.nameTextInputLayoutCustomizeCommentFilterActivity.setDefaultHintTextColor(ColorStateList.valueOf(primaryTextColor));
         binding.nameTextInputEditTextCustomizeCommentFilterActivity.setTextColor(primaryTextColor);
 
-        binding.displayModeCardViewCustomizePostFilterActivity.setCardBackgroundColor(filledCardViewBackgroundColor);
-        binding.displayModeExplanationTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor);
+        binding.displayModeCardViewCustomizeCommentFilterActivity.setCardBackgroundColor(filledCardViewBackgroundColor);
+        binding.displayModeExplanationTextViewCustomizeCommentFilterActivity.setTextColor(primaryTextColor);
         binding.displayModeTitleTextViewCustomizeCommentFilterActivity.setTextColor(primaryTextColor);
         binding.displayModeSpinnerCustomizeCommentFilterActivity.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
@@ -206,24 +238,24 @@ public class CustomizeCommentFilterActivity extends BaseActivity {
             }
         });
 
-        binding.excludeStringsCardViewCustomizePostFilterActivity.setCardBackgroundColor(filledCardViewBackgroundColor);
-        binding.excludeStringsExplanationTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor);
+        binding.excludeStringsCardViewCustomizeCommentFilterActivity.setCardBackgroundColor(filledCardViewBackgroundColor);
+        binding.excludeStringsExplanationTextViewCustomizeCommentFilterActivity.setTextColor(primaryTextColor);
         binding.excludeStringsTextInputLayoutCustomizeCommentFilterActivity.setBoxStrokeColor(primaryTextColor);
         binding.excludeStringsTextInputLayoutCustomizeCommentFilterActivity.setDefaultHintTextColor(ColorStateList.valueOf(primaryTextColor));
         binding.excludeStringsTextInputEditTextCustomizeCommentFilterActivity.setTextColor(primaryTextColor);
 
-        binding.excludeUsersCardViewCustomizePostFilterActivity.setCardBackgroundColor(filledCardViewBackgroundColor);
-        binding.excludeUsersExplanationTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor);
+        binding.excludeUsersCardViewCustomizeCommentFilterActivity.setCardBackgroundColor(filledCardViewBackgroundColor);
+        binding.excludeUsersExplanationTextViewCustomizeCommentFilterActivity.setTextColor(primaryTextColor);
         binding.excludeUsersTextInputLayoutCustomizeCommentFilterActivity.setDefaultHintTextColor(ColorStateList.valueOf(primaryTextColor));
         binding.excludeUsersTextInputEditTextCustomizeCommentFilterActivity.setTextColor(primaryTextColor);
         binding.addUsersImageViewCustomizeCommentFilterActivity.setImageDrawable(Utils.getTintedDrawable(this, R.drawable.ic_add_24dp, primaryIconColor));
 
-        binding.voteCardViewCustomizePostFilterActivity.setCardBackgroundColor(filledCardViewBackgroundColor);
-        binding.minVoteExplanationTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor);
+        binding.voteCardViewCustomizeCommentFilterActivity.setCardBackgroundColor(filledCardViewBackgroundColor);
+        binding.minVoteExplanationTextViewCustomizeCommentFilterActivity.setTextColor(primaryTextColor);
         binding.minVoteTextInputLayoutCustomizeCommentFilterActivity.setBoxStrokeColor(primaryTextColor);
         binding.minVoteTextInputLayoutCustomizeCommentFilterActivity.setDefaultHintTextColor(ColorStateList.valueOf(primaryTextColor));
         binding.minVoteTextInputEditTextCustomizeCommentFilterActivity.setTextColor(primaryTextColor);
-        binding.maxVoteExplanationTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor);
+        binding.maxVoteExplanationTextViewCustomizeCommentFilterActivity.setTextColor(primaryTextColor);
         binding.maxVoteTextInputLayoutCustomizeCommentFilterActivity.setBoxStrokeColor(primaryTextColor);
         binding.maxVoteTextInputLayoutCustomizeCommentFilterActivity.setDefaultHintTextColor(ColorStateList.valueOf(primaryTextColor));
         binding.maxVoteTextInputEditTextCustomizeCommentFilterActivity.setTextColor(primaryTextColor);
diff --git a/app/src/main/res/layout-land/activity_customize_comment_filter.xml b/app/src/main/res/layout-land/activity_customize_comment_filter.xml
index 70adf41f..c02e75d7 100644
--- a/app/src/main/res/layout-land/activity_customize_comment_filter.xml
+++ b/app/src/main/res/layout-land/activity_customize_comment_filter.xml
@@ -32,6 +32,7 @@
     </com.google.android.material.appbar.AppBarLayout>
 
     <LinearLayout
+        android:id="@+id/content_wrapper_view_customize_comment_filter_activity"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
@@ -49,7 +50,7 @@
                 android:orientation="vertical">
 
                 <com.google.android.material.card.MaterialCardView
-                    android:id="@+id/name_card_view_customize_post_filter_activity"
+                    android:id="@+id/name_card_view_customize_comment_filter_activity"
                     style="?attr/materialCardViewFilledStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -63,7 +64,7 @@
                         android:orientation="vertical">
 
                         <TextView
-                            android:id="@+id/name_explanation_text_view_customize_post_filter_activity"
+                            android:id="@+id/name_explanation_text_view_customize_comment_filter_activity"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:fontFamily="?attr/font_family"
@@ -101,7 +102,7 @@
                 </com.google.android.material.card.MaterialCardView>
 
                 <com.google.android.material.card.MaterialCardView
-                    android:id="@+id/display_mode_card_view_customize_post_filter_activity"
+                    android:id="@+id/display_mode_card_view_customize_comment_filter_activity"
                     style="?attr/materialCardViewFilledStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -115,7 +116,7 @@
                         android:orientation="vertical">
 
                         <TextView
-                            android:id="@+id/display_mode_explanation_text_view_customize_post_filter_activity"
+                            android:id="@+id/display_mode_explanation_text_view_customize_comment_filter_activity"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:paddingTop="8dp"
@@ -175,7 +176,7 @@
                 android:orientation="vertical">
 
                 <com.google.android.material.card.MaterialCardView
-                    android:id="@+id/exclude_strings_card_view_customize_post_filter_activity"
+                    android:id="@+id/exclude_strings_card_view_customize_comment_filter_activity"
                     style="?attr/materialCardViewFilledStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -189,7 +190,7 @@
                         android:orientation="vertical">
 
                         <TextView
-                            android:id="@+id/exclude_strings_explanation_text_view_customize_post_filter_activity"
+                            android:id="@+id/exclude_strings_explanation_text_view_customize_comment_filter_activity"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:paddingTop="8dp"
@@ -227,7 +228,7 @@
                 </com.google.android.material.card.MaterialCardView>
 
                 <com.google.android.material.card.MaterialCardView
-                    android:id="@+id/exclude_users_card_view_customize_post_filter_activity"
+                    android:id="@+id/exclude_users_card_view_customize_comment_filter_activity"
                     style="?attr/materialCardViewFilledStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -241,7 +242,7 @@
                         android:orientation="vertical">
 
                         <TextView
-                            android:id="@+id/exclude_users_explanation_text_view_customize_post_filter_activity"
+                            android:id="@+id/exclude_users_explanation_text_view_customize_comment_filter_activity"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:fontFamily="?attr/font_family"
@@ -296,7 +297,7 @@
                 </com.google.android.material.card.MaterialCardView>
 
                 <com.google.android.material.card.MaterialCardView
-                    android:id="@+id/vote_card_view_customize_post_filter_activity"
+                    android:id="@+id/vote_card_view_customize_comment_filter_activity"
                     style="?attr/materialCardViewFilledStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -312,7 +313,7 @@
                         android:orientation="vertical">
 
                         <TextView
-                            android:id="@+id/min_vote_explanation_text_view_customize_post_filter_activity"
+                            android:id="@+id/min_vote_explanation_text_view_customize_comment_filter_activity"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:fontFamily="?attr/font_family"
@@ -347,7 +348,7 @@
                         </com.google.android.material.textfield.TextInputLayout>
 
                         <TextView
-                            android:id="@+id/max_vote_explanation_text_view_customize_post_filter_activity"
+                            android:id="@+id/max_vote_explanation_text_view_customize_comment_filter_activity"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:fontFamily="?attr/font_family"
diff --git a/app/src/main/res/layout-sw600dp/activity_customize_comment_filter.xml b/app/src/main/res/layout-sw600dp/activity_customize_comment_filter.xml
index 70adf41f..c02e75d7 100644
--- a/app/src/main/res/layout-sw600dp/activity_customize_comment_filter.xml
+++ b/app/src/main/res/layout-sw600dp/activity_customize_comment_filter.xml
@@ -32,6 +32,7 @@
     </com.google.android.material.appbar.AppBarLayout>
 
     <LinearLayout
+        android:id="@+id/content_wrapper_view_customize_comment_filter_activity"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
@@ -49,7 +50,7 @@
                 android:orientation="vertical">
 
                 <com.google.android.material.card.MaterialCardView
-                    android:id="@+id/name_card_view_customize_post_filter_activity"
+                    android:id="@+id/name_card_view_customize_comment_filter_activity"
                     style="?attr/materialCardViewFilledStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -63,7 +64,7 @@
                         android:orientation="vertical">
 
                         <TextView
-                            android:id="@+id/name_explanation_text_view_customize_post_filter_activity"
+                            android:id="@+id/name_explanation_text_view_customize_comment_filter_activity"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:fontFamily="?attr/font_family"
@@ -101,7 +102,7 @@
                 </com.google.android.material.card.MaterialCardView>
 
                 <com.google.android.material.card.MaterialCardView
-                    android:id="@+id/display_mode_card_view_customize_post_filter_activity"
+                    android:id="@+id/display_mode_card_view_customize_comment_filter_activity"
                     style="?attr/materialCardViewFilledStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -115,7 +116,7 @@
                         android:orientation="vertical">
 
                         <TextView
-                            android:id="@+id/display_mode_explanation_text_view_customize_post_filter_activity"
+                            android:id="@+id/display_mode_explanation_text_view_customize_comment_filter_activity"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:paddingTop="8dp"
@@ -175,7 +176,7 @@
                 android:orientation="vertical">
 
                 <com.google.android.material.card.MaterialCardView
-                    android:id="@+id/exclude_strings_card_view_customize_post_filter_activity"
+                    android:id="@+id/exclude_strings_card_view_customize_comment_filter_activity"
                     style="?attr/materialCardViewFilledStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -189,7 +190,7 @@
                         android:orientation="vertical">
 
                         <TextView
-                            android:id="@+id/exclude_strings_explanation_text_view_customize_post_filter_activity"
+                            android:id="@+id/exclude_strings_explanation_text_view_customize_comment_filter_activity"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:paddingTop="8dp"
@@ -227,7 +228,7 @@
                 </com.google.android.material.card.MaterialCardView>
 
                 <com.google.android.material.card.MaterialCardView
-                    android:id="@+id/exclude_users_card_view_customize_post_filter_activity"
+                    android:id="@+id/exclude_users_card_view_customize_comment_filter_activity"
                     style="?attr/materialCardViewFilledStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -241,7 +242,7 @@
                         android:orientation="vertical">
 
                         <TextView
-                            android:id="@+id/exclude_users_explanation_text_view_customize_post_filter_activity"
+                            android:id="@+id/exclude_users_explanation_text_view_customize_comment_filter_activity"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:fontFamily="?attr/font_family"
@@ -296,7 +297,7 @@
                 </com.google.android.material.card.MaterialCardView>
 
                 <com.google.android.material.card.MaterialCardView
-                    android:id="@+id/vote_card_view_customize_post_filter_activity"
+                    android:id="@+id/vote_card_view_customize_comment_filter_activity"
                     style="?attr/materialCardViewFilledStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -312,7 +313,7 @@
                         android:orientation="vertical">
 
                         <TextView
-                            android:id="@+id/min_vote_explanation_text_view_customize_post_filter_activity"
+                            android:id="@+id/min_vote_explanation_text_view_customize_comment_filter_activity"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:fontFamily="?attr/font_family"
@@ -347,7 +348,7 @@
                         </com.google.android.material.textfield.TextInputLayout>
 
                         <TextView
-                            android:id="@+id/max_vote_explanation_text_view_customize_post_filter_activity"
+                            android:id="@+id/max_vote_explanation_text_view_customize_comment_filter_activity"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:fontFamily="?attr/font_family"
diff --git a/app/src/main/res/layout/activity_customize_comment_filter.xml b/app/src/main/res/layout/activity_customize_comment_filter.xml
index f8198e5f..fc2dc6ce 100644
--- a/app/src/main/res/layout/activity_customize_comment_filter.xml
+++ b/app/src/main/res/layout/activity_customize_comment_filter.xml
@@ -32,8 +32,10 @@
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.core.widget.NestedScrollView
+        android:id="@+id/content_wrapper_view_customize_comment_filter_activity"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:clipToPadding="false"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <LinearLayout
@@ -42,7 +44,7 @@
             android:orientation="vertical">
 
             <com.google.android.material.card.MaterialCardView
-                android:id="@+id/name_card_view_customize_post_filter_activity"
+                android:id="@+id/name_card_view_customize_comment_filter_activity"
                 style="?attr/materialCardViewFilledStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -58,7 +60,7 @@
                     android:orientation="vertical">
 
                     <TextView
-                        android:id="@+id/name_explanation_text_view_customize_post_filter_activity"
+                        android:id="@+id/name_explanation_text_view_customize_comment_filter_activity"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:fontFamily="?attr/font_family"
@@ -96,7 +98,7 @@
             </com.google.android.material.card.MaterialCardView>
 
             <com.google.android.material.card.MaterialCardView
-                android:id="@+id/display_mode_card_view_customize_post_filter_activity"
+                android:id="@+id/display_mode_card_view_customize_comment_filter_activity"
                 style="?attr/materialCardViewFilledStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -112,7 +114,7 @@
                     android:orientation="vertical">
 
                     <TextView
-                        android:id="@+id/display_mode_explanation_text_view_customize_post_filter_activity"
+                        android:id="@+id/display_mode_explanation_text_view_customize_comment_filter_activity"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:paddingTop="8dp"
@@ -156,7 +158,7 @@
             </com.google.android.material.card.MaterialCardView>
 
             <com.google.android.material.card.MaterialCardView
-                android:id="@+id/exclude_strings_card_view_customize_post_filter_activity"
+                android:id="@+id/exclude_strings_card_view_customize_comment_filter_activity"
                 style="?attr/materialCardViewFilledStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -172,7 +174,7 @@
                     android:orientation="vertical">
 
                     <TextView
-                        android:id="@+id/exclude_strings_explanation_text_view_customize_post_filter_activity"
+                        android:id="@+id/exclude_strings_explanation_text_view_customize_comment_filter_activity"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:paddingTop="8dp"
@@ -210,7 +212,7 @@
             </com.google.android.material.card.MaterialCardView>
 
             <com.google.android.material.card.MaterialCardView
-                android:id="@+id/exclude_users_card_view_customize_post_filter_activity"
+                android:id="@+id/exclude_users_card_view_customize_comment_filter_activity"
                 style="?attr/materialCardViewFilledStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -226,7 +228,7 @@
                     android:orientation="vertical">
 
                     <TextView
-                        android:id="@+id/exclude_users_explanation_text_view_customize_post_filter_activity"
+                        android:id="@+id/exclude_users_explanation_text_view_customize_comment_filter_activity"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:fontFamily="?attr/font_family"
@@ -281,7 +283,7 @@
             </com.google.android.material.card.MaterialCardView>
 
             <com.google.android.material.card.MaterialCardView
-                android:id="@+id/vote_card_view_customize_post_filter_activity"
+                android:id="@+id/vote_card_view_customize_comment_filter_activity"
                 style="?attr/materialCardViewFilledStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -297,7 +299,7 @@
                     android:orientation="vertical">
 
                     <TextView
-                        android:id="@+id/min_vote_explanation_text_view_customize_post_filter_activity"
+                        android:id="@+id/min_vote_explanation_text_view_customize_comment_filter_activity"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:fontFamily="?attr/font_family"
@@ -332,7 +334,7 @@
                     </com.google.android.material.textfield.TextInputLayout>
 
                     <TextView
-                        android:id="@+id/max_vote_explanation_text_view_customize_post_filter_activity"
+                        android:id="@+id/max_vote_explanation_text_view_customize_comment_filter_activity"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:fontFamily="?attr/font_family"