diff --git a/app/src/main/java/com/emanuelef/remote_capture/model/MatchList.java b/app/src/main/java/com/emanuelef/remote_capture/model/MatchList.java
index 28efd5a3..e2fd7358 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/model/MatchList.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/model/MatchList.java
@@ -53,7 +53,7 @@ public class MatchList {
     private final Context mContext;
     private final SharedPreferences mPrefs;
     private final String mPrefName;
-    private ArrayList<Rule> mRules = new ArrayList<>();
+    private final ArrayList<Rule> mRules = new ArrayList<>();
     private final HashMap<String, Rule> mMatches = new HashMap<>();
 
     public enum RuleType {
diff --git a/app/src/main/res/layout/app_details_activity.xml b/app/src/main/res/layout/app_details_activity.xml
index 7ff46083..55c5885c 100644
--- a/app/src/main/res/layout/app_details_activity.xml
+++ b/app/src/main/res/layout/app_details_activity.xml
@@ -185,8 +185,8 @@
             android:layout_width="0dp"
             android:layout_height="42dip"
             android:layout_weight="1"
-            android:textSize="12sp"
-            tools:ignore="ButtonStyle" />
+            style="@style/Widget.MaterialComponents.Button.TextButton"
+            android:textColor="@color/colorTabText" />
 
         <Button
             android:id="@+id/show_connections"
@@ -194,9 +194,7 @@
             android:layout_marginStart="5dp"
             android:layout_width="0dp"
             android:layout_height="42dip"
-            android:layout_weight="1"
-            android:textSize="12sp"
-            tools:ignore="ButtonStyle"/>
+            android:layout_weight="1" />
     </LinearLayout>
 
     <TextView
diff --git a/app/src/main/res/layout/edit_filter_activity.xml b/app/src/main/res/layout/edit_filter_activity.xml
index 6d0c475a..c7a6e005 100644
--- a/app/src/main/res/layout/edit_filter_activity.xml
+++ b/app/src/main/res/layout/edit_filter_activity.xml
@@ -29,10 +29,11 @@
                 android:id="@+id/edit_mask"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
                 android:layout_marginBottom="15dp"
                 android:text="@string/edit_rules"
-                android:layout_alignParentEnd="true"
-                android:textSize="12sp" />
+                style="?attr/materialButtonOutlinedStyle"
+                android:textColor="@color/colorTabText" />
         </RelativeLayout>
 
         <TextView
diff --git a/app/src/main/res/values-night-v8/styles.xml b/app/src/main/res/values-night-v8/styles.xml
index 9c34f9cc..e636d2d1 100644
--- a/app/src/main/res/values-night-v8/styles.xml
+++ b/app/src/main/res/values-night-v8/styles.xml
@@ -3,5 +3,11 @@
         <!--
         <item name="android:colorBackground">#ff000000</item>
         -->
+        <item name="materialThemeOverlay">@style/ButtonStyleTextColor</item>
+    </style>
+
+    <style name="ButtonStyleTextColor">
+        <item name="colorOnPrimary">@color/colorTabText</item>
+        <item name="colorOnSecondary">@color/colorTabText</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index cc8847d9..5a389d4d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,7 +4,7 @@
     <color name="colorTabText">@android:color/tertiary_text_light</color>
     <color name="colorTabTextSelected">@android:color/secondary_text_light</color>
     <color name="colorPrimary">#512da8</color>
-    <color name="colorPrimaryDark">#361e73</color>
+    <color name="colorPrimaryDark">#4D3294</color>
     <color name="colorAccent">#D81B60</color>
     <color name="colorBackgroundGray">#2C000000</color>
     <color name="navViewBackground">@color/design_default_color_surface</color>