diff --git a/res/values/custom_strings.xml b/res/values/custom_strings.xml
index d8d9ce3..aebb9e7 100644
--- a/res/values/custom_strings.xml
+++ b/res/values/custom_strings.xml
@@ -204,6 +204,7 @@
     <string name="button_manual_brightness">Brightness level</string>
     <string name="unit_sec">sec</string>
     <string name="unit_msec">ms</string>
+    <string name="unit_x1000ms">x1000 ms</string>
     <string name="button_backlight_enable_title">Enable</string>
 
     <string name="navigation_bar_show_title">Show navigation bar</string>
@@ -824,4 +825,11 @@
     <string name="use_old_mobiletype_title">Use old mobile type style</string>
     <string name="use_old_mobiletype_summary">Merge signal and type icons</string>
 
+    <!-- Burn-in Protection -->
+    <string name="navigation_burnin_category">Burn-in Protection</string>
+    <string name="burn_in_protection_title">Enable</string>
+    <string name="burn_in_protection_summary">Shift navabr and statusbar icons to prevent burn-in</string>
+    <string name="burn_in_protection_interval_title">Interval of shift</string>
+    <string name="burn_in_protection_interval_summary">How often to make icons shift</string>
+
 </resources>
diff --git a/res/xml/more_settings.xml b/res/xml/more_settings.xml
index e808965..eafccfd 100644
--- a/res/xml/more_settings.xml
+++ b/res/xml/more_settings.xml
@@ -15,10 +15,35 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+<PreferenceScreen 
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="more_settings"
     android:title="@string/more_settings_title">
 
+    <PreferenceCategory
+        android:key="navigation_burnin"
+        android:title="@string/navigation_burnin_category">
+
+         <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
+            android:key="burn_in_protection"
+            android:title="@string/burn_in_protection_title"
+            android:summary="@string/burn_in_protection_summary"
+            android:dependency="navigation_bar_show"
+            android:defaultValue="true" />
+
+         <org.omnirom.omnilib.preference.SeekBarPreference
+            android:key="burn_in_protection_interval"
+            android:title="@string/burn_in_protection_interval_title"
+            android:summary="@string/burn_in_protection_interval_summary"
+            android:max="90"
+            android:min="45"
+            settings:unitsRight="@string/unit_x1000ms"
+            android:dependency="burn_in_protection"
+            android:persistent="false" />
+
+        </PreferenceCategory>
+
         <PreferenceCategory
             android:key="category_other"
             android:title="@string/other_category">
@@ -28,6 +53,7 @@
                 android:title="@string/show_dashboard_columns_title"
                 android:summary="@string/show_dashboard_columns_summary"
                 android:persistent="false" />
+
             <SwitchPreference
                 android:key="hide_dashboard_summary"
                 android:title="@string/hide_dashboard_summary_title"