diff --git a/conf/settings/basic.xml b/conf/settings/basic.xml
index fd6794aedd..fca95be9b4 100644
--- a/conf/settings/basic.xml
+++ b/conf/settings/basic.xml
@@ -12,11 +12,6 @@
         <strip_button icon="circle-right.png" name="Circle right" value="1"/>        
         <strip_button icon="circle-left.png" name="Circle left" value="-1"/>        
       </dl_setting>
-
-      <dl_setting MAX="1" MIN="0" STEP="1" VAR="power_switch" module="autopilot" handler="SetPowerSwitch">
-        <strip_button name="Video On" value="1"/>
-        <strip_button name="Video Off" value="0"/>
-      </dl_setting>
     </dl_settings>
 
     <dl_settings NAME="mode">
diff --git a/conf/settings/switch.xml b/conf/settings/switch.xml
new file mode 100644
index 0000000000..eafbbe3fe0
--- /dev/null
+++ b/conf/settings/switch.xml
@@ -0,0 +1,12 @@
+<!DOCTYPE settings SYSTEM "settings.dtd">
+
+<settings>
+    <dl_settings NAME="Power switch control">
+       <dl_settings NAME="Power switch">
+      <dl_setting MAX="1" MIN="0" STEP="1" VAR="power_switch" module="autopilot" handler="SetPowerSwitch">
+        <strip_button name="Video On" value="1"/>
+        <strip_button name="Video Off" value="0"/>
+      </dl_setting>
+    </dl_settings>
+    </dl_settings>
+</settings>
diff --git a/conf/settings/tuning.xml b/conf/settings/tuning.xml
index ee0fadb505..6ee93e3f62 100644
--- a/conf/settings/tuning.xml
+++ b/conf/settings/tuning.xml
@@ -95,13 +95,6 @@
 	<dl_setting MAX="20" MIN="10" STEP="0.5" VAR="nav_ground_speed_setpoint" shortname="ground speed"/>
 	<dl_setting MAX="0." MIN="-0.05" STEP="0.01" VAR="nav_ground_speed_pgain" shortname="ground speed pgain"/>
         <dl_setting MAX="500" MIN="50" STEP="5" VAR="nav_survey_shift"/>
-
-
-      <dl_setting MAX="1" MIN="0" STEP="1" VAR="power_switch" module="autopilot" handler="SetPowerSwitch">
-        <strip_button name="Video On" value="1"/>
-        <strip_button name="Video Off" value="0"/>
-      </dl_setting>
-
       </dl_settings>
     </dl_settings>
   </dl_settings>