Reduce margins on search fragment

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>

app/src/main/res/layout/fragment_controls.xml

@@ -8,33 +8,36 @@
 
     <ImageButton
             android:id="@+id/routeButton"
-        android:layout_width="65dp"
+            android:layout_width="64dp"
-        android:layout_height="42dp"
+            android:layout_height="38dp"
             android:layout_marginStart="8dp"
-        android:layout_marginBottom="36dp"
+            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_width="64dp"
-        android:layout_height="43dp"
+            android:layout_height="38dp"
             android:layout_marginStart="8dp"
-        android:layout_marginBottom="36dp"
+            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_width="64dp"
-        android:layout_height="42dp"
+            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" />
@@ -42,10 +45,11 @@
     <ImageButton
             android:id="@+id/modeButton"
             android:layout_width="60dp"
-        android:layout_height="36dp"
+            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"
@@ -54,11 +58,12 @@
     <ImageButton
             android:id="@+id/attributionButton"
             android:layout_width="60dp"
-        android:layout_height="31dp"
+            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"
@@ -69,7 +74,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
-        android:layout_marginBottom="24dp"
+            android:layout_marginBottom="21dp"
             app:layout_constraintBottom_toBottomOf="@+id/attributionButton"
             app:layout_constraintEnd_toEndOf="parent">
 
@@ -78,6 +83,7 @@
                 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" />
 

app/src/main/res/layout/fragment_search.xml

@@ -4,13 +4,12 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:padding="12dp">
+        android:padding="6dp">
 
     <LinearLayout
             android:id="@+id/searchContainer"
             android:layout_width="320dp"
             android:layout_height="35dp"
-            android:layout_marginTop="2dp"
             android:orientation="horizontal"
             android:background="#000000"
             app:layout_constraintTop_toTopOf="parent"