diff --git a/app/src/main/java/com/example/user/myapp/ManualDriveActivity.java b/app/src/main/java/com/example/user/myapp/ManualDriveActivity.java
index e4831cc..d4aeb13 100644
--- a/app/src/main/java/com/example/user/myapp/ManualDriveActivity.java
+++ b/app/src/main/java/com/example/user/myapp/ManualDriveActivity.java
@@ -33,7 +33,7 @@ public class ManualDriveActivity extends AppCompatActivity {
 
         setContentView(R.layout.activity_manual_drive);
 
-        ToggleButton button = (ToggleButton) findViewById(R.id.h1_control_button);
+        ToggleButton button = (ToggleButton) findViewById(R.id.manual_override_button);
         button.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
@@ -68,8 +68,8 @@ public class ManualDriveActivity extends AppCompatActivity {
             String action = intent.getAction();
             boolean supposedToBeValue = intent.getBooleanExtra("coil", false);
 
-            ImageView lightOn = (ImageView) findViewById(R.id.h1_status_light_on);
-            ImageView lightOff = (ImageView) findViewById(R.id.h1_status_light_off);
+            ImageView lightOn = (ImageView) findViewById(R.id.manual_override_status_light_on);
+            ImageView lightOff = (ImageView) findViewById(R.id.manual_override_status_light_on);
 
             if (supposedToBeValue) {
                 lightOn.setVisibility(View.VISIBLE);
diff --git a/app/src/main/res/layout/activity_manual_drive.xml b/app/src/main/res/layout/activity_manual_drive.xml
index 97de504..9788097 100644
--- a/app/src/main/res/layout/activity_manual_drive.xml
+++ b/app/src/main/res/layout/activity_manual_drive.xml
@@ -430,4 +430,27 @@
         app:layout_constraintEnd_toEndOf="@+id/m2_control_button"
         app:layout_constraintHorizontal_bias="0.476"
         app:layout_constraintStart_toStartOf="@+id/m2_control_button" />
+
+    <ImageView
+        android:id="@+id/manual_override_status_light_on"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:visibility="invisible"
+        app:layout_constraintStart_toEndOf="@+id/manual_override_button"
+        app:layout_constraintTop_toTopOf="@+id/manual_override_button"
+        app:srcCompat="@android:drawable/presence_online" />
+
+    <ImageView
+        android:id="@+id/manual_override_status_light_off"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:visibility="invisible"
+        app:layout_constraintStart_toEndOf="@+id/manual_override_button"
+        app:layout_constraintTop_toTopOf="@+id/manual_override_button"
+        app:srcCompat="@android:drawable/presence_invisible" />
+
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/documentation/doku.ods b/documentation/doku.ods
index b298697..e0e73ca 100644
Binary files a/documentation/doku.ods and b/documentation/doku.ods differ