diff --git a/containment/package/contents/ui/applet/ItemWrapper.qml b/containment/package/contents/ui/applet/ItemWrapper.qml
index 9dd11430e..811e5ae7d 100644
--- a/containment/package/contents/ui/applet/ItemWrapper.qml
+++ b/containment/package/contents/ui/applet/ItemWrapper.qml
@@ -409,7 +409,7 @@ Item{
 
                 Loader{
                     anchors.centerIn: parent
-                    active: root.debugModeOverloadedIcons
+                    active: appletItem.debug.overloadedIconsEnabled
                     sourceComponent: Rectangle{
                         width: 30
                         height: 30
diff --git a/containment/package/contents/ui/main.qml b/containment/package/contents/ui/main.qml
index d9afd0fc8..e56910e45 100644
--- a/containment/package/contents/ui/main.qml
+++ b/containment/package/contents/ui/main.qml
@@ -67,8 +67,6 @@ Item {
     property bool debugModeLocalGeometry: Qt.application.arguments.indexOf("--localgeometry")>=0
     property bool debugModeSpacers: Qt.application.arguments.indexOf("--spacers")>=0
     property bool debugModeTimers: Qt.application.arguments.indexOf("--timers")>=0
-    property bool debugModeWindow: Qt.application.arguments.indexOf("--with-window")>=0
-    property bool debugModeOverloadedIcons: Qt.application.arguments.indexOf("--overloaded-icons")>=0
 
     readonly property int version: LatteCore.Environment.makeVersion(0,9,75)
     readonly property bool kirigamiLibraryIsFound: LatteCore.Environment.frameworksVersion >= LatteCore.Environment.makeVersion(5,69,0)
@@ -1297,7 +1295,7 @@ Item {
     }
 
     Loader{
-        active: root.debugModeWindow
+        active: debug.windowEnabled
         sourceComponent: Debugger.DebugWindow{}
     }