diff --git a/app/src/main/res/drawable/ic_my_location_black_24dp.xml b/app/src/main/res/drawable/ic_my_location_black_24dp.xml
index 708ec0444..9afb0a239 100644
--- a/app/src/main/res/drawable/ic_my_location_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_my_location_black_24dp.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="?attr/more_bottom_sheet_drawable_color"
         android:pathData="M12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94L13,1h-2v2.06C6.83,3.52 3.52,6.83 3.06,11L1,11v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94L11,23h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94L23,13v-2h-2.06zM12,19c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"/>
 </vector>
diff --git a/app/src/main/res/layout/fragment_nearby_parent.xml b/app/src/main/res/layout/fragment_nearby_parent.xml
index e1d82e6e7..8dcfe0fef 100644
--- a/app/src/main/res/layout/fragment_nearby_parent.xml
+++ b/app/src/main/res/layout/fragment_nearby_parent.xml
@@ -117,12 +117,12 @@
           android:layout_alignParentRight="true"
           android:clickable="true"
           android:visibility="visible"
-          app:backgroundTint="@color/main_background_light"
+          android:layout_margin="16dp"
+          app:backgroundTint="?attr/mainBackground"
           app:elevation="@dimen/dimen_6"
           app:fabSize="normal"
           app:layout_anchorGravity="top|right|end"
-          app:srcCompat="@drawable/ic_my_location_black_24dp"
-          app:useCompatPadding="true" />
+          app:srcCompat="@drawable/ic_my_location_black_24dp" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
           android:id="@+id/fab_legend"
@@ -133,12 +133,12 @@
           android:layout_alignParentRight="true"
           android:clickable="true"
           android:visibility="visible"
-          app:backgroundTint="@color/main_background_light"
+          android:layout_margin="16dp"
+          app:backgroundTint="?attr/mainBackground"
           app:elevation="@dimen/dimen_6"
           app:fabSize="normal"
           app:layout_anchorGravity="top|right|end"
-          app:srcCompat="@drawable/ic_info_outline_24dp"
-          app:useCompatPadding="true" />
+          app:srcCompat="@drawable/ic_info_outline_24dp" />
 
         <include
           android:id="@+id/nearby_legend_layout"