diff --git a/app/src/main/res/layout/activity_group.xml b/app/src/main/res/layout/activity_group.xml
index b93d255d7..8c1a283c5 100644
--- a/app/src/main/res/layout/activity_group.xml
+++ b/app/src/main/res/layout/activity_group.xml
@@ -114,27 +114,20 @@
 
             </com.google.android.material.appbar.AppBarLayout>
 
-            <RelativeLayout
-                android:id="@+id/node_list_container"
+            <FrameLayout
+                android:id="@+id/nodes_list_fragment_container"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical"
                 app:layout_behavior="@string/appbar_scrolling_view_behavior"
-                android:layout_below="@+id/toolbar">
-
-                <FrameLayout
-                    android:id="@+id/nodes_list_fragment_container"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:paddingTop="@dimen/selectable_margin_vertical"
-                    android:background="?android:attr/windowBackground" />
-            </RelativeLayout>
+                android:background="?android:attr/windowBackground"
+                android:layout_below="@+id/toolbar" />
 
             <com.kunzisoft.keepass.view.AddNodeButtonView
                 android:id="@+id/add_node_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                app:layout_anchor="@+id/node_list_container"
+                app:layout_anchor="@+id/nodes_list_fragment_container"
                 app:layout_anchorGravity="end|bottom" />
         </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
diff --git a/app/src/main/res/layout/item_list_nodes_entry.xml b/app/src/main/res/layout/item_list_nodes_entry.xml
index 78ef4b236..818d78d15 100644
--- a/app/src/main/res/layout/item_list_nodes_entry.xml
+++ b/app/src/main/res/layout/item_list_nodes_entry.xml
@@ -23,7 +23,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingVertical="@dimen/selectable_margin_vertical"
+    android:paddingTop="@dimen/selectable_margin_top"
     android:paddingHorizontal="@dimen/selectable_margin_horizontal">
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/item_list_nodes_group.xml b/app/src/main/res/layout/item_list_nodes_group.xml
index 02e11ad12..487bb8e43 100644
--- a/app/src/main/res/layout/item_list_nodes_group.xml
+++ b/app/src/main/res/layout/item_list_nodes_group.xml
@@ -23,7 +23,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingVertical="@dimen/selectable_margin_vertical"
+    android:paddingTop="@dimen/selectable_margin_top"
     android:paddingHorizontal="@dimen/selectable_margin_horizontal">
 
     <RelativeLayout
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index bbd4658b9..74b8ec841 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -25,7 +25,7 @@
     <dimen name="image_list_margin_vertical_back">15dp</dimen>
     <dimen name="image_preview_height">144dp</dimen>
     <dimen name="button_margin">8dp</dimen>
-    <dimen name="selectable_margin_vertical">4dp</dimen>
+    <dimen name="selectable_margin_top">8dp</dimen>
     <dimen name="selectable_margin_horizontal">8dp</dimen>
     <dimen name="selectable_min_height">36dp</dimen>
     <dimen name="button_small_size">48dp</dimen>