diff --git a/res/drawable-hdpi/ic_menu_save.png b/res/drawable-hdpi/ic_menu_save.png
new file mode 100644
index 00000000000..bb593cfc254
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_save.png differ
diff --git a/res/drawable-mdpi/ic_menu_save.png b/res/drawable-mdpi/ic_menu_save.png
new file mode 100644
index 00000000000..ec244ac7fea
Binary files /dev/null and b/res/drawable-mdpi/ic_menu_save.png differ
diff --git a/res/drawable-xhdpi/ic_menu_save.png b/res/drawable-xhdpi/ic_menu_save.png
new file mode 100644
index 00000000000..7119441ed18
Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_save.png differ
diff --git a/res/drawable-xxhdpi/ic_menu_save.png b/res/drawable-xxhdpi/ic_menu_save.png
new file mode 100644
index 00000000000..20f0b6b8235
Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_save.png differ
diff --git a/res/layout/wakelock_blocker.xml b/res/layout/wakelock_blocker.xml
new file mode 100644
index 00000000000..e698bfe054b
--- /dev/null
+++ b/res/layout/wakelock_blocker.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
+    android:paddingEnd="?android:attr/scrollbarSize"
+    android:background="?android:attr/selectableItemBackground"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <RelativeLayout
+            android:layout_width="200dip"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dip"
+            android:layout_marginBottom="6dip"
+            android:layout_weight="1">
+
+            <TextView android:id="@+id/wakelock_blocker_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:ellipsize="marquee"
+                android:text="@string/wakelock_blocker_title"
+                android:fadingEdge="horizontal" />
+
+            <TextView android:id="@+id/wakelock_blocker_title_summary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/wakelock_blocker_title"
+                android:layout_alignStart="@id/wakelock_blocker_title"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="?android:attr/textColorSecondary"
+                android:text="@string/wakelock_blocker_summary"
+                android:maxLines="4" />
+
+        </RelativeLayout>
+
+        <LinearLayout android:id="@+android:id/widget_frame"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="vertical" >
+
+            <Switch
+                android:id="@+id/wakelock_blocker_switch"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="4dip"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/wakelock_list_header"
+        android:text="@string/wakelock_list_header"
+        style="?android:attr/listSeparatorTextViewStyle" />
+
+    <ListView
+        android:id="@+id/wakelock_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</LinearLayout>
diff --git a/res/layout/wakelock_item.xml b/res/layout/wakelock_item.xml
new file mode 100644
index 00000000000..ac8c64c5ce5
--- /dev/null
+++ b/res/layout/wakelock_item.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content">
+
+    <CheckBox
+        android:id="@+id/wakelock_blocked"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:focusable="false"/>
+
+</LinearLayout>
diff --git a/res/values/slim_strings.xml b/res/values/slim_strings.xml
index 7319b1e7ce0..2f8be43be01 100644
--- a/res/values/slim_strings.xml
+++ b/res/values/slim_strings.xml
@@ -1314,4 +1314,13 @@
     <string name="volume_steps_7">7</string>
     <string name="volume_steps_5">5</string>
 
+    <!-- Wakelock blocker -->
+    <string name="wakelock_blocker_title">Wakelock blocker</string>
+    <string name="wakelock_blocker_summary">Block system wakelocks use with caution</string>
+    <string name="wakelock_blocker_save">Save</string>
+    <string name="wakelock_list_header">Available wakelocks</string>
+    <string name="wakelock_blocker_reload">Reload</string>
+    <string name="wakelock_blocker_warning_title">Proceed with caution</string>
+    <string name="wakelock_blocker_warning">Blocking wakelocks have the potential to cause instability, crashes or data loss</string>
+
 </resources>
diff --git a/res/xml/slim_advanced_settings.xml b/res/xml/slim_advanced_settings.xml
index 63d8880bad6..75efcc0f468 100644
--- a/res/xml/slim_advanced_settings.xml
+++ b/res/xml/slim_advanced_settings.xml
@@ -69,6 +69,12 @@
                 android:targetClass="com.cyngn.maxxaudio.activity.ActivityMusic" />
         </PreferenceScreen>
 
+       <PreferenceScreen
+           android:key="wakelock_blocker"
+           android:title="@string/wakelock_blocker_title"
+           android:summary="@string/wakelock_blocker_summary"
+           android:icon="@drawable/ic_menu_save"
+           android:fragment="com.android.settings.slim.WakeLockBlocker" />
     </PreferenceCategory>
 
     <PreferenceCategory