diff --git a/app/src/main/res/layout/activity_system_search.xml b/app/src/main/res/layout/activity_system_search.xml
index 0ec87195df6e..be909aafe628 100644
--- a/app/src/main/res/layout/activity_system_search.xml
+++ b/app/src/main/res/layout/activity_system_search.xml
@@ -60,7 +60,10 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:importantForAccessibility="no"
-                        android:padding="4dp"
+                        android:paddingTop="4dp"
+                        android:paddingBottom="4dp"
+                        android:paddingStart="3dp"
+                        android:paddingEnd="7dp"
                         app:srcCompat="@drawable/ic_ddg_logo"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/include_omnibar_toolbar_mockup.xml b/app/src/main/res/layout/include_omnibar_toolbar_mockup.xml
index 51726fa04ec8..39b7874283a4 100644
--- a/app/src/main/res/layout/include_omnibar_toolbar_mockup.xml
+++ b/app/src/main/res/layout/include_omnibar_toolbar_mockup.xml
@@ -53,6 +53,7 @@
             android:layout_height="match_parent"
             android:gravity="start|center"
             android:maxLines="1"
+            android:paddingStart="5dp"
             android:paddingEnd="8dp"
             android:text="@string/omnibarInputHint"
             android:textColor="?attr/daxColorSecondaryText" />
diff --git a/app/src/main/res/layout/item_autocomplete_bookmark_suggestion.xml b/app/src/main/res/layout/item_autocomplete_bookmark_suggestion.xml
index 1d8944727f2d..cef4e1181b72 100644
--- a/app/src/main/res/layout/item_autocomplete_bookmark_suggestion.xml
+++ b/app/src/main/res/layout/item_autocomplete_bookmark_suggestion.xml
@@ -25,7 +25,7 @@
     android:background="?attr/selectableItemBackground"
     android:paddingTop="@dimen/keyline_2"
     android:paddingEnd="@dimen/keyline_4"
-    android:paddingStart="20dp"
+    android:paddingStart="@dimen/keyline_4"
     android:paddingBottom="@dimen/keyline_2">
 
     <ImageView
@@ -33,6 +33,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:importantForAccessibility="no"
+        android:layout_margin="@dimen/keyline_0"
         android:src="@drawable/ic_bookmark_20"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -42,7 +43,7 @@
         android:id="@+id/title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
+        android:layout_marginStart="15dp"
         android:ellipsize="end"
         android:includeFontPadding="false"
         android:gravity="center_vertical|start"
@@ -58,7 +59,7 @@
         android:layout_height="wrap_content"
         app:typography="body2"
         app:textType="secondary"
-        android:layout_marginStart="10dp"
+        android:layout_marginStart="15dp"
         android:ellipsize="end"
         android:gravity="center_vertical|start"
         android:maxLines="1"
diff --git a/app/src/main/res/layout/item_autocomplete_default.xml b/app/src/main/res/layout/item_autocomplete_default.xml
index fd3368f919ae..98c34577cbd5 100644
--- a/app/src/main/res/layout/item_autocomplete_default.xml
+++ b/app/src/main/res/layout/item_autocomplete_default.xml
@@ -25,13 +25,14 @@
     android:background="?attr/selectableItemBackground"
     android:paddingTop="@dimen/keyline_2"
     android:paddingEnd="@dimen/keyline_4"
-    android:paddingStart="20dp"
+    android:paddingStart="@dimen/keyline_4"
     android:paddingBottom="@dimen/keyline_2">
 
     <ImageView
         android:id="@+id/phraseOrUrlIndicator"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_margin="@dimen/keyline_0"
         android:importantForAccessibility="no"
         android:src="@drawable/ic_find_search_20"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -42,7 +43,7 @@
         android:id="@+id/phrase"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginStart="10dp"
+        android:layout_marginStart="15dp"
         android:ellipsize="end"
         android:gravity="center_vertical|start"
         android:includeFontPadding="false"
diff --git a/app/src/main/res/layout/item_autocomplete_history_search_suggestion.xml b/app/src/main/res/layout/item_autocomplete_history_search_suggestion.xml
index 93241ccfef51..15bec8b84310 100644
--- a/app/src/main/res/layout/item_autocomplete_history_search_suggestion.xml
+++ b/app/src/main/res/layout/item_autocomplete_history_search_suggestion.xml
@@ -22,7 +22,7 @@
     android:layout_marginTop="6dp"
     android:layout_marginBottom="8dp"
     android:background="?attr/selectableItemBackground"
-    android:paddingStart="20dp"
+    android:paddingStart="@dimen/keyline_4"
     android:paddingTop="@dimen/keyline_2"
     android:paddingEnd="@dimen/keyline_4"
     android:paddingBottom="@dimen/keyline_2">
@@ -31,6 +31,7 @@
         android:id="@+id/phraseOrUrlIndicator"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_margin="@dimen/keyline_0"
         android:importantForAccessibility="no"
         android:src="@drawable/ic_history"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -41,7 +42,7 @@
         android:id="@+id/phrase"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
+        android:layout_marginStart="15dp"
         android:ellipsize="end"
         android:gravity="center_vertical|start"
         android:includeFontPadding="false"
diff --git a/app/src/main/res/layout/item_autocomplete_history_suggestion.xml b/app/src/main/res/layout/item_autocomplete_history_suggestion.xml
index c089a59245fe..aacebfefe64b 100644
--- a/app/src/main/res/layout/item_autocomplete_history_suggestion.xml
+++ b/app/src/main/res/layout/item_autocomplete_history_suggestion.xml
@@ -25,13 +25,14 @@
     android:background="?attr/selectableItemBackground"
     android:paddingTop="@dimen/keyline_2"
     android:paddingEnd="@dimen/keyline_4"
-    android:paddingStart="20dp"
+    android:paddingStart="@dimen/keyline_4"
     android:paddingBottom="@dimen/keyline_2">
 
     <ImageView
         android:id="@+id/historyIndicator"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_margin="@dimen/keyline_0"
         android:importantForAccessibility="no"
         android:src="@drawable/ic_history"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -42,7 +43,7 @@
         android:id="@+id/title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
+        android:layout_marginStart="15dp"
         android:ellipsize="end"
         android:includeFontPadding="false"
         android:gravity="center_vertical|start"
@@ -59,7 +60,7 @@
         android:layout_height="wrap_content"
         app:typography="body2"
         app:textType="secondary"
-        android:layout_marginStart="10dp"
+        android:layout_marginStart="15dp"
         android:ellipsize="end"
         android:gravity="center_vertical|start"
         android:maxLines="1"
diff --git a/app/src/main/res/layout/item_autocomplete_search_suggestion.xml b/app/src/main/res/layout/item_autocomplete_search_suggestion.xml
index 7831b6c7045c..f787a84afd1b 100644
--- a/app/src/main/res/layout/item_autocomplete_search_suggestion.xml
+++ b/app/src/main/res/layout/item_autocomplete_search_suggestion.xml
@@ -25,13 +25,14 @@
     android:background="?attr/selectableItemBackground"
     android:paddingTop="@dimen/keyline_2"
     android:paddingEnd="@dimen/keyline_4"
-    android:paddingStart="20dp"
+    android:paddingStart="@dimen/keyline_4"
     android:paddingBottom="@dimen/keyline_2">
 
     <ImageView
         android:id="@+id/phraseOrUrlIndicator"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_margin="@dimen/keyline_0"
         android:importantForAccessibility="no"
         android:src="@drawable/ic_find_search_20"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -42,7 +43,7 @@
         android:id="@+id/phrase"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
+        android:layout_marginStart="15dp"
         android:ellipsize="end"
         android:gravity="center_vertical|start"
         android:includeFontPadding="false"
diff --git a/app/src/main/res/layout/item_autocomplete_switch_to_tab_suggestion.xml b/app/src/main/res/layout/item_autocomplete_switch_to_tab_suggestion.xml
index ad935ae24a5a..bb80f9a3d957 100644
--- a/app/src/main/res/layout/item_autocomplete_switch_to_tab_suggestion.xml
+++ b/app/src/main/res/layout/item_autocomplete_switch_to_tab_suggestion.xml
@@ -22,7 +22,7 @@
     android:layout_marginTop="6dp"
     android:layout_marginBottom="8dp"
     android:background="?attr/selectableItemBackground"
-    android:paddingStart="20dp"
+    android:paddingStart="@dimen/keyline_4"
     android:paddingTop="@dimen/keyline_2"
     android:paddingEnd="@dimen/keyline_4"
     android:paddingBottom="@dimen/keyline_2">
@@ -31,6 +31,7 @@
         android:id="@+id/switchToTabIndicator"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_margin="@dimen/keyline_0"
         android:importantForAccessibility="no"
         android:src="@drawable/ic_switch_to_tab_20"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -41,7 +42,7 @@
         android:id="@+id/title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
+        android:layout_marginStart="15dp"
         android:ellipsize="end"
         android:gravity="center_vertical|start"
         android:includeFontPadding="false"
@@ -55,7 +56,7 @@
         android:id="@+id/url"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
+        android:layout_marginStart="15dp"
         android:ellipsize="end"
         android:gravity="center_vertical|start"
         android:maxLines="1"
diff --git a/app/src/main/res/layout/view_legacy_omnibar.xml b/app/src/main/res/layout/view_legacy_omnibar.xml
index 69399f5a9351..2a94f1b7cf43 100644
--- a/app/src/main/res/layout/view_legacy_omnibar.xml
+++ b/app/src/main/res/layout/view_legacy_omnibar.xml
@@ -86,7 +86,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/keyline_1"
-                    android:paddingStart="@dimen/keyline_0"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent">
@@ -179,7 +178,7 @@
                     android:imeOptions="flagNoExtractUi|actionGo|flagNoPersonalizedLearning"
                     android:inputType="textUri|textNoSuggestions"
                     android:maxLines="1"
-                    android:paddingStart="3dp"
+                    android:paddingStart="5dp"
                     android:selectAllOnFocus="true"
                     android:textColor="?attr/daxColorPrimaryText"
                     android:textColorHighlight="?attr/daxOmnibarTextColorHighlight"
diff --git a/app/src/main/res/layout/view_legacy_omnibar_bottom.xml b/app/src/main/res/layout/view_legacy_omnibar_bottom.xml
index 90cbcc385770..9e26fdb6a8be 100644
--- a/app/src/main/res/layout/view_legacy_omnibar_bottom.xml
+++ b/app/src/main/res/layout/view_legacy_omnibar_bottom.xml
@@ -85,7 +85,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/keyline_1"
-                    android:paddingStart="@dimen/keyline_0"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent">
@@ -178,7 +177,7 @@
                     android:imeOptions="flagNoExtractUi|actionGo|flagNoPersonalizedLearning"
                     android:inputType="textUri|textNoSuggestions"
                     android:maxLines="1"
-                    android:paddingStart="3dp"
+                    android:paddingStart="5dp"
                     android:selectAllOnFocus="true"
                     android:textColor="?attr/daxColorPrimaryText"
                     android:textColorHighlight="?attr/daxOmnibarTextColorHighlight"