diff --git a/app/src/main/res/layout/activity_list_view.xml b/app/src/main/res/layout/activity_list_view.xml
index 2541eb7..b8c5766 100644
--- a/app/src/main/res/layout/activity_list_view.xml
+++ b/app/src/main/res/layout/activity_list_view.xml
@@ -75,9 +75,9 @@
 
                     <androidx.appcompat.widget.AppCompatImageButton
                         android:id="@+id/menu_button"
-                        android:layout_width="?attr/actionBarSize"
-                        android:layout_height="?attr/actionBarSize"
-                        android:background="?attr/selectableItemBackgroundBorderless"
+                        android:layout_width="?android:attr/actionBarSize"
+                        android:layout_height="?android:attr/actionBarSize"
+                        android:background="?android:attr/selectableItemBackgroundBorderless"
                         android:layout_gravity="center_vertical|start"
                         android:paddingStart="@dimen/spacer_1x"
                         android:paddingTop="@dimen/spacer_2x"
@@ -116,14 +116,15 @@
     <!-- Add from map FAB -->
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/add_from_map"
-        android:layout_margin="24dp"
-        android:layout_gravity="bottom|end"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:fabSize="mini"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="24dp"
         android:src="@drawable/ic_add_map"
         app:backgroundTint="@color/defaultBrand"
-        app:tint="@color/white"/>
+        app:fabSize="mini"
+        app:tint="@color/white"
+        tools:ignore="DuplicateClickableBoundsCheck" />
 
     <!-- Add from current position FAB -->
     <com.google.android.material.floatingactionbutton.FloatingActionButton
diff --git a/app/src/main/res/layout/fragment_geofavorite_list.xml b/app/src/main/res/layout/fragment_geofavorite_list.xml
index c20df5d..7132cac 100644
--- a/app/src/main/res/layout/fragment_geofavorite_list.xml
+++ b/app/src/main/res/layout/fragment_geofavorite_list.xml
@@ -18,7 +18,7 @@
             android:id="@+id/sort_mode"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/floating_bar_height"
-            android:background="?attr/selectableItemBackgroundBorderless"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/list_mode"
             android:paddingStart="@dimen/spacer_2x"
             android:paddingEnd="@dimen/spacer_2x"