diff --git a/index.html b/index.html
index b8ba0e06..d8f5d23c 100644
--- a/index.html
+++ b/index.html
@@ -3284,8 +3284,7 @@
         <button id="addNewBurg" data-tip="Add a new burg. Hold Shift to add multiple" class="icon-plus"></button>
         <button id="burgsExport" data-tip="Save burgs-related data as a text file (.csv)" class="icon-download"></button>
         <button id="burgNamesImport" data-tip="Rename burgs in bulk" class="icon-upload"></button>
-		<button id="burgsLockAll" data-tip="Lock all burgs" class="icon-lock"></button>
-		<button id="burgsUnlockAll" data-tip="Unlock all burgs" class="icon-lock-open-alt"></button>
+        <button id="burgsonoff" data-tip="Lock / Unlock all burgs" class="icon-lock" value="Off"></button>
         <button id="burgsRemoveAll" data-tip="Remove all unlocked burgs except for capitals. To remove a capital remove its state first" class="icon-trash"></button>
       </div>
     </div>
diff --git a/modules/ui/burgs-overview.js b/modules/ui/burgs-overview.js
index 51b8d44d..4d19a6e4 100644
--- a/modules/ui/burgs-overview.js
+++ b/modules/ui/burgs-overview.js
@@ -33,8 +33,7 @@ function overviewBurgs() {
   document.getElementById("burgsListToLoad").addEventListener("change", function () {
     uploadFile(this, importBurgNames);
   });
-  document.getElementById("burgsLockAll").addEventListener("click", lockAllBurgs);
-  document.getElementById("burgsUnlockAll").addEventListener("click", unlockAllBurgs);
+  document.getElementById("burgsonoff").addEventListener("click", burgsonoff);
   document.getElementById("burgsRemoveAll").addEventListener("click", triggerAllBurgsRemove);
   document.getElementById("burgsInvertLock").addEventListener("click", invertLock);
 
@@ -574,4 +573,14 @@ function overviewBurgs() {
 		burg.lock = false;});
    burgsOverviewAddLines();
   }
+  function burgsonoff(){
+  const currentvalue = document.getElementById('burgsonoff').value;
+  if(currentvalue == "Off"){
+	lockAllBurgs();
+	document.getElementById("burgsonoff").value="On";
+  }else{
+	unlockAllBurgs();
+	document.getElementById("burgsonoff").value="Off";
+       }
+  }
 }