diff --git a/res/layout/modes_edit_name.xml b/res/layout/modes_edit_name.xml
index 0b086c746ed..7f1a1e606a3 100644
--- a/res/layout/modes_edit_name.xml
+++ b/res/layout/modes_edit_name.xml
@@ -20,7 +20,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:paddingBottom="8dp">
 
     <EditText
         android:layout_width="match_parent"
diff --git a/res/layout/modes_icon_list.xml b/res/layout/modes_icon_list.xml
index f6f220262ff..b189ce661bd 100644
--- a/res/layout/modes_icon_list.xml
+++ b/res/layout/modes_icon_list.xml
@@ -28,8 +28,7 @@
         android:layout_height="wrap_content"
         android:clipToPadding="true"
         android:nestedScrollingEnabled="false"
-        android:paddingStart="12dp"
-        android:paddingEnd="12dp"
+        android:padding="12dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4780e52f960..36197b0da08 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -9581,6 +9581,9 @@
     <!-- Modes: Hint for the EditText for editing a mode's name [CHAR LIMIT=30] -->
     <string name="zen_mode_edit_name_hint">Mode name</string>
 
+    <!-- Modes: Text shown above the list of icons in the mode editor. [CHAR LIMIT=40] -->
+    <string name="zen_mode_edit_choose_icon_title">Choose an icon</string>
+
     <!-- Modes: Trigger title for modes of type SCHEDULE_CALENDAR. [CHAR LIMIT=30] -->
     <string name="zen_mode_trigger_title_schedule_calendar">Calendar events</string>
     <!-- Modes: Trigger title for modes of type BEDTIME. [CHAR LIMIT=30] -->
diff --git a/res/xml/modes_edit_name_icon.xml b/res/xml/modes_edit_name_icon.xml
index 2109c776ac8..4bcf67deccc 100644
--- a/res/xml/modes_edit_name_icon.xml
+++ b/res/xml/modes_edit_name_icon.xml
@@ -33,13 +33,15 @@
         android:key="name"
         android:layout="@layout/modes_edit_name" />
 
-    <com.android.settings.applications.SpacePreference
-        android:layout_height="32dp" />
+    <PreferenceCategory
+        android:title="@string/zen_mode_edit_choose_icon_title"
+        android:key="modes_filters">
 
-    <com.android.settingslib.widget.LayoutPreference
-        android:key="icon_list"
-        android:selectable="false"
-        android:layout="@layout/modes_icon_list"/>
+        <com.android.settingslib.widget.LayoutPreference
+            android:key="icon_list"
+            android:selectable="false"
+            android:layout="@layout/modes_icon_list" />
+    </PreferenceCategory>
 
     <com.android.settingslib.widget.LayoutPreference
         android:key="done"