diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java
index 42004823..bd2a0376 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java
@@ -409,17 +409,14 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
         });
 
         _groupChip.setOnClickListener(v -> {
-            ColorStateList colorStateList = ContextCompat.getColorStateList(getContext(), R.color.bg_chip_text_color);
             chipGroup.removeAllViews();
 
             for (String group : _groups) {
-                Chip chip = new Chip(getContext());
+                Chip chip = (Chip) this.getLayoutInflater().inflate(R.layout.chip_material, null, false);
                 chip.setText(group);
                 chip.setCheckable(true);
                 chip.setChecked(_groupFilter != null && _groupFilter.contains(group));
                 chip.setCheckedIconVisible(false);
-                chip.setChipBackgroundColorResource(R.color.bg_chip_color);
-                chip.setTextColor(colorStateList);
                 chip.setOnCheckedChangeListener((group1, checkedId) -> {
                     List<String> groupFilter = getGroupFilter(chipGroup);
                     setGroupFilter(groupFilter, true);
diff --git a/app/src/main/res/layout/chip_material.xml b/app/src/main/res/layout/chip_material.xml
new file mode 100644
index 00000000..f0346c6d
--- /dev/null
+++ b/app/src/main/res/layout/chip_material.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.chip.Chip xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/Widget.MaterialComponents.Chip.Choice"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_select_groups.xml b/app/src/main/res/layout/dialog_select_groups.xml
index 51423cf1..11733771 100644
--- a/app/src/main/res/layout/dialog_select_groups.xml
+++ b/app/src/main/res/layout/dialog_select_groups.xml
@@ -37,7 +37,8 @@
 
         <com.google.android.material.chip.ChipGroup
             android:id="@+id/groupChipGroup"
-            android:paddingLeft="8dp"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
         </com.google.android.material.chip.ChipGroup>