diff --git a/res/values/strings.xml b/res/values/strings.xml
index cc186267c..24b262c92 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1027,5 +1027,7 @@
     <string name="slim_blacklist_apps_summary">Apps to not show in the panel</string>
     <string name="slim_blacklist_add_apps_title">Add app</string>
     <string name="slim_blacklist_add_apps_summary">Tap here to add, tap on added app to remove it</string>
-
+    <!-- XiaomiParts -->
+    <string name="device_part_title">XiaomiParts</string>
+    <string name="device_part_opt">Tweaks</string>
 </resources>
diff --git a/res/xml/general_tweaks.xml b/res/xml/general_tweaks.xml
index 1d2ebcb91..0bfc49344 100644
--- a/res/xml/general_tweaks.xml
+++ b/res/xml/general_tweaks.xml
@@ -124,4 +124,18 @@
 
     </PreferenceCategory>
 
+    <PreferenceCategory
+        android:key="device_part_opt"
+        android:title="@string/device_part_opt">
+
+        <Preference
+            android:key="device_part"
+            android:persistent="false"
+            android:title="@string/device_part_title">
+            <intent android:action="android.intent.action.MAIN"
+                 android:targetPackage="com.elixir.settings.device"
+                android:targetClass="com.elixir.settings.device.DeviceSettings"/>
+        </Preference>
+    </PreferenceCategory>
+
 </PreferenceScreen>
diff --git a/src/org/aospextended/extensions/Buttons.java b/src/org/aospextended/extensions/Buttons.java
index 9de847a78..d9dd633ec 100644
--- a/src/org/aospextended/extensions/Buttons.java
+++ b/src/org/aospextended/extensions/Buttons.java
@@ -47,6 +47,7 @@
 import android.support.v14.preference.SwitchPreference;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.development.DevelopmentSettings;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.Utils;
 
@@ -92,6 +93,14 @@ public class Buttons extends ActionFragment implements OnPreferenceChangeListene
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        final String KEY_DEVICE_PART = "device_part";
+        final String KEY_DEVICE_PART_PACKAGE_NAME = "com.elixir.settings.device";
+
+        // XiaomiParts
+        if (!DevelopmentSettings.isPackageInstalled(getActivity(), KEY_DEVICE_PART_PACKAGE_NAME)) {
+           getPreferenceScreen().removePreference(findPreference(KEY_DEVICE_PART));
+        }
+
         addPreferencesFromResource(R.xml.buttons);
 
         final ContentResolver resolver = getActivity().getContentResolver();