From 3c48b3eeca8a53ab16a7525639a4378fceb55c2d Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Thu, 31 Jan 2019 11:33:56 -0800
Subject: [PATCH] Style settings theme, add about category

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../java/org/mozilla/fenix/HomeActivity.kt    | 12 ++-
 .../fenix/settings/SettingsFragment.kt        |  3 +-
 app/src/main/res/drawable/ic_about.xml        | 13 ++-
 .../main/res/drawable/ic_accessibility.xml    |  3 +-
 .../main/res/drawable/ic_bookmark_outline.xml |  1 -
 .../main/res/drawable/ic_data_collection.xml  |  1 -
 app/src/main/res/drawable/ic_feedback.xml     | 16 ++--
 app/src/main/res/drawable/ic_help.xml         |  2 -
 app/src/main/res/drawable/ic_language.xml     |  1 -
 app/src/main/res/drawable/ic_library.xml      |  1 -
 app/src/main/res/drawable/ic_menu.xml         |  1 -
 app/src/main/res/drawable/ic_new.xml          |  1 -
 app/src/main/res/drawable/ic_permission.xml   |  3 +-
 .../main/res/drawable/ic_private_browsing.xml |  3 +-
 app/src/main/res/drawable/ic_search.xml       | 13 +++
 app/src/main/res/drawable/ic_settings.xml     |  1 -
 app/src/main/res/values/strings.xml           | 29 +++++--
 app/src/main/res/values/styles.xml            |  9 ++-
 app/src/main/res/xml/preferences.xml          | 80 ++++++++++++-------
 buildSrc/src/main/java/Dependencies.kt        |  2 +-
 21 files changed, 133 insertions(+), 64 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_search.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ba121514b..2fc676ba5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -49,7 +49,7 @@
             android:name=".settings.SettingsActivity"
             android:label="@string/settings"
             android:parentActivityName=".HomeActivity"
-            android:theme="@style/LightAppTheme" />
+            android:theme="@style/SettingsAppTheme" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
index 08aabd103..96627667d 100644
--- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
@@ -18,9 +18,17 @@ class HomeActivity : AppCompatActivity() {
         setContentView(R.layout.activity_home)
     }
 
-    override fun onCreateView(parent: View?, name: String?, context: Context, attrs: AttributeSet?): View? =
+    override fun onCreateView(
+        parent: View?,
+        name: String,
+        context: Context,
+        attrs: AttributeSet
+    ): View? =
         when (name) {
-            EngineView::class.java.name -> components.core.engine.createView(context, attrs).asView()
+            EngineView::class.java.name -> components.core.engine.createView(
+                context,
+                attrs
+            ).asView()
             else -> super.onCreateView(parent, name, context, attrs)
         }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
index 7ffae300d..7ad4afd61 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
@@ -8,6 +8,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.provider.Settings
 import android.widget.Toast
+import androidx.preference.Preference
 import androidx.preference.Preference.OnPreferenceClickListener
 import androidx.preference.PreferenceFragmentCompat
 import org.mozilla.fenix.R
@@ -37,7 +38,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
     private fun setupPreferences() {
         val makeDefaultBrowserKey = context?.getPreferenceKey(pref_key_make_default_browser)
 
-        val preferenceMakeDefaultBrowser = findPreference(makeDefaultBrowserKey)
+        val preferenceMakeDefaultBrowser = findPreference<Preference>(makeDefaultBrowserKey)
 
         preferenceMakeDefaultBrowser.onPreferenceClickListener = getClickListenerForMakeDefaultBrowser()
     }
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
index 2f3db2dbe..3c835637e 100644
--- a/app/src/main/res/drawable/ic_about.xml
+++ b/app/src/main/res/drawable/ic_about.xml
@@ -1,8 +1,13 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<vector android:height="24dp" android:viewportHeight="16"
-    android:viewportWidth="16" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#0C0C0D" android:fillType="evenOdd" android:pathData="M8,15a7,7 0,1 1,7 -7,7 7,0 0,1 -7,7zM8,2a6,6 0,1 0,6 6,6 6,0 0,0 -6,-6zM8,12a1,1 0,0 1,-1 -1L7,8a1,1 0,0 1,2 0v3a1,1 0,0 1,-1 1zM8,6a1,1 0,1 1,1 -1,1 1,0 0,1 -1,1z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+    <path
+        android:fillColor="#0C0C0D"
+        android:fillType="evenOdd"
+        android:pathData="M8,15a7,7 0,1 1,7 -7,7 7,0 0,1 -7,7zM8,2a6,6 0,1 0,6 6,6 6,0 0,0 -6,-6zM8,12a1,1 0,0 1,-1 -1L7,8a1,1 0,0 1,2 0v3a1,1 0,0 1,-1 1zM8,6a1,1 0,1 1,1 -1,1 1,0 0,1 -1,1z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_accessibility.xml b/app/src/main/res/drawable/ic_accessibility.xml
index b7139743c..254921bb6 100644
--- a/app/src/main/res/drawable/ic_accessibility.xml
+++ b/app/src/main/res/drawable/ic_accessibility.xml
@@ -9,6 +9,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="m12,7c1.3807,0 2.5,-1.1193 2.5,-2.5s-1.1193,-2.5 -2.5,-2.5 -2.5,1.1193 -2.5,2.5 1.1193,2.5 2.5,2.5zM4,9c0,-0.5523 0.4477,-1 1,-1h14c0.5523,0 1,0.4477 1,1s-0.4477,1 -1,1h-4v6,5c0,0.5523 -0.4477,1 -1,1s-1,-0.4477 -1,-1v-5h-2v5c0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1v-5,-6h-4c-0.5523,0 -1,-0.4477 -1,-1z"
-      android:fillColor="#0c0c0d"
-      android:fillAlpha=".8"/>
+      android:fillColor="#0c0c0d" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_bookmark_outline.xml b/app/src/main/res/drawable/ic_bookmark_outline.xml
index ae72b31d3..f29b8088a 100644
--- a/app/src/main/res/drawable/ic_bookmark_outline.xml
+++ b/app/src/main/res/drawable/ic_bookmark_outline.xml
@@ -10,6 +10,5 @@
   <path
       android:pathData="M12,2a1,1 0,0 1,0.87 0.507l2.768,4.884 5.536,0.977a1,1 0,0 1,0.624 1.588l-3.744,4.955 0.934,5.934a1,1 0,0 1,-1.456 1.039L12,18.955l-5.532,2.929a1,1 0,0 1,-1.456 -1.04l0.934,-5.933 -3.744,-4.955a1,1 0,0 1,0.624 -1.588l5.536,-0.977 2.768,-4.884A1,1 0,0 1,12 2zM12,5.028l-2.13,3.76a1,1 0,0 1,-0.696 0.49l-4.391,0.776 3.015,3.99a1,1 0,0 1,0.19 0.759l-0.69,4.378 4.234,-2.241a1,1 0,0 1,0.936 0l4.232,2.24 -0.689,-4.378a1,1 0,0 1,0.19 -0.759l3.015,-3.99 -4.39,-0.775a1,1 0,0 1,-0.697 -0.492L12,5.028z"
       android:fillColor="#0C0C0D"
-      android:fillAlpha=".8"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_data_collection.xml b/app/src/main/res/drawable/ic_data_collection.xml
index 288a60562..311d2e66f 100644
--- a/app/src/main/res/drawable/ic_data_collection.xml
+++ b/app/src/main/res/drawable/ic_data_collection.xml
@@ -10,6 +10,5 @@
   <path
       android:pathData="M22,6a2,2 0,0 1,-2.07 1.999l-3.164,5.062a2,2 0,1 1,-3.762 0.81l-3.117,-2.078A1.992,1.992 0,0 1,8.93 12l-3.164,5.06A2,2 0,1 1,4.07 16l3.164,-5.062a2,2 0,1 1,3.762 -0.81l3.117,2.078A1.992,1.992 0,0 1,15.07 12l3.164,-5.062A2,2 0,1 1,22 6z"
       android:fillColor="#0C0C0D"
-      android:fillAlpha=".8"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_feedback.xml b/app/src/main/res/drawable/ic_feedback.xml
index 92a47e7b7..fbb51a28b 100644
--- a/app/src/main/res/drawable/ic_feedback.xml
+++ b/app/src/main/res/drawable/ic_feedback.xml
@@ -1,9 +1,15 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<vector android:height="24dp" android:viewportHeight="16"
-    android:viewportWidth="16" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#0C0C0D" android:pathData="M13.577,1H2.423A2.426,2.426 0,0 0,0 3.423v6.154A2.426,2.426 0,0 0,2.423 12H8.26l2.966,3.633A1,1 0,0 0,13 15v-3h0.577A2.426,2.426 0,0 0,16 9.577V3.423A2.426,2.426 0,0 0,13.577 1zM14,9.577a0.423,0.423 0,0 1,-0.423 0.423H12a1,1 0,0 0,-1 1v1.194l-1.491,-1.827A1,1 0,0 0,8.734 10H2.423A0.423,0.423 0,0 1,2 9.577V3.423A0.423,0.423 0,0 1,2.423 3h11.154a0.423,0.423 0,0 1,0.423 0.423z"/>
-    <path android:fillColor="#0C0C0D" android:pathData="M11.5,5h-7a0.5,0.5 0,0 0,0 1h7a0.5,0.5 0,0 0,0 -1zM11.5,7h-7a0.5,0.5 0,0 0,0 1h7a0.5,0.5 0,0 0,0 -1z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+    <path
+        android:fillColor="#0C0C0D"
+        android:pathData="M13.577,1H2.423A2.426,2.426 0,0 0,0 3.423v6.154A2.426,2.426 0,0 0,2.423 12H8.26l2.966,3.633A1,1 0,0 0,13 15v-3h0.577A2.426,2.426 0,0 0,16 9.577V3.423A2.426,2.426 0,0 0,13.577 1zM14,9.577a0.423,0.423 0,0 1,-0.423 0.423H12a1,1 0,0 0,-1 1v1.194l-1.491,-1.827A1,1 0,0 0,8.734 10H2.423A0.423,0.423 0,0 1,2 9.577V3.423A0.423,0.423 0,0 1,2.423 3h11.154a0.423,0.423 0,0 1,0.423 0.423z" />
+    <path
+        android:fillColor="#0C0C0D"
+        android:pathData="M11.5,5h-7a0.5,0.5 0,0 0,0 1h7a0.5,0.5 0,0 0,0 -1zM11.5,7h-7a0.5,0.5 0,0 0,0 1h7a0.5,0.5 0,0 0,0 -1z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
index b18310c22..9d605e7fb 100644
--- a/app/src/main/res/drawable/ic_help.xml
+++ b/app/src/main/res/drawable/ic_help.xml
@@ -7,11 +7,9 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillAlpha=".8"
         android:fillColor="#0C0C0D"
         android:pathData="M13.15,17a1.15,1.15 0,1 1,-2.3 0,1.15 1.15,0 0,1 2.3,0zM10.5,9.5c0,-0.764 0.616,-1.5 1.5,-1.5s1.5,0.736 1.5,1.5c0,0.311 -0.144,0.635 -0.408,0.974 -0.199,0.254 -0.386,0.43 -0.57,0.6 -0.077,0.072 -0.153,0.143 -0.23,0.219a1.676,1.676 0,0 1,-0.048 0.045c-0.13,0.117 -0.466,0.42 -0.698,0.757C11.22,12.569 11,13.18 11,14a1,1 0,1 0,2 0c0,-0.431 0.106,-0.645 0.194,-0.772 0.051,-0.074 0.114,-0.144 0.197,-0.225 0.04,-0.039 0.08,-0.075 0.129,-0.12l0.003,-0.002 0.009,-0.008c0.05,-0.045 0.114,-0.104 0.175,-0.166l0.086,-0.08a8.13,8.13 0,0 0,0.876 -0.924c0.4,-0.512 0.831,-1.264 0.831,-2.203C15.5,7.764 14.116,6 12,6S8.5,7.764 8.5,9.5a1,1 0,1 0,2 0z" />
     <path
-        android:fillAlpha=".8"
         android:fillColor="#0C0C0D"
         android:fillType="evenOdd"
         android:pathData="M12,22c5.523,0 10,-4.477 10,-10S17.523,2 12,2 2,6.477 2,12s4.477,10 10,10zM12,20a8,8 0,1 0,0 -16,8 8,0 0,0 0,16z" />
diff --git a/app/src/main/res/drawable/ic_language.xml b/app/src/main/res/drawable/ic_language.xml
index daa7d0317..3aac2d838 100644
--- a/app/src/main/res/drawable/ic_language.xml
+++ b/app/src/main/res/drawable/ic_language.xml
@@ -10,6 +10,5 @@
   <path
       android:pathData="M9.894,3.553a1,1 0,1 0,-1.788 0.894L8.382,5L3,5a1,1 0,0 0,0 2h6.98a0.96,0.96 0,0 0,0.042 0h1.645c-0.715,2.136 -1.8,3.94 -2.953,5.41a7.546,7.546 0,0 1,-1.778 -2.76,1 1,0 0,0 -1.872,0.702 9.527,9.527 0,0 0,2.339 3.574,21.309 21.309,0 0,1 -2.866,2.517 15.843,15.843 0,0 1,-0.975 0.655l-0.037,0.022 -0.011,0.007 -0.01,0.006h-0.001a1,1 0,0 0,0.993 1.736L4,18c0.496,0.868 0.497,0.868 0.498,0.867L4.5,18.867l0.006,-0.005 0.02,-0.011 0.07,-0.042a17.886,17.886 0,0 0,1.117 -0.75,23.305 23.305,0 0,0 3.281,-2.907c0.393,0.24 0.747,0.417 1.03,0.543a6.994,6.994 0,0 0,0.677 0.26l0.015,0.004 0.005,0.001 0.002,0.001h0.002a1,1 0,0 0,0.554 -1.921l-0.003,-0.001 -0.012,-0.004a4.943,4.943 0,0 1,-0.429 -0.168,6.65 6.65,0 0,1 -0.519,-0.259c1.37,-1.753 2.664,-3.955 3.448,-6.608L16,7a1,1 0,1 0,0 -2h-5.382l-0.724,-1.447zM18.626,16L17,11.598 15.374,16h3.252zM19.365,18l0.89,2.412a0.9,0.9 0,0 0,1.69 -0.624l-3.632,-9.83c-0.45,-1.22 -2.176,-1.22 -2.626,0l-3.631,9.83a0.9,0.9 0,1 0,1.688 0.624L14.635,18h4.73z"
       android:fillColor="#0C0C0D"
-      android:fillAlpha=".8"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_library.xml b/app/src/main/res/drawable/ic_library.xml
index 655957841..33784f6a8 100644
--- a/app/src/main/res/drawable/ic_library.xml
+++ b/app/src/main/res/drawable/ic_library.xml
@@ -7,7 +7,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillAlpha=".8"
         android:fillColor="#0C0C0D"
         android:fillType="evenOdd"
         android:pathData="M5,4a1,1 0,1 0,-2 0v16a1,1 0,1 0,2 0L5,4zM9,7a1,1 0,1 0,-2 0v13a1,1 0,1 0,2 0L9,7zM12,5a1,1 0,0 1,1 1v14a1,1 0,1 1,-2 0L11,6a1,1 0,0 1,1 -1zM16.452,5.694a1,1 0,1 0,-1.904 0.612l4.5,14a1,1 0,1 0,1.904 -0.612l-4.5,-14z" />
diff --git a/app/src/main/res/drawable/ic_menu.xml b/app/src/main/res/drawable/ic_menu.xml
index 629c5ff01..d37e13986 100644
--- a/app/src/main/res/drawable/ic_menu.xml
+++ b/app/src/main/res/drawable/ic_menu.xml
@@ -10,6 +10,5 @@
   <path
       android:pathData="M14,6a2,2 0,1 1,-4 0,2 2,0 0,1 4,0zM14,12a2,2 0,1 1,-4 0,2 2,0 0,1 4,0zM12,20a2,2 0,1 0,0 -4,2 2,0 0,0 0,4z"
       android:fillColor="#0C0C0D"
-      android:fillAlpha=".8"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_new.xml b/app/src/main/res/drawable/ic_new.xml
index d22510087..47aa348a9 100644
--- a/app/src/main/res/drawable/ic_new.xml
+++ b/app/src/main/res/drawable/ic_new.xml
@@ -7,7 +7,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillAlpha=".8"
         android:fillColor="#0C0C0D"
         android:fillType="evenOdd"
         android:pathData="M13,4a1,1 0,1 0,-2 0v7H4a1,1 0,1 0,0 2h7v7a1,1 0,1 0,2 0v-7h7a1,1 0,1 0,0 -2h-7V4z" />
diff --git a/app/src/main/res/drawable/ic_permission.xml b/app/src/main/res/drawable/ic_permission.xml
index eddec9edd..f754db17b 100644
--- a/app/src/main/res/drawable/ic_permission.xml
+++ b/app/src/main/res/drawable/ic_permission.xml
@@ -9,6 +9,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="m12,20h5c1.6569,0 3,-1.3431 3,-3v-10c0,-1.6568 -1.3431,-3 -3,-3h-5zM7,2h10c2.7614,0 5,2.2386 5,5v10c0,2.7614 -2.2386,5 -5,5h-10c-2.7614,0 -5,-2.2386 -5,-5v-10c0,-2.7614 2.2386,-5 5,-5zM6.2143,15c0.0152,0.0001 0.0304,-0.0006 0.0455,-0.0021 0.154,-0.0135 0.2941,-0.0945 0.3827,-0.2212l3.0064,-4.9671c0.155,-0.2364 0.094,-0.5531 -0.1375,-0.7151s-0.55,-0.1107 -0.7189,0.1159l-2.6493,4.4563 -0.9971,-0.9971c-0.2052,-0.1981 -0.5313,-0.1953 -0.733,0.0064 -0.2017,0.2017 -0.2045,0.5278 -0.0064,0.7329l1.4379,1.4379c0.098,0.0981 0.231,0.1532 0.3697,0.1532zM13.1464,9.8535c-0.1952,-0.1953 -0.1952,-0.5118 0,-0.7071 0.1953,-0.1953 0.5119,-0.1953 0.7072,0l2.1464,2.1465 2.1464,-2.1465c0.1953,-0.1953 0.5119,-0.1953 0.7072,0 0.1952,0.1953 0.1952,0.5118 0,0.7071l-2.1465,2.1465 2.1465,2.1465c0.1952,0.1952 0.1952,0.5118 0,0.7071 -0.1953,0.1952 -0.5119,0.1952 -0.7072,0l-2.1464,-2.1465 -2.1464,2.1465c-0.1953,0.1952 -0.5119,0.1952 -0.7072,0 -0.1952,-0.1953 -0.1952,-0.5119 0,-0.7071l2.1465,-2.1465z"
-      android:fillColor="#0c0c0d"
-      android:fillAlpha=".8"/>
+      android:fillColor="#0c0c0d" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_private_browsing.xml b/app/src/main/res/drawable/ic_private_browsing.xml
index 78121c70c..f3ad44d43 100644
--- a/app/src/main/res/drawable/ic_private_browsing.xml
+++ b/app/src/main/res/drawable/ic_private_browsing.xml
@@ -9,6 +9,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M17.5,17c-2.1,0 -3.5,-2.5 -5.5,-2.5S8.4,17 6.5,17C3.9,17 2,14.6 2,10.4 2,7.8 2.8,7 6.1,7s4.3,1.4 5.9,1.4c1.6,0 2.6,-1.4 5.9,-1.4 3.3,0 4.1,0.8 4.1,3.4 0,4.2 -1.9,6.6 -4.5,6.6zM7.7,10.2c-2,0.1 -2.9,1.3 -2.9,1.6 0,0.3 1.3,1.1 2.7,1.1 1.3,0 2.9,-0.5 2.9,-0.9 0,-0.5 -0.8,-1.9 -2.7,-1.8zM16.3,10.2c-1.9,-0.1 -2.7,1.3 -2.7,1.8 0,0.4 1.5,0.9 2.9,0.9s2.7,-0.8 2.7,-1.1c-0.1,-0.3 -0.9,-1.5 -2.9,-1.6z"
-      android:fillColor="#0C0C0D"
-      android:fillAlpha=".8"/>
+      android:fillColor="#0C0C0D" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
new file mode 100644
index 000000000..afe20e349
--- /dev/null
+++ b/app/src/main/res/drawable/ic_search.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#0c0c0d"
+        android:pathData="M21.457,20.043l-6,-6a7.528,7.528 0,1 0,-1.414 1.414l6,6a1,1 0,0 0,1.414 -1.414ZM9.5,15A5.5,5.5 0,1 1,15 9.5,5.507 5.507,0 0,1 9.5,15Z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
index 010c5a92f..461c9c33b 100644
--- a/app/src/main/res/drawable/ic_settings.xml
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -7,7 +7,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillAlpha=".8"
         android:fillColor="#0C0C0D"
         android:fillType="evenOdd"
         android:pathData="M12,22a1,1 0,0 1,-1 -1v-3.083a5.966,5.966 0,0 1,-2.477 -1.026l-2.18,2.18a1,1 0,0 1,-1.414 -1.414l2.18,-2.18A5.967,5.967 0,0 1,6.083 13H3a1,1 0,1 1,0 -2h3.083a5.968,5.968 0,0 1,1.026 -2.477l-2.18,-2.18A1,1 0,0 1,6.343 4.93l2.18,2.18A5.968,5.968 0,0 1,11 6.083V3a1,1 0,1 1,2 0v3.083a5.967,5.967 0,0 1,2.476 1.026l2.18,-2.18a1,1 0,1 1,1.415 1.414l-2.18,2.18A5.966,5.966 0,0 1,17.917 11H21a1,1 0,1 1,0 2h-3.083a5.966,5.966 0,0 1,-1.026 2.476l2.18,2.18a1,1 0,0 1,-1.414 1.415l-2.18,-2.18A5.966,5.966 0,0 1,13 17.917V21a1,1 0,0 1,-1 1zM8,12a4,4 0,1 1,8 0,4 4,0 0,1 -8,0z" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 863ef10bf..cb920706e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
+<?xml version="1.0" encoding="utf-8"?><!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <resources>
@@ -24,12 +23,33 @@
     <string name="search_scan_button">Scan</string>
     <string name="search_shortcuts_button">Shortcuts</string>
 
+    <!-- Menu option on the toolbar that takes you to settings page-->
+    <string name="settings">Settings</string>
+
+    <string name="awesomebar_clipboard_title">Fill link from Clipboard</string>
+
+    <!-- Preferences -->
     <!-- Preference category for basic settings -->
     <string name="preferences_category_basics">Basics</string>
 
+    <!-- Preference category for all links about Fenix -->
+    <string name="preferences_category_about">About</string>
+
     <!-- Preference for settings related to changing the default search engine -->
     <string name="preferences_search_engine">Search engine</string>
 
+    <!-- Preference linking to help about Fenix -->
+    <string name="preferences_help">Help</string>
+
+    <!-- Preference link to rating Fenix on the Play Store -->
+    <string name="preferences_rate">Rate on Play Store</string>
+
+    <!-- Preference for giving feedback about Fenix -->
+    <string name="preferences_feedback">Give feedback</string>
+
+    <!-- Preference linking to about page for Fenix -->
+    <string name="preferences_about">About Fenix</string>
+
     <!-- Preference for settings related to saved passwords -->
     <string name="preferences_passwords">Passwords</string>
 
@@ -53,9 +73,4 @@
 
     <!-- Preference for data choices -->
     <string name="preferences_data_choices">Data choices</string>
-
-    <!-- Menu option on the toolbar that takes you to settings page-->
-    <string name="settings">Settings</string>
-
-    <string name="awesomebar_clipboard_title">Fill link from Clipboard</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index eec633bc4..db15db8cd 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -2,7 +2,7 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <style name="LightAppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
@@ -10,6 +10,13 @@
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
+    <style name="SettingsAppTheme" parent="Theme.MaterialComponents.Light">
+        <item name="colorPrimary">@color/offwhite</item>
+        <item name="colorPrimaryDark">@color/offwhite</item>
+        <item name="colorAccent">@color/icons</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
+    </style>
+
     <style name="search_pill" parent="Widget.AppCompat.Button.Borderless">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index dfad75e93..e29a37651 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -3,45 +3,71 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <PreferenceCategory android:title="@string/preferences_category_basics">
+    <PreferenceCategory
+        android:title="@string/preferences_category_basics"
+        app:iconSpaceReserved="false">
         <androidx.preference.Preference
-                android:icon="@drawable/mozac_ic_search"
-                android:key="@string/pref_key_search_engine"
-                android:title="@string/preferences_search_engine"/>
+            android:icon="@drawable/ic_search"
+            android:key="@string/pref_key_search_engine"
+            android:title="@string/preferences_search_engine" />
 
         <androidx.preference.Preference
-                android:icon="@drawable/ic_login"
-                android:key="@string/pref_key_passwords"
-                android:title="@string/preferences_passwords"/>
+            android:icon="@drawable/ic_login"
+            android:key="@string/pref_key_passwords"
+            android:title="@string/preferences_passwords" />
 
         <androidx.preference.Preference
-                android:icon="@drawable/ic_formfill"
-                android:key="@string/pref_key_credit_cards_addresses"
-                android:title="@string/preferences_credit_cards_addresses"/>
+            android:icon="@drawable/ic_formfill"
+            android:key="@string/pref_key_credit_cards_addresses"
+            android:title="@string/preferences_credit_cards_addresses" />
 
-        <androidx.preference.Preference
-                android:key="@string/pref_key_make_default_browser"
-                android:title="@string/preferences_set_as_default_browser"/>
+        <androidx.preference.SwitchPreference
+            android:key="@string/pref_key_make_default_browser"
+            android:title="@string/preferences_set_as_default_browser" />
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/preferences_category_advanced">
+    <PreferenceCategory
+        android:title="@string/preferences_category_advanced"
+        app:iconSpaceReserved="false">
         <androidx.preference.Preference
-                android:icon="@drawable/ic_permission"
-                android:key="@string/pref_key_site_permissions"
-                android:title="@string/preferences_site_permissions"/>
+            android:icon="@drawable/ic_permission"
+            android:key="@string/pref_key_site_permissions"
+            android:title="@string/preferences_site_permissions" />
         <androidx.preference.Preference
-                android:icon="@drawable/ic_accessibility"
-                android:key="@string/pref_key_accessibility"
-                android:title="@string/preferences_accessibility"/>
+            android:icon="@drawable/ic_accessibility"
+            android:key="@string/pref_key_accessibility"
+            android:title="@string/preferences_accessibility" />
         <androidx.preference.Preference
-                android:icon="@drawable/ic_language"
-                android:key="@string/pref_key_language"
-                android:title="@string/preferences_language"/>
+            android:icon="@drawable/ic_language"
+            android:key="@string/pref_key_language"
+            android:title="@string/preferences_language" />
         <androidx.preference.Preference
-                android:icon="@drawable/ic_data_collection"
-                android:key="@string/pref_key_data_choices"
-                android:title="@string/preferences_data_choices"/>
+            android:icon="@drawable/ic_data_collection"
+            android:key="@string/pref_key_data_choices"
+            android:title="@string/preferences_data_choices" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/preferences_category_about"
+        app:iconSpaceReserved="false">
+        <androidx.preference.Preference
+            android:icon="@drawable/ic_help"
+            android:key="@string/pref_key_help"
+            android:title="@string/preferences_help" />
+        <androidx.preference.Preference
+            android:icon="@drawable/ic_bookmark_outline"
+            android:key="@string/pref_key_rate"
+            android:title="@string/preferences_rate" />
+        <androidx.preference.Preference
+            android:icon="@drawable/ic_feedback"
+            android:key="@string/pref_key_feedback"
+            android:title="@string/preferences_feedback" />
+        <androidx.preference.Preference
+            android:icon="@drawable/ic_about"
+            android:key="@string/pref_key_about"
+            android:title="@string/preferences_about" />
     </PreferenceCategory>
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index e59591793..546cf46cd 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -13,7 +13,7 @@ private object Versions {
 
     const val androidx_appcompat = "1.0.2"
     const val androidx_constraint_layout = "2.0.0-alpha3"
-    const val androidx_preference = "1.0.0"
+    const val androidx_preference = "1.1.0-alpha02"
 
     const val mozilla_android_components = "0.41.0-SNAPSHOT"