diff --git a/app/src/main/res/drawable-night-hdpi/round_whatshot_24.png b/app/src/main/res/drawable-night-hdpi/round_whatshot_24.png
new file mode 100644
index 0000000..327cad7
Binary files /dev/null and b/app/src/main/res/drawable-night-hdpi/round_whatshot_24.png differ
diff --git a/app/src/main/res/drawable-night-mdpi/round_whatshot_24.png b/app/src/main/res/drawable-night-mdpi/round_whatshot_24.png
new file mode 100644
index 0000000..a7c3ebd
Binary files /dev/null and b/app/src/main/res/drawable-night-mdpi/round_whatshot_24.png differ
diff --git a/app/src/main/res/drawable-night-xhdpi/round_whatshot_24.png b/app/src/main/res/drawable-night-xhdpi/round_whatshot_24.png
new file mode 100644
index 0000000..04e90d4
Binary files /dev/null and b/app/src/main/res/drawable-night-xhdpi/round_whatshot_24.png differ
diff --git a/app/src/main/res/drawable-night-xxhdpi/round_whatshot_24.png b/app/src/main/res/drawable-night-xxhdpi/round_whatshot_24.png
new file mode 100644
index 0000000..30e3f10
Binary files /dev/null and b/app/src/main/res/drawable-night-xxhdpi/round_whatshot_24.png differ
diff --git a/app/src/main/res/drawable-night-xxxhdpi/round_whatshot_24.png b/app/src/main/res/drawable-night-xxxhdpi/round_whatshot_24.png
new file mode 100644
index 0000000..eac8f1a
Binary files /dev/null and b/app/src/main/res/drawable-night-xxxhdpi/round_whatshot_24.png differ
diff --git a/app/src/main/res/drawable/round_whatshot_24.xml b/app/src/main/res/drawable/round_whatshot_24.xml
new file mode 100644
index 0000000..51e62bb
--- /dev/null
+++ b/app/src/main/res/drawable/round_whatshot_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,2 C17.52,2 22,6.48 22,12 C22,17.52 17.52,22 12,22 C8.60140323,22 5.59704082,20.3017597 3.78977332,17.7081397 L7.858,13.729 L9.77375195,15.6035718 L9.88425622,15.7006843 C10.4184016,16.1215053 11.1983648,16.0891345 11.6946921,15.6035718 L15.561,11.803 L16.3304521,12.5624324 C16.8335808,13.0546514 17.7031884,12.7057839 17.7031884,12.0028208 L17.7031884,8.59155514 C17.719368,8.1529144 17.3600586,7.796447 16.9071394,7.796447 L13.4458663,7.796447 L13.3405819,7.80272186 C12.691447,7.88124132 12.3858008,8.6782749 12.8698593,9.15183482 L13.634,9.904 L10.739,12.762 L8.82427253,10.8898924 C8.29249331,10.3696467 7.4351116,10.3696467 6.90333238,10.8898924 L2.5166574,15.1793563 C2.18157547,14.180435 2,13.1112932 2,12 C2,6.48 6.48,2 12,2 Z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_preferences.xml b/app/src/main/res/layout/fragment_preferences.xml
index 383827a..45f0432 100644
--- a/app/src/main/res/layout/fragment_preferences.xml
+++ b/app/src/main/res/layout/fragment_preferences.xml
@@ -30,7 +30,7 @@
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="Look &amp; feel"
+                android:text="@string/look_and_feel_header"
                 android:paddingTop="16dp"
                 android:paddingStart="20dp"
                 android:paddingEnd="20dp"
@@ -65,11 +65,11 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         style="@style/AnotherWidget.Settings.Title"
-                        android:text="Typography"/>
+                        android:text="@string/typography_settings_title"/>
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="Text font, size and color"
+                        android:text="@string/typography_settings_subtitle"
                         style="@style/AnotherWidget.Settings.Subtitle"/>
                 </LinearLayout>
             </LinearLayout>
@@ -103,11 +103,11 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         style="@style/AnotherWidget.Settings.Title"
-                        android:text="Layout"/>
+                        android:text="@string/layout_settings_title"/>
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="Change the widget design"
+                        android:text="@string/layout_settings_subtitle"
                         style="@style/AnotherWidget.Settings.Subtitle"/>
                 </LinearLayout>
             </LinearLayout>
@@ -151,7 +151,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="Change the clock "
+                            android:text="@string/clock_settings_subtitle"
                             style="@style/AnotherWidget.Settings.Subtitle"/>
                     </LinearLayout>
                     <LinearLayout
@@ -178,8 +178,9 @@
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="Smart content"
+                android:text="@string/smart_content_header"
                 android:paddingTop="16dp"
+                android:paddingBottom="12dp"
                 android:paddingStart="20dp"
                 android:paddingEnd="20dp"
                 android:textAppearance="@style/AnotherWidget.Settings.Header" />
@@ -192,8 +193,8 @@
                     android:layout_width="0dp"
                     android:layout_weight="1"
                     android:layout_height="wrap_content"
-                    android:paddingTop="12dp"
-                    android:paddingBottom="12dp"
+                    android:paddingTop="4dp"
+                    android:paddingBottom="4dp"
                     android:paddingLeft="8dp"
                     android:paddingRight="0dp"
                     android:orientation="horizontal"
@@ -220,11 +221,6 @@
                             android:layout_height="wrap_content"
                             style="@style/AnotherWidget.Settings.Title"
                             android:text="@string/settings_calendar_title"/>
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="Change the widget design"
-                            style="@style/AnotherWidget.Settings.Subtitle"/>
                     </LinearLayout>
                     <LinearLayout
                         android:layout_width="1dp"
@@ -256,8 +252,8 @@
                     android:layout_width="0dp"
                     android:layout_weight="1"
                     android:layout_height="wrap_content"
-                    android:paddingTop="12dp"
-                    android:paddingBottom="12dp"
+                    android:paddingTop="4dp"
+                    android:paddingBottom="4dp"
                     android:paddingLeft="8dp"
                     android:paddingRight="0dp"
                     android:orientation="horizontal"
@@ -285,11 +281,6 @@
                             android:layout_height="wrap_content"
                             style="@style/AnotherWidget.Settings.Title"
                             android:text="@string/settings_weather_title"/>
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="Change the widget design"
-                            style="@style/AnotherWidget.Settings.Subtitle"/>
                     </LinearLayout>
                     <LinearLayout
                         android:layout_width="1dp"
@@ -321,8 +312,8 @@
                     android:layout_width="0dp"
                     android:layout_weight="1"
                     android:layout_height="wrap_content"
-                    android:paddingTop="12dp"
-                    android:paddingBottom="12dp"
+                    android:paddingTop="4dp"
+                    android:paddingBottom="4dp"
                     android:paddingLeft="8dp"
                     android:paddingRight="0dp"
                     android:orientation="horizontal"
@@ -334,9 +325,9 @@
                     <ImageView
                         android:layout_width="48dp"
                         android:layout_height="48dp"
-                        android:padding="10dp"
+                        android:padding="12dp"
                         app:tint="@color/colorPrimaryText"
-                        android:src="@drawable/round_pageview"/>
+                        android:src="@drawable/round_whatshot_24"/>
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_weight="1"
@@ -349,18 +340,13 @@
                             android:layout_height="wrap_content"
                             style="@style/AnotherWidget.Settings.Title"
                             android:text="@string/settings_at_a_glance_title"/>
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="Change glace info"
-                            style="@style/AnotherWidget.Settings.Subtitle"/>
                     </LinearLayout>
                 </LinearLayout>
             </LinearLayout>
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="Gestures &amp; input"
+                android:text="@string/gestures_amp_input_header"
                 android:paddingTop="16dp"
                 android:paddingStart="20dp"
                 android:paddingEnd="20dp"
@@ -395,11 +381,11 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         style="@style/AnotherWidget.Settings.Title"
-                        android:text="Gestures"/>
+                        android:text="@string/gestures_settings_title"/>
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="Change the widget design"
+                        android:text="@string/gestures_settings_subtitle"
                         style="@style/AnotherWidget.Settings.Subtitle"/>
                 </LinearLayout>
             </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 14b2be2..21a80fd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -187,7 +187,7 @@
 
     <!-- Glance -->
     <string name="settings_show_next_alarm_title">Next clock alarm</string>
-    <string name="settings_at_a_glance_title">Glance</string>
+    <string name="settings_at_a_glance_title">At a glance</string>
     <string name="settings_show_music_title">Current playing song</string>
     <string name="settings_request_notification_access">We need the notification access permission to check the current playing song.</string>
     <string name="settings_request_last_notification_access">We need the notification access permission to check your last notifications.</string>
@@ -326,4 +326,16 @@
     <string name="nothing">Nothing</string>
     <string name="action_dismiss">Dismiss</string>
     <string name="action_accept">Accept</string>
+
+    <!-- More -->
+    <string name="look_and_feel_header"><![CDATA[Look & feel]]></string>
+    <string name="typography_settings_title">Typography</string>
+    <string name="typography_settings_subtitle">Set text font, size and color</string>
+    <string name="layout_settings_title">Layout</string>
+    <string name="gestures_settings_subtitle">Actions, behaviour and shortcuts</string>
+    <string name="gestures_settings_title">Gestures</string>
+    <string name="gestures_amp_input_header"><![CDATA[Gestures & input]]></string>
+    <string name="clock_settings_subtitle">Set size, color and time zones</string>
+    <string name="layout_settings_subtitle">Widget spacing and tweaks</string>
+    <string name="smart_content_header">Smart content</string>
 </resources>