diff --git a/res/layout/notif_priority_conversation_preference.xml b/res/layout/notif_priority_conversation_preference.xml
index 5da1238dd53..d07bc23b883 100644
--- a/res/layout/notif_priority_conversation_preference.xml
+++ b/res/layout/notif_priority_conversation_preference.xml
@@ -31,27 +31,32 @@
         android:padding="@dimen/notification_importance_button_padding"
         android:clickable="true"
         android:focusable="true">
-        <ImageView
-            android:id="@+id/icon"
-            android:src="@drawable/ic_important_outline"
-            android:background="@android:color/transparent"
-            android:layout_gravity="center"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:clickable="false"
-            android:focusable="false"/>
-        <TextView
-            android:id="@+id/label"
+        <LinearLayout
+            android:id="@+id/icon_label_container"
+            android:gravity="center_vertical"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:clickable="false"
-            android:focusable="false"
-            android:layout_toEndOf="@id/icon"
-            android:layout_marginStart="@dimen/notification_importance_drawable_padding"
-            android:textAppearance="@style/TextAppearance.NotificationImportanceButton.Unselected"
-            android:text="@string/notification_priority_title"/>
+            android:orientation="horizontal">
+            <ImageView
+                android:id="@+id/icon"
+                android:src="@drawable/ic_important_outline"
+                android:background="@android:color/transparent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:clickable="false"
+                android:focusable="false"/>
+            <TextView
+                android:id="@+id/label"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:clickable="false"
+                android:focusable="false"
+                android:layout_marginStart="@dimen/notification_importance_drawable_padding"
+                android:textAppearance="@style/TextAppearance.NotificationImportanceButton.Unselected"
+                android:text="@string/notification_priority_title"/>
+        </LinearLayout>
         <TextView
             android:id="@+id/summary"
             android:paddingTop="@dimen/notification_importance_button_padding"
@@ -62,7 +67,6 @@
             android:focusable="false"
             android:ellipsize="end"
             android:maxLines="4"
-            android:layout_below="@id/icon"
             android:textAppearance="@style/TextAppearance.NotificationImportanceDetail"
             android:visibility="gone" />
     </com.android.settings.notification.NotificationButtonRelativeLayout>
@@ -75,27 +79,32 @@
         android:layout_marginTop="@dimen/notification_importance_button_separation"
         android:clickable="true"
         android:focusable="true">
-        <ImageView
-            android:id="@+id/icon"
-            android:src="@drawable/ic_notifications_alert"
-            android:background="@android:color/transparent"
-            android:layout_gravity="center"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:clickable="false"
-            android:focusable="false"/>
-        <TextView
-            android:id="@+id/label"
+        <LinearLayout
+            android:id="@+id/icon_label_container"
+            android:gravity="center_vertical"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:clickable="false"
-            android:focusable="false"
-            android:layout_toEndOf="@id/icon"
-            android:layout_marginStart="@dimen/notification_importance_drawable_padding"
-            android:textAppearance="@style/TextAppearance.NotificationImportanceButton.Unselected"
-            android:text="@string/notification_alert_title"/>
+            android:orientation="horizontal">
+            <ImageView
+                android:id="@+id/icon"
+                android:src="@drawable/ic_notifications_alert"
+                android:background="@android:color/transparent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:clickable="false"
+                android:focusable="false"/>
+            <TextView
+                android:id="@+id/label"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:clickable="false"
+                android:focusable="false"
+                android:layout_marginStart="@dimen/notification_importance_drawable_padding"
+                android:textAppearance="@style/TextAppearance.NotificationImportanceButton.Unselected"
+                android:text="@string/notification_alert_title"/>
+        </LinearLayout>
         <TextView
             android:id="@+id/summary"
             android:paddingTop="@dimen/notification_importance_button_padding"
@@ -106,7 +115,7 @@
             android:focusable="false"
             android:ellipsize="end"
             android:maxLines="2"
-            android:layout_below="@id/icon"
+            android:layout_below="@id/icon_label_container"
             android:textAppearance="@style/TextAppearance.NotificationImportanceDetail"
             android:visibility="gone" />
     </com.android.settings.notification.NotificationButtonRelativeLayout>
@@ -119,27 +128,32 @@
         android:layout_marginTop="@dimen/notification_importance_button_separation"
         android:clickable="true"
         android:focusable="true">
-        <ImageView
-            android:id="@+id/icon"
-            android:src="@drawable/ic_notifications_off_24dp"
-            android:background="@android:color/transparent"
-            android:layout_gravity="center"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:clickable="false"
-            android:focusable="false"/>
-        <TextView
-            android:id="@+id/label"
+        <LinearLayout
+            android:id="@+id/icon_label_container"
+            android:gravity="center_vertical"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:clickable="false"
-            android:focusable="false"
-            android:layout_toEndOf="@id/icon"
-            android:layout_marginStart="@dimen/notification_importance_drawable_padding"
-            android:textAppearance="@style/TextAppearance.NotificationImportanceButton.Unselected"
-            android:text="@string/notification_silence_title"/>
+            android:orientation="horizontal">
+            <ImageView
+                android:id="@+id/icon"
+                android:src="@drawable/ic_notifications_off_24dp"
+                android:background="@android:color/transparent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:clickable="false"
+                android:focusable="false"/>
+            <TextView
+                android:id="@+id/label"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:clickable="false"
+                android:focusable="false"
+                android:layout_marginStart="@dimen/notification_importance_drawable_padding"
+                android:textAppearance="@style/TextAppearance.NotificationImportanceButton.Unselected"
+                android:text="@string/notification_silence_title"/>
+        </LinearLayout>
         <TextView
             android:id="@+id/summary"
             android:paddingTop="@dimen/notification_importance_button_padding"
@@ -150,7 +164,7 @@
             android:focusable="false"
             android:ellipsize="end"
             android:maxLines="2"
-            android:layout_below="@id/icon"
+            android:layout_below="@id/icon_label_container"
             android:textAppearance="@style/TextAppearance.NotificationImportanceDetail"
             android:visibility="gone" />
     </com.android.settings.notification.NotificationButtonRelativeLayout>