diff --git a/app/src/main/res/drawable/bg_map_button.xml b/app/src/main/res/drawable/bg_map_button.xml
new file mode 100644
index 0000000..943dcec
--- /dev/null
+++ b/app/src/main/res/drawable/bg_map_button.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+       android:insetLeft="4dp"
+       android:insetTop="4dp"
+       android:insetRight="4dp"
+       android:insetBottom="4dp">
+
+    <ripple android:color="#33FFFFFF">
+        <item>
+            <shape android:shape="rectangle">
+                <solid android:color="#000000" />
+                <corners android:radius="3dp" />
+            </shape>
+        </item>
+    </ripple>
+
+</inset>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_controls.xml b/app/src/main/res/layout/fragment_controls.xml
index d7a41e1..349c1f5 100644
--- a/app/src/main/res/layout/fragment_controls.xml
+++ b/app/src/main/res/layout/fragment_controls.xml
@@ -1,85 +1,91 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools">
 
     <ImageButton
-        android:id="@+id/routeButton"
-        android:layout_width="65dp"
-        android:layout_height="42dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginBottom="36dp"
-        android:backgroundTint="#000000"
-        android:src="@android:drawable/ic_menu_directions"
-        app:layout_constraintBottom_toBottomOf="@+id/placesButton"
-        app:layout_constraintStart_toStartOf="parent" />
+            android:id="@+id/routeButton"
+            android:layout_width="64dp"
+            android:layout_height="38dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginBottom="34dp"
+            android:backgroundTint="#000000"
+            android:background="@drawable/bg_map_button"
+            android:src="@android:drawable/ic_menu_directions"
+            app:layout_constraintBottom_toBottomOf="@+id/placesButton"
+            app:layout_constraintStart_toStartOf="parent" />
 
     <ImageButton
-        android:id="@+id/placesButton"
-        android:layout_width="65dp"
-        android:layout_height="43dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginBottom="36dp"
-        android:backgroundTint="#000000"
-        app:layout_constraintBottom_toBottomOf="@+id/layersButton"
-        app:layout_constraintStart_toStartOf="parent"
-        app:srcCompat="@android:drawable/ic_menu_myplaces" />
+            android:id="@+id/placesButton"
+            android:layout_width="64dp"
+            android:layout_height="38dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginBottom="34dp"
+            android:backgroundTint="#000000"
+            android:background="@drawable/bg_map_button"
+            app:layout_constraintBottom_toBottomOf="@+id/layersButton"
+            app:layout_constraintStart_toStartOf="parent"
+            app:srcCompat="@android:drawable/ic_menu_myplaces" />
 
     <ImageButton
-        android:id="@+id/layersButton"
-        android:layout_width="65dp"
-        android:layout_height="42dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginBottom="4dp"
-        android:backgroundTint="#000000"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:srcCompat="@drawable/ic_styles_menu" />
+            android:id="@+id/layersButton"
+            android:layout_width="64dp"
+            android:layout_height="38dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginBottom="4dp"
+            android:backgroundTint="#000000"
+            android:background="@drawable/bg_map_button"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:srcCompat="@drawable/ic_styles_menu" />
 
     <ImageButton
-        android:id="@+id/modeButton"
-        android:layout_width="60dp"
-        android:layout_height="36dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="44dp"
-        android:backgroundTint="#000000"
-        android:src="@android:drawable/ic_menu_manage"
-        app:layout_constraintBottom_toBottomOf="@+id/locationButtonContainer"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0" />
+            android:id="@+id/modeButton"
+            android:layout_width="60dp"
+            android:layout_height="34dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="44dp"
+            android:backgroundTint="#000000"
+            android:background="@drawable/bg_map_button"
+            android:src="@android:drawable/ic_menu_manage"
+            app:layout_constraintBottom_toBottomOf="@+id/locationButtonContainer"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0" />
 
     <ImageButton
-        android:id="@+id/attributionButton"
-        android:layout_width="60dp"
-        android:layout_height="31dp"
-        android:layout_marginStart="272dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="4dp"
-        android:backgroundTint="#000000"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.375"
-        app:srcCompat="@android:drawable/ic_menu_info_details" />
+            android:id="@+id/attributionButton"
+            android:layout_width="60dp"
+            android:layout_height="24dp"
+            android:layout_marginStart="272dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="4dp"
+            android:backgroundTint="#000000"
+            android:background="@drawable/bg_map_button"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.375"
+            app:srcCompat="@android:drawable/ic_menu_info_details" />
 
     <FrameLayout
-        android:id="@+id/locationButtonContainer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="24dp"
-        app:layout_constraintBottom_toBottomOf="@+id/attributionButton"
-        app:layout_constraintEnd_toEndOf="parent">
+            android:id="@+id/locationButtonContainer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="21dp"
+            app:layout_constraintBottom_toBottomOf="@+id/attributionButton"
+            app:layout_constraintEnd_toEndOf="parent">
 
         <ImageButton
-            android:id="@+id/locationButton"
-            android:layout_width="60dp"
-            android:layout_height="47dp"
-            android:backgroundTint="#000000"
-            android:contentDescription="Location"
-            app:srcCompat="@android:drawable/ic_menu_mylocation" />
+                android:id="@+id/locationButton"
+                android:layout_width="60dp"
+                android:layout_height="47dp"
+                android:backgroundTint="#000000"
+                android:background="@drawable/bg_map_button"
+                android:contentDescription="Location"
+                app:srcCompat="@android:drawable/ic_menu_mylocation" />
 
         <TextView
                 android:id="@+id/locationServiceStatusIndicator"