diff --git a/app/src/main/java/com/fastaccess/ui/modules/settings/category/SettingsCategoryFragment.java b/app/src/main/java/com/fastaccess/ui/modules/settings/category/SettingsCategoryFragment.java
index 30f6eb3d..d97f51b4 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/settings/category/SettingsCategoryFragment.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/settings/category/SettingsCategoryFragment.java
@@ -32,6 +32,8 @@ public class SettingsCategoryFragment extends PreferenceFragmentCompat implement
 
     private Preference signatureVia;
     private Preference notificationTime;
+    private Preference notificationRead;
+    private Preference notificationSound;
 
     @Override public void onAttach(Context context) {
         super.onAttach(context);
@@ -47,10 +49,15 @@ public class SettingsCategoryFragment extends PreferenceFragmentCompat implement
             case 0:
                 addPreferencesFromResource(R.xml.notification_settings);
                 notificationTime = findPreference("notificationTime");
+                notificationRead = findPreference("markNotificationAsRead");
+                notificationSound = findPreference("notificationSound");
                 findPreference("notificationTime").setOnPreferenceChangeListener(this);
                 findPreference("notificationEnabled").setOnPreferenceChangeListener(this);
-                if(!PrefHelper.getBoolean("notificationEnabled"))
+                if(!PrefHelper.getBoolean("notificationEnabled")) {
                     getPreferenceScreen().removePreference(notificationTime);
+                    getPreferenceScreen().removePreference(notificationRead);
+                    getPreferenceScreen().removePreference(notificationSound);
+                }
                 break;
             case 1:
                 addPreferencesFromResource(R.xml.behaviour_settings);
@@ -95,10 +102,14 @@ public class SettingsCategoryFragment extends PreferenceFragmentCompat implement
         if (preference.getKey().equalsIgnoreCase("notificationEnabled")) {
             if ((boolean)newValue) {
                 getPreferenceScreen().addPreference(notificationTime);
+                getPreferenceScreen().addPreference(notificationRead);
+                getPreferenceScreen().addPreference(notificationSound);
                 NotificationSchedulerJobTask.scheduleJob(getActivity().getApplicationContext(),
                         PrefGetter.notificationDurationMillis(getActivity().getApplicationContext(), PrefHelper.getString("notificationTime")), true);
             } else {
                 getPreferenceScreen().removePreference(notificationTime);
+                getPreferenceScreen().removePreference(notificationRead);
+                getPreferenceScreen().removePreference(notificationSound);
                 NotificationSchedulerJobTask.scheduleJob(getActivity().getApplicationContext(), -1, true);
             }
             return true;
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 5c38a2b5..32dda996 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -6,7 +6,6 @@
     </string-array>
 
     <string-array name="notification_duration">
-        <item>@string/turn_off</item>
         <item>@string/one_minute</item>
         <item>@string/five_minutes</item>
         <item>@string/ten_minutes</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bf17276a..c37330aa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -237,18 +237,18 @@
     <string name="commits_reflected">Commits have been switched to the selected branch</string>
     <string name="general_settings">General</string>
     <string name="background_job_summary">Change how frequently FastHub checks for new notifications</string>
-    <string name="background_job_title">Notification sync interval</string>
+    <string name="background_job_title">Notification Sync Interval</string>
     <string name="every">Every</string>
     <string name="behavior">Behavior</string>
     <string name="customization">Customization</string>
     <string name="recycler_view_animation_summary">Enable list animations</string>
-    <string name="recycler_view_animation_title">List animation</string>
+    <string name="recycler_view_animation_title">List Animation</string>
     <string name="back_button_summary">Disable dialog preventing accidental app closure</string>
-    <string name="back_button_title">Press back to exit</string>
+    <string name="back_button_title">Press Back to Exit</string>
     <string name="unsaved_data_warning">Any unsaved changes will be discarded</string>
     <string name="private_repo">Private</string>
     <string name="rect_avatar_summary">Use rounded rectangle avatars instead of circular avatars</string>
-    <string name="rect_avatar_title">Avatar appearance</string>
+    <string name="rect_avatar_title">Avatar Appearance</string>
     <string name="rate_app">Rate this app</string>
     <string name="author">Author</string>
     <string name="fork_github">Fork on GitHub</string>
@@ -387,8 +387,8 @@
     <string name="wrap_code_title">Wrap Code</string>
     <string name="open_source_libs">Open source libraries</string>
     <string name="enable_notification_sound_summary">Enable notification sound once a notification is received.</string>
-    <string name="enable_notification_sound_title">Enable notification sound</string>
-    <string name="enable_notification_title">Enable notification</string>
+    <string name="enable_notification_sound_title">Enable Notification Sound</string>
+    <string name="enable_notification_title">Enable Notifications</string>
     <string name="login_with_personal_token">Login with personal token</string>
     <string name="personal_token">Personal Token</string>
     <string name="basic_login">Login via basic auth</string>
diff --git a/app/src/main/res/xml/about_settings.xml b/app/src/main/res/xml/about_settings.xml
index 099bfc30..43cb0597 100644
--- a/app/src/main/res/xml/about_settings.xml
+++ b/app/src/main/res/xml/about_settings.xml
@@ -13,15 +13,6 @@
         android:key="showChangelog"
         android:title="@string/changelog"/>
 
-    <Preference
-        android:icon="@drawable/ic_info"
-        android:key="about"
-        android:title="@string/about">
-        <intent
-            android:targetClass="com.fastaccess.ui.modules.about.FastHubAboutActivity"
-            android:targetPackage="com.fastaccess.github"/>
-    </Preference>
-
     <Preference
         android:icon="@drawable/ic_update"
         android:key="currentVersion"