diff --git a/app/src/main/res/layout/nearby_row_button.xml b/app/src/main/res/layout/nearby_row_button.xml
index 97ab2b2da..959fc60c8 100644
--- a/app/src/main/res/layout/nearby_row_button.xml
+++ b/app/src/main/res/layout/nearby_row_button.xml
@@ -17,6 +17,7 @@
       android:layout_weight="1"
       android:background="@drawable/button_background_selector"
       android:clickable="true"
+      android:focusable="true"
       android:orientation="vertical"
       android:padding="@dimen/standard_gap">
 
@@ -24,8 +25,8 @@
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_gravity="center_horizontal"
-          android:tint="?attr/bookmarkButtonColor"
-          app:srcCompat="@drawable/ic_photo_camera_white_24dp" />
+          app:srcCompat="@drawable/ic_photo_camera_white_24dp"
+          app:tint="?attr/bookmarkButtonColor" />
 
         <TextView
           android:id="@+id/cameraButtonText"
@@ -45,6 +46,7 @@
       android:background="@drawable/button_background_selector"
       android:clickable="true"
       android:contentDescription="@string/nearby_row_image"
+      android:focusable="true"
       android:orientation="vertical"
       android:padding="@dimen/standard_gap">
 
@@ -53,8 +55,8 @@
           android:layout_height="wrap_content"
           android:layout_gravity="center_horizontal"
           android:duplicateParentState="true"
-          android:tint="?attr/bookmarkButtonColor"
-          app:srcCompat="@drawable/ic_photo_white_24dp" />
+          app:srcCompat="@drawable/ic_photo_white_24dp"
+          app:tint="?attr/bookmarkButtonColor" />
 
         <TextView
           android:id="@+id/galleryButtonText"
@@ -72,6 +74,7 @@
         android:layout_width="@dimen/dimen_0"
         android:layout_height="wrap_content"
         android:layout_weight="1"
+        android:focusable="true"
         android:padding="@dimen/standard_gap"
         android:clickable="true"
         android:orientation="vertical"
@@ -82,8 +85,8 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             app:srcCompat="@drawable/ic_directions_black_24dp"
-            android:tint="?attr/bookmarkButtonColor"
-            android:duplicateParentState="true"/>
+            android:duplicateParentState="true"
+            app:tint="?attr/bookmarkButtonColor" />
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -102,6 +105,7 @@
       android:layout_height="wrap_content"
       android:layout_weight="1"
       android:clickable="true"
+      android:focusable="true"
       android:orientation="vertical"
       android:padding="@dimen/standard_gap">
 
@@ -110,8 +114,8 @@
           android:layout_height="wrap_content"
           android:layout_gravity="center_horizontal"
           android:duplicateParentState="true"
-          android:tint="?attr/bookmarkButtonColor"
-          app:srcCompat="@drawable/ic_overflow" />
+          app:srcCompat="@drawable/ic_overflow"
+          app:tint="?attr/bookmarkButtonColor" />
 
         <TextView
           android:id="@+id/iconOverflowText"