diff --git a/Server/server_gui.py b/Server/server_gui.py
index 73f41b9..1962d02 100644
--- a/Server/server_gui.py
+++ b/Server/server_gui.py
@@ -82,6 +82,9 @@ class Ui_MainWindow(object):
         self.emergency_button = QtWidgets.QPushButton(self.centralwidget)
         self.emergency_button.setObjectName("emergency_button")
         self.formLayout_2.setWidget(6, QtWidgets.QFormLayout.SpanningRole, self.emergency_button)
+        self.disarm_all_button = QtWidgets.QPushButton(self.centralwidget)
+        self.disarm_all_button.setObjectName("disarm_all_button")
+        self.formLayout_2.setWidget(8, QtWidgets.QFormLayout.SpanningRole, self.disarm_all_button)
         self.verticalLayout.addLayout(self.formLayout_2)
         self.line_2 = QtWidgets.QFrame(self.centralwidget)
         self.line_2.setFrameShape(QtWidgets.QFrame.HLine)
@@ -163,8 +166,9 @@ class Ui_MainWindow(object):
         self.start_button.setText(_translate("MainWindow", "Start animation"))
         self.pause_button.setText(_translate("MainWindow", "Pause"))
         self.stop_button.setText(_translate("MainWindow", "Stop and land all"))
-        self.disarm_button.setText(_translate("MainWindow", "Disarm"))
+        self.disarm_button.setText(_translate("MainWindow", "Disarm selected"))
         self.emergency_button.setText(_translate("MainWindow", "Emergency land"))
+        self.disarm_all_button.setText(_translate("MainWindow", "Disarm ALL"))
         self.leds_button.setText(_translate("MainWindow", "Test leds"))
         self.takeoff_button.setText(_translate("MainWindow", "Takeoff"))
         self.flip_button.setText(_translate("MainWindow", "Flip"))
diff --git a/Server/server_gui.ui b/Server/server_gui.ui
index ec97cc9..b2ed721 100644
--- a/Server/server_gui.ui
+++ b/Server/server_gui.ui
@@ -144,7 +144,7 @@
           <item row="7" column="0" colspan="2">
            <widget class="QPushButton" name="disarm_button">
             <property name="text">
-             <string>Disarm</string>
+             <string>Disarm selected</string>
             </property>
            </widget>
           </item>
@@ -155,6 +155,13 @@
             </property>
            </widget>
           </item>
+          <item row="8" column="0" colspan="2">
+           <widget class="QPushButton" name="disarm_all_button">
+            <property name="text">
+             <string>Disarm ALL</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </item>
         <item>