diff --git a/res/layout/preference_item.xml b/res/layout/preference_item.xml
new file mode 100644
index 000000000..09c96bb81
--- /dev/null
+++ b/res/layout/preference_item.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2015 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
+    android:paddingEnd="?android:attr/scrollbarSize"
+    android:paddingRight="?android:attr/scrollbarSize"
+    android:background="?android:attr/selectableItemBackground"
+    android:focusable="true" >
+
+    <LinearLayout
+        android:id="@+id/icon_frame"
+        android:layout_width="56dp"
+        android:paddingLeft="8dp"
+        android:paddingStart="8dp"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        >
+        <android.support.v7.internal.widget.PreferenceImageView
+            android:id="@android:id/icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:maxWidth="48dp"
+            app:maxHeight="48dp" />
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="15dip"
+        android:layout_marginLeft="15dip"
+        android:layout_marginEnd="6dip"
+        android:layout_marginRight="6dip"
+        android:layout_marginTop="6dip"
+        android:layout_marginBottom="6dip"
+        android:layout_weight="1">
+
+        <TextView android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textSize="16sp"
+            android:textColor="?android:attr/textColorPrimary"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal" />
+
+        <TextView android:id="@android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignStart="@android:id/title"
+            android:layout_alignLeft="@android:id/title"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorSecondary"
+            android:maxLines="4" />
+
+    </RelativeLayout>
+
+    <!-- Preference should place its actual preference widget here. -->
+    <LinearLayout android:id="@android:id/widget_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"
+        android:orientation="vertical" />
+
+</LinearLayout>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 279262cf3..9fe8b7ae6 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -7,30 +7,37 @@
 
     <Preference android:key="preference_category_notifications"
                 android:title="@string/pref_notifications"
-                android:icon="@drawable/ic_notifications_24dp"/>
+                android:icon="@drawable/ic_notifications_24dp"
+                android:layout="@layout/preference_item" />
 
     <Preference android:key="preference_category_app_protection"
                 android:title="@string/pref_privacy"
-                android:icon="@drawable/ic_security_24dp"/>
+                android:icon="@drawable/ic_security_24dp"
+                android:layout="@layout/preference_item" />
 
     <Preference android:key="preference_category_appearance"
                 android:title="@string/pref_appearance"
-                android:icon="@drawable/ic_brightness_6_24dp"/>
+                android:icon="@drawable/ic_brightness_6_24dp"
+                android:layout="@layout/preference_item" />
 
     <Preference android:key="preference_category_chats"
                 android:title="@string/pref_chats_and_media"
-                android:icon="@drawable/ic_forum_24dp"/>
+                android:icon="@drawable/ic_forum_24dp"
+                android:layout="@layout/preference_item" />
 
     <Preference android:key="preference_category_advanced"
                 android:title="@string/menu_advanced"
-                android:icon="@drawable/ic_advanced_24dp"/>
+                android:icon="@drawable/ic_advanced_24dp"
+                android:layout="@layout/preference_item" />
 
     <Preference android:key="preference_category_invite"
                 android:title="@string/menu_invite"
-                android:icon="@drawable/ic_invite_24dp"/>
+                android:icon="@drawable/ic_invite_24dp"
+                android:layout="@layout/preference_item" />
 
     <Preference android:key="preference_category_help"
                 android:title="@string/menu_help"
-                android:icon="@drawable/ic_help_24dp"/>
+                android:icon="@drawable/ic_help_24dp"
+                android:layout="@layout/preference_item" />
 
 </PreferenceScreen>