diff --git a/res/layout/custom_pref_layout.xml b/res/layout/custom_pref_layout.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3a6ec3680769f5c5fd951d20020c62eb24862548
--- /dev/null
+++ b/res/layout/custom_pref_layout.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    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:background="@color/color_default_background"
+    android:focusable="true" >
+
+    <FrameLayout
+        android:id="@+id/icon_frame"
+        android:background="@color/color_default_background"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <ImageView
+            android:id="@android:id/icon"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_gravity="center"
+            />
+    </FrameLayout>
+
+    <RelativeLayout
+        android:background="@color/color_default_background"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="15dip"
+        android:layout_marginEnd="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:textAppearance="?android:attr/textAppearanceMedium"
+            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:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorSecondary"
+            android:maxLines="4" />
+
+    </RelativeLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/custom_settings_toolbar.xml b/res/layout/custom_settings_toolbar.xml
new file mode 100644
index 0000000000000000000000000000000000000000..831ed0b0981a0e69eb5acb60bdad7184bca94b88
--- /dev/null
+++ b/res/layout/custom_settings_toolbar.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/toolbar"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/actionBarSize"
+    android:background="@color/primary_color_dark">
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textStyle="bold"
+        android:textSize="20sp"
+        android:gravity="center_vertical"
+        android:background="@color/primary_color_dark"
+        android:textColor="@color/color_default_primary_text"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentBottom="true"
+        />
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8b1167700d2769590fd3e1677c934245b45ef981..a934f6f5d5d867742a39f60f72fd0de0ef35ce29 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -683,6 +683,10 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar
 
     <style name="Toolbar.Button.Navigation.Tinted" parent="Widget.AppCompat.Toolbar.Button.Navigation">
         <item name="tint">@color/accent</item>
+        <item name="android:src">@drawable/quantum_ic_arrow_back_vd_theme_24</item>
+        <item name="android:minHeight">0dp</item>
+        <item name="android:paddingTop">15dp</item>
+        <item name="android:paddingBottom">10dp</item>
     </style>
 
     <style name="Theme.QuickContact.White.TopBar" parent="@style/Theme.QuickContact">
diff --git a/res/xml/preference_about.xml b/res/xml/preference_about.xml
index 3a71f6e501b4a2c8d81960340ccd6463ee2265d4..e86bac168393cceae44343d3092a36b83ffea3ec 100644
--- a/res/xml/preference_about.xml
+++ b/res/xml/preference_about.xml
@@ -14,75 +14,105 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android" >
     
-    <Preference
-	android:icon="@null"
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
+	    android:icon="@null"
         android:key="contacts_info"
         android:summary="@string/preferences_app_info"
         android:title="@string/preferences_app_info_title" />
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="@string/pref_build_version_key"
         android:title="@string/about_build_version">
-	    
-        <intent
-            android:action="android.intent.action.VIEW"
-	    android:data="https://gitlab.e.foundation/e/os/android_packages_apps_Contacts/-/releases" />
+    </com.android.contacts.preference.CustomPreference>
 
-    </Preference>
-
-    <Preference
-	android:icon="@null"
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
+	    android:icon="@null"
         android:key="about_app"
         android:title="@string/preferences_about_app">
+    </com.android.contacts.preference.CustomPreference>
 
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:data="https://github.com/LineageOS/android_packages_apps_Contacts" />
-
-    </Preference>
-
-    <Preference
-	android:icon="@null"
-	android:title="@string/preferences_licence">
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:data="https://gitlab.e.foundation/e/os/android_packages_apps_Contacts/-/blob/v1-oreo/NOTICE" />
-    </Preference>
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
+        android:icon="@null"
+        android:key="license"
+        android:title="@string/preferences_licence" >
+    </com.android.contacts.preference.CustomPreference>
 
-    <Preference
-	android:icon="@null"   
-	android:title="@string/preferences_authors">
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:data="https://gitlab.e.foundation/e/os/android_packages_apps_Contacts" />
-    </Preference>
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
+        android:icon="@null"
+        android:key="authors"
+        android:title="@string/preferences_authors">
+    </com.android.contacts.preference.CustomPreference>
 
-    <Preference
-	android:icon="@null"
-	android:title="@string/preferences_source_code">
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:data="https://gitlab.e.foundation/e/os/android_packages_apps_Contacts" />
-    </Preference>
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
+        android:icon="@null"
+        android:key="source_code"
+        android:title="@string/preferences_source_code">
+    </com.android.contacts.preference.CustomPreference>
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="@string/pref_open_source_licenses_key"
         android:title="@string/about_open_source_licenses"
         android:summary="@string/about_open_source_licenses_summary"/>
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="@string/pref_privacy_policy_key"
         android:title="@string/about_privacy_policy">
-    </Preference>
+    </com.android.contacts.preference.CustomPreference>
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="@string/pref_terms_of_service_key"
         android:title="@string/about_terms_of_service">
-    </Preference>
+    </com.android.contacts.preference.CustomPreference>
 </PreferenceScreen>
diff --git a/res/xml/preference_display_options.xml b/res/xml/preference_display_options.xml
index c969cd24f15115b3df9de57909a6b9c05f452526..31f2db7e1dc335bb9b5930bf8593cf7f94bd12ff 100644
--- a/res/xml/preference_display_options.xml
+++ b/res/xml/preference_display_options.xml
@@ -14,63 +14,119 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <Preference
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android" >
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="myInfo"
         android:title="@string/settings_my_info_title"/>
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="accounts"
         android:title="@string/settings_accounts">
-    </Preference>
+    </com.android.contacts.preference.CustomPreference>
 
     <com.android.contacts.preference.DefaultAccountPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="defaultAccount"
         android:title="@string/default_editor_account"
         android:dialogTitle="@string/default_editor_account" />
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="customContactsFilter"
         android:title="@string/menu_contacts_filter"/>
 
     <com.android.contacts.preference.SortOrderPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="sortOrder"
         android:title="@string/display_options_sort_list_by"
         android:dialogTitle="@string/display_options_sort_list_by" />
 
     <com.android.contacts.preference.DisplayOrderPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="displayOrder"
         android:title="@string/display_options_view_names_as"
         android:dialogTitle="@string/display_options_view_names_as" />
 
     <com.android.contacts.preference.PhoneticNameDisplayPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="phoneticNameDisplay"
         android:title="@string/display_options_phonetic_name_fields"
         android:dialogTitle="@string/display_options_phonetic_name_fields"/>
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="import"
         android:title="@string/menu_import"/>
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="export"
         android:title="@string/menu_export"/>
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="blockedNumbers"
         android:title="@string/menu_blocked_numbers" />
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
+        android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="about"
         android:title="@string/setting_about"
diff --git a/src/com/android/contacts/activities/LicenseActivity.java b/src/com/android/contacts/activities/LicenseActivity.java
index 9d21a05dde35ce6512d28a6abd42244322d41df1..4ab02ec0ee78956364017cea9a60afe8828e120b 100644
--- a/src/com/android/contacts/activities/LicenseActivity.java
+++ b/src/com/android/contacts/activities/LicenseActivity.java
@@ -24,6 +24,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.webkit.WebView;
 import android.content.res.Configuration;
+import android.widget.TextView;
 
 import androidx.webkit.WebViewFeature;
 import androidx.webkit.WebSettingsCompat;
@@ -49,6 +50,11 @@ public class LicenseActivity extends AppCompatActivity {
         if (actionBar != null) {
             actionBar.setBackgroundDrawable(new ColorDrawable(getColor(R.color.primary_color_dark)));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP);
+            actionBar.setDisplayShowCustomEnabled(true);
+            actionBar.setDisplayShowTitleEnabled(false);
+            actionBar.setCustomView(R.layout.custom_settings_toolbar);
+            TextView titleTextView = actionBar.getCustomView().findViewById(R.id.title);
+            titleTextView.setText(R.string.activity_title_licenses);
         }
         handleDayNightMode(mWebView);
     }
diff --git a/src/com/android/contacts/preference/AboutPreferenceFragment.java b/src/com/android/contacts/preference/AboutPreferenceFragment.java
index 62dcd76259326052da39a7fad531df9dd735db7d..1c9fc0ca8262761f371d4f689695cd828d58b386 100644
--- a/src/com/android/contacts/preference/AboutPreferenceFragment.java
+++ b/src/com/android/contacts/preference/AboutPreferenceFragment.java
@@ -35,6 +35,11 @@ import com.android.contacts.activities.LicenseActivity;
  */
 public class AboutPreferenceFragment extends PreferenceFragment {
 
+    public static final String BUILD_VERSION_URL = "https://gitlab.e.foundation/e/os/android_packages_apps_Contacts/-/releases";
+    public static final String ABOUT_APP_URL = "https://github.com/LineageOS/android_packages_apps_Contacts";
+    public static final String LICENSE_URL = "https://gitlab.e.foundation/e/os/android_packages_apps_Contacts/-/blob/v1-oreo/NOTICE";
+    public static final String AUTHORS_URL = "https://gitlab.e.foundation/e/os/android_packages_apps_Contacts";
+    public static final String SOURCE_CODE_URL = "https://gitlab.e.foundation/e/os/android_packages_apps_Contacts";
     public static final String PRIVACY_POLICY_URL = "https://e.foundation/legal-notice-privacy/";
     public static final String TERMS_OF_SERVICE_URL = "https://e.foundation/legal-notice-privacy/";
 
@@ -60,31 +65,48 @@ public class AboutPreferenceFragment extends PreferenceFragment {
             // Nothing
         }
 
-        final Preference licensePreference = findPreference(
-                getString(R.string.pref_open_source_licenses_key));
-        licensePreference.setIntent(new Intent(getActivity(), LicenseActivity.class));
-
+        final Preference buildVersionPreference = findPreference("pref_build_version");
+        final Preference aboutAppPreference = findPreference("about_app");
+        final Preference licensePreference = findPreference("license");
+        final Preference authorsPreference = findPreference("authors");
+        final Preference sourceCodePreference = findPreference("source_code");
         final Preference privacyPolicyPreference = findPreference("pref_privacy_policy");
         final Preference termsOfServicePreference = findPreference("pref_terms_of_service");
+        final Preference openSourceLicensePreference = findPreference(getString(R.string.pref_open_source_licenses_key));
 
         final Preference.OnPreferenceClickListener listener =
-                new Preference.OnPreferenceClickListener() {
-            @Override
-            public boolean onPreferenceClick(Preference preference) {
-                try {
-                    if (preference == privacyPolicyPreference) {
-                        startActivityForUrl(PRIVACY_POLICY_URL);
-                    } else if (preference == termsOfServicePreference) {
-                        startActivityForUrl(TERMS_OF_SERVICE_URL);
+                preference -> {
+                    try {
+                        if (preference == privacyPolicyPreference) {
+                            startActivityForUrl(PRIVACY_POLICY_URL);
+                        } else if (preference == termsOfServicePreference) {
+                            startActivityForUrl(TERMS_OF_SERVICE_URL);
+                        } else if (preference == buildVersionPreference) {
+                            startActivityForUrl(BUILD_VERSION_URL);
+                        } else if (preference == aboutAppPreference) {
+                            startActivityForUrl(ABOUT_APP_URL);
+                        } else if (preference == licensePreference) {
+                            startActivityForUrl(LICENSE_URL);
+                        } else if (preference == authorsPreference) {
+                            startActivityForUrl(AUTHORS_URL);
+                        } else if (preference == sourceCodePreference) {
+                            startActivityForUrl(SOURCE_CODE_URL);
+                        } else if (preference == openSourceLicensePreference) {
+                            startActivity(new Intent(getActivity(), LicenseActivity.class));
+                        }
+                    } catch (ActivityNotFoundException ex) {
+                        Toast.makeText(getContext(), getString(R.string.url_open_error_toast),
+                                Toast.LENGTH_SHORT).show();
                     }
-                } catch (ActivityNotFoundException ex) {
-                    Toast.makeText(getContext(), getString(R.string.url_open_error_toast),
-                            Toast.LENGTH_SHORT).show();
-                }
-                return true;
-            }
-        };
-
+                    return true;
+                };
+
+        buildVersionPreference.setOnPreferenceClickListener(listener);
+        aboutAppPreference.setOnPreferenceClickListener(listener);
+        licensePreference.setOnPreferenceClickListener(listener);
+        authorsPreference.setOnPreferenceClickListener(listener);
+        sourceCodePreference.setOnPreferenceClickListener(listener);
+        openSourceLicensePreference.setOnPreferenceClickListener(listener);
         privacyPolicyPreference.setOnPreferenceClickListener(listener);
         termsOfServicePreference.setOnPreferenceClickListener(listener);
     }
diff --git a/src/com/android/contacts/preference/ContactsPreferenceActivity.java b/src/com/android/contacts/preference/ContactsPreferenceActivity.java
index c153cc7bffcb6ace4f0b9d924bd794208b3c104f..78ac784d1e39d4c2844643105737d70cf2d0e6f5 100644
--- a/src/com/android/contacts/preference/ContactsPreferenceActivity.java
+++ b/src/com/android/contacts/preference/ContactsPreferenceActivity.java
@@ -37,6 +37,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
 import com.android.contacts.R;
 import com.android.contacts.editor.SelectAccountDialogFragment;
@@ -79,6 +80,9 @@ public final class ContactsPreferenceActivity extends PreferenceActivity
         if (actionBar != null) {
             actionBar.setBackgroundDrawable(new ColorDrawable(getColor(R.color.primary_color_dark)));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP);
+            actionBar.setDisplayShowCustomEnabled(true);
+            actionBar.setDisplayShowTitleEnabled(false);
+            actionBar.setCustomView(R.layout.custom_settings_toolbar);
         }
 
         mProviderStatusWatcher = ProviderStatusWatcher.getInstance(this);
@@ -202,10 +206,8 @@ public final class ContactsPreferenceActivity extends PreferenceActivity
         final ActionBar actionBar = mCompatDelegate.getSupportActionBar();
         if (actionBar != null) {
             actionBar.setBackgroundDrawable(new ColorDrawable(getColor(R.color.primary_color_dark)));
-            //actionBar.setTitle(res);
-            String title=this.getResources().getString(res);
-
-            actionBar.setTitle(title);
+            TextView titleTextView = actionBar.getCustomView().findViewById(R.id.title);
+            titleTextView.setText(res);
 
         }
     }
diff --git a/src/com/android/contacts/preference/CustomPreference.java b/src/com/android/contacts/preference/CustomPreference.java
new file mode 100644
index 0000000000000000000000000000000000000000..9727ac5e87281c6bb559999b4eeda3287702511f
--- /dev/null
+++ b/src/com/android/contacts/preference/CustomPreference.java
@@ -0,0 +1,41 @@
+package com.android.contacts.preference;
+
+import android.content.Context;
+import android.preference.Preference;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+
+public class CustomPreference extends Preference {
+    public CustomPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public CustomPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public CustomPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public CustomPreference(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return true;
+    }
+
+    @Override
+    public View getView(View convertView, ViewGroup parent) {
+        View view = super.getView(convertView, parent);
+        view.setOnClickListener(v -> {
+            if (getOnPreferenceClickListener() != null) {
+                getOnPreferenceClickListener().onPreferenceClick(this);
+            }
+        });
+        return view;
+    }
+}
diff --git a/src/com/android/contacts/preference/DefaultAccountPreference.java b/src/com/android/contacts/preference/DefaultAccountPreference.java
index d43b8d5748d5fa9330123c2aa6523541925a4426..4160be27a2e1fc8830880671d2369438cdfc2090 100644
--- a/src/com/android/contacts/preference/DefaultAccountPreference.java
+++ b/src/com/android/contacts/preference/DefaultAccountPreference.java
@@ -22,6 +22,7 @@ import android.content.DialogInterface;
 import android.preference.DialogPreference;
 import android.util.AttributeSet;
 import android.view.View;
+import android.view.ViewGroup;
 
 import com.android.contacts.model.account.AccountInfo;
 import com.android.contacts.model.account.AccountWithDataSet;
@@ -109,4 +110,16 @@ public class DefaultAccountPreference extends DialogPreference {
             }
         } // else the user dismissed this dialog so leave the preference unchanged.
     }
+
+    @Override
+    public boolean isEnabled() {
+        return true;
+    }
+
+    @Override
+    public View getView(View convertView, ViewGroup parent) {
+        View view = super.getView(convertView, parent);
+        view.setOnClickListener(v -> showDialog(null));
+        return view;
+    }
 }
diff --git a/src/com/android/contacts/preference/DisplayOrderPreference.java b/src/com/android/contacts/preference/DisplayOrderPreference.java
index 801bb248adaf6111b9f68e1c917859d0076f8382..517793c1ba0277ace8636f1a4a84a16addf3657e 100644
--- a/src/com/android/contacts/preference/DisplayOrderPreference.java
+++ b/src/com/android/contacts/preference/DisplayOrderPreference.java
@@ -20,6 +20,8 @@ import android.app.AlertDialog.Builder;
 import android.content.Context;
 import android.preference.ListPreference;
 import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
 
 import com.android.contacts.R;
 
@@ -87,4 +89,16 @@ public final class DisplayOrderPreference extends ListPreference {
         super.onPrepareDialogBuilder(builder);
         builder.setNegativeButton(null, null);
     }
+
+    @Override
+    public boolean isEnabled() {
+        return true;
+    }
+
+    @Override
+    public View getView(View convertView, ViewGroup parent) {
+        View view = super.getView(convertView, parent);
+        view.setOnClickListener(v -> showDialog(null));
+        return view;
+    }
 }
diff --git a/src/com/android/contacts/preference/PhoneticNameDisplayPreference.java b/src/com/android/contacts/preference/PhoneticNameDisplayPreference.java
index 42bbcc3ec02515ec18ab0aa9f03a393dd710d5b9..ab7a3d9d48f17e95ef28c7c6999311c79ab97aa1 100644
--- a/src/com/android/contacts/preference/PhoneticNameDisplayPreference.java
+++ b/src/com/android/contacts/preference/PhoneticNameDisplayPreference.java
@@ -20,6 +20,8 @@ import android.app.AlertDialog.Builder;
 import android.content.Context;
 import android.preference.ListPreference;
 import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
 
 import com.android.contacts.R;
 
@@ -90,4 +92,16 @@ public final class PhoneticNameDisplayPreference extends ListPreference {
         super.onPrepareDialogBuilder(builder);
         builder.setNegativeButton(null, null);
     }
+
+    @Override
+    public boolean isEnabled() {
+        return true;
+    }
+
+    @Override
+    public View getView(View convertView, ViewGroup parent) {
+        View view = super.getView(convertView, parent);
+        view.setOnClickListener(v -> showDialog(null));
+        return view;
+    }
 }
diff --git a/src/com/android/contacts/preference/SortOrderPreference.java b/src/com/android/contacts/preference/SortOrderPreference.java
index 387023112b82b13f7995cfbb2b2f51dc3196daa5..a6a252f4598954f127d76822d2fafbce84bb63f6 100644
--- a/src/com/android/contacts/preference/SortOrderPreference.java
+++ b/src/com/android/contacts/preference/SortOrderPreference.java
@@ -20,6 +20,8 @@ import android.app.AlertDialog.Builder;
 import android.content.Context;
 import android.preference.ListPreference;
 import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
 
 import com.android.contacts.R;
 
@@ -87,4 +89,16 @@ public final class SortOrderPreference extends ListPreference {
         super.onPrepareDialogBuilder(builder);
         builder.setNegativeButton(null, null);
     }
+
+    @Override
+    public boolean isEnabled() {
+        return true;
+    }
+
+    @Override
+    public View getView(View convertView, ViewGroup parent) {
+        View view = super.getView(convertView, parent);
+        view.setOnClickListener(v -> showDialog(null));
+        return view;
+    }
 }