diff --git a/index.html b/index.html
index f539b8b8..b5ee6679 100644
--- a/index.html
+++ b/index.html
@@ -1070,8 +1070,15 @@
                     <option value="#icon-squared">Squared</option>
                     <option value="#icon-star-circled">Star circled</option>
                     <option value="#icon-star-squared">Star squared</option>
+                    <option value="#icon-watabou-capital">Watabou capital</option>
+                    <option value="#icon-watabou-city">Watabou city</option>
+                    <option value="#icon-watabou-town">Watabou town</option>
                     <option value="#icon-watabou-village">Watabou village</option>
                     <option value="#icon-watabou-hamlet">Watabou hamlet</option>
+                    <option value="#icon-watabou-fort">Watabou fort</option>
+                    <option value="#icon-watabou-monastery">Watabou monastery</option>
+                    <option value="#icon-watabou-caravanserai">Watabou caravanserai</option>
+                    <option value="#icon-watabou-post">Watabou trade post</option>
                   </select>
                 </td>
               </tr>
diff --git a/main.js b/main.js
index 1b44fb29..8893955c 100644
--- a/main.js
+++ b/main.js
@@ -161,7 +161,7 @@ let options = {
   stateLabelsMode: "auto",
   showBurgPreview: true,
   burgs: {
-    groups: Burgs.getDefaultGroups()
+    groups: JSON.safeParse(localStorage.getItem("burg-groups")) || Burgs.getDefaultGroups()
   }
 };
 
diff --git a/modules/ui/burg-group-editor.js b/modules/ui/burg-group-editor.js
index 197b778a..150605dc 100644
--- a/modules/ui/burg-group-editor.js
+++ b/modules/ui/burg-group-editor.js
@@ -313,6 +313,7 @@ function editBurgGroups() {
       }, {});
       return group;
     });
+    localStorage.setItem("burg-groups", JSON.stringify(options.burgs.groups));
 
     // put burgs to new groups
     const validBurgs = pack.burgs.filter(b => b.i && !b.removed);
@@ -321,6 +322,7 @@ function editBurgGroups() {
 
     if (layerIsOn("toggleBurgIcons")) drawBurgIcons();
     if (layerIsOn("toggleLabels")) drawBurgLabels();
+    if (byId("burgsOverviewRefresh")?.offsetParent) burgsOverviewRefresh.click();
 
     $("#burgGroupsEditor").dialog("close");
   }
diff --git a/versioning.js b/versioning.js
index 9f876434..152199f6 100644
--- a/versioning.js
+++ b/versioning.js
@@ -37,6 +37,7 @@ if (parseMapVersion(VERSION) !== VERSION) alert("versioning.js: Invalid format o
 
       <ul>
         <strong>Latest changes:</strong>
+        <li>Custom burg grouping and icon selection</li>
         <li>Ability to set custom image as Marker or Regiment icon</li>
         <li>Submap and Transform tools rework</li>
         <li>Azgaar Bot to answer questions and provide help</li>