diff --git a/app/src/main/java/com/beemdevelopment/aegis/ViewMode.java b/app/src/main/java/com/beemdevelopment/aegis/ViewMode.java
index 9d3498507b..f1d060c522 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ViewMode.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ViewMode.java
@@ -44,7 +44,7 @@ public float getDividerHeight() {
             return 4;
         }
 
-        return 20;
+        return 8;
     }
 
     public int getColumnSpan() {
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryHolder.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryHolder.java
index 3e26b9988d..7e5c3fe10a 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryHolder.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryHolder.java
@@ -244,7 +244,6 @@ public void setShowProgress(boolean showProgress) {
 
     public void setFocused(boolean focused) {
         if (focused) {
-            _selected.setVisibility(View.VISIBLE);
             _view.setBackgroundColor(ThemeHelper.getThemeColor(com.google.android.material.R.attr.colorSurfaceVariant, _view.getContext().getTheme()));
         } else {
             _view.setBackgroundColor(ThemeHelper.getThemeColor(com.google.android.material.R.attr.colorSurfaceContainer, _view.getContext().getTheme()));
diff --git a/app/src/main/res/layout/card_entry.xml b/app/src/main/res/layout/card_entry.xml
index c18727af9c..16a41fe186 100644
--- a/app/src/main/res/layout/card_entry.xml
+++ b/app/src/main/res/layout/card_entry.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:foreground="?android:attr/selectableItemBackground"
     android:clickable="true"
     android:focusable="true"
     android:layout_height="wrap_content"
+    style="@style/Widget.Material3.CardView.Filled"
     android:orientation="vertical">
 
     <LinearLayout
@@ -173,4 +173,4 @@
             android:layout_weight="1"/>
     </LinearLayout>
 
-</LinearLayout>
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/fragment_entry_list_view.xml b/app/src/main/res/layout/fragment_entry_list_view.xml
index d1027b2509..3bc6d4ad0c 100644
--- a/app/src/main/res/layout/fragment_entry_list_view.xml
+++ b/app/src/main/res/layout/fragment_entry_list_view.xml
@@ -32,7 +32,9 @@
     <androidx.recyclerview.widget.RecyclerView
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        android:paddingHorizontal="8dp"
         android:scrollbars="vertical"
+        android:scrollbarStyle="outsideOverlay"
         android:id="@+id/rvKeyProfiles"
         android:layout_weight="1"/>