diff --git a/front/maintenance.php b/front/maintenance.php
index cad959fc..6fd97a09 100644
--- a/front/maintenance.php
+++ b/front/maintenance.php
@@ -34,11 +34,18 @@
     <div class="col-xs-12">
       <div class="pull-right">
           <button type="button" class="btn btn-default pa-btn pa-btn-delete"  style="margin-left:0px;"
-            id="btnDelete"   onclick="askDeleteDevicesWithEmptyMACs()">   Delete Devices with empty MACs </button>     
+            id="btnDeleteMAC"   onclick="askDeleteDevicesWithEmptyMACs()">   Delete Devices with empty MACs </button>     
       </div>
     </div>
 
     <div class="col-xs-12">
+      <div class="pull-right">
+          <button type="button" class="btn btn-default pa-btn pa-btn-delete"  style="margin-left:0px;"
+            id="btnDelete"   onclick="askDeleteAllDevices()">   Delete All Devices</button>     
+      </div>
+    </div>
+
+    <!-- <div class="col-xs-12">
       <div class="pull-right">
           <button type="button" class="btn btn-default pa-btn pa-btn-create"  style="margin-left:0px;"
             id="btnBackup"   onclick="askCreateBackupDB()"> Backup DB </button>     
@@ -50,7 +57,7 @@
           <button type="button" class="btn btn-default pa-btn pa-btn-delete"  style="margin-left:0px;"
             id="btnRestore"   onclick="askRestoreBackupDB()"> Restore DB </button>     
       </div>
-    </div>
+    </div> -->
 
     <!-- ----------------------------------------------------------------------- -->
     </section>
@@ -67,7 +74,7 @@
 
 <script>
   function askDeleteDevicesWithEmptyMACs () {
-  // Ask delete device
+  // Ask delete device 
 
   showModalWarning('Delete Devices', 'Are you sure you want to delete all devices with empty MAC addresses?<br>(maybe you prefer to archive it)',
     'Cancel', 'Delete', 'deleteDevicesWithEmptyMACs');
@@ -83,6 +90,23 @@ function deleteDevicesWithEmptyMACs()
 }
 
 
+function askDeleteAllDevices () {
+  // Ask delete device 
+
+  showModalWarning('Delete Devices', 'Are you sure you want to delete all devices?',
+    'Cancel', 'Delete', 'deleteAllDevices');
+}
+
+
+function deleteAllDevices()
+{ 
+  // Delete device
+  $.get('php/server/devices.php?action=deleteAllDevices', function(msg) {
+    showMessage (msg);
+  });
+}
+
+
 
 
 // DB backup
diff --git a/front/php/server/devices.php b/front/php/server/devices.php
index 33582593..958fed48 100644
--- a/front/php/server/devices.php
+++ b/front/php/server/devices.php
@@ -34,6 +34,7 @@
       case 'deleteAllWithEmptyMACs':  deleteAllWithEmptyMACs();                break;
       case 'createBackupDB':          createBackupDB();                        break;
       case 'restoreBackupDB':         restoreBackupDB();                       break;
+      case 'deleteAllDevices':        deleteAllDevices();                      break;
       
       
  
@@ -197,6 +198,25 @@ function deleteAllWithEmptyMACs() {
   }
 }
 
+//------------------------------------------------------------------------------
+//  Delete all devices 
+//------------------------------------------------------------------------------
+function deleteAllDevices() {
+  global $db;
+
+  // sql
+  $sql = 'DELETE FROM Devices';
+  // execute sql
+  $result = $db->query($sql);
+
+  // check result
+  if ($result == TRUE) {
+    echo "Devices deleted successfully";
+  } else {
+    echo "Error deleting devices\n\n$sql \n\n". $db->lastErrorMsg();
+  }
+}
+
 
 //------------------------------------------------------------------------------
 //  Create a DB backup
diff --git a/front/php/templates/header.php b/front/php/templates/header.php
index 22204f33..a5f6e131 100644
--- a/front/php/templates/header.php
+++ b/front/php/templates/header.php
@@ -170,7 +170,7 @@
         </li>
 
         <li class=" <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('maintenance.php') ) ){ echo 'active'; } ?>">
-          <a href="maintenance.php"><i class="fa fa-cog fa-spin fa-3x fa-fw"></i> <span>Maintenance</span></a>
+          <a href="maintenance.php"><i class="fa fa-cog"></i> <span>Maintenance</span></a>
         </li>
 
 <!--