diff --git a/Arma3TacMapWebApp/Arma3TacMapWebApp.csproj b/Arma3TacMapWebApp/Arma3TacMapWebApp.csproj
index b8b94f0..0d54719 100644
--- a/Arma3TacMapWebApp/Arma3TacMapWebApp.csproj
+++ b/Arma3TacMapWebApp/Arma3TacMapWebApp.csproj
@@ -18,8 +18,8 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.7" />
-    <PackageReference Include="Pmad.Milsymbol.AspNetCore" Version="0.1.38" />
-	<PackageReference Include="Pmad.Milsymbol.Png" Version="0.1.38" />
+    <PackageReference Include="Pmad.Milsymbol.AspNetCore" Version="0.1.50" />
+	<PackageReference Include="Pmad.Milsymbol.Png" Version="0.1.50" />
 	<PackageReference Include="PuppeteerSharp" Version="20.0.5" />
     <PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />
 	  
diff --git a/Arma3TacMapWebApp/Controllers/OrbatUnitsController.cs b/Arma3TacMapWebApp/Controllers/OrbatUnitsController.cs
index 34549e2..5548c1a 100644
--- a/Arma3TacMapWebApp/Controllers/OrbatUnitsController.cs
+++ b/Arma3TacMapWebApp/Controllers/OrbatUnitsController.cs
@@ -8,6 +8,7 @@
 using Arma3TacMapWebApp.Entities;
 using Arma3TacMapWebApp.Maps;
 using Microsoft.AspNetCore.Authorization;
+using Pmad.Milsymbol.AspNetCore.Services;
 
 namespace Arma3TacMapWebApp.Controllers
 {
@@ -17,12 +18,14 @@ public class OrbatUnitsController : Controller
         private readonly Arma3TacMapContext _context;
         private readonly MapService _mapSvc;
         private readonly IAuthorizationService _authorizationService;
+        private readonly IApp6dSymbolGenerator _app6DSymbolGenerator;
 
-        public OrbatUnitsController(Arma3TacMapContext context, MapService mapSvc, IAuthorizationService authorizationService)
+        public OrbatUnitsController(Arma3TacMapContext context, MapService mapSvc, IAuthorizationService authorizationService, IApp6dSymbolGenerator app6DSymbolGenerator)
         {
             _context = context;
             _mapSvc = mapSvc;
             _authorizationService = authorizationService;
+            _app6DSymbolGenerator = app6DSymbolGenerator;
         }
 
         private async Task<bool> IsEditAllowed(Orbat orbat)
@@ -67,7 +70,7 @@ public async Task<IActionResult> Create(int orbatID)
         // For more details, see http://go.microsoft.com/fwlink/?LinkId=317598.
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public async Task<IActionResult> Create([Bind("OrbatUnitID,OrbatID,ParentOrbatUnitID,Name,UniqueDesignation,NatoSymbolIcon,NatoSymbolMod1,NatoSymbolMod2,NatoSymbolSize,NatoSymbolHQ,NatoSymbolFriendlyImageBase64,NatoSymbolHostileImageBase64,NatoSymbolHostileAssumedImageBase64,Position")] OrbatUnit orbatUnit)
+        public async Task<IActionResult> Create([Bind("OrbatUnitID,OrbatID,ParentOrbatUnitID,Name,UniqueDesignation,FriendSidc,Position")] OrbatUnit orbatUnit)
         {
             orbatUnit.Orbat = await _context.Orbats.FindAsync(orbatUnit.OrbatID);
             if (orbatUnit.Orbat == null)
@@ -81,6 +84,7 @@ public async Task<IActionResult> Create([Bind("OrbatUnitID,OrbatID,ParentOrbatUn
             if (ModelState.IsValid)
             {
                 orbatUnit.Trigram = await GetTrigam(orbatUnit.OrbatID);
+                await PrecomputeSvgImages(orbatUnit);
                 _context.Add(orbatUnit);
                 await _context.SaveChangesAsync();
                 return RedirectToAction(nameof(OrbatsController.Details), "Orbats", new { id = orbatUnit.OrbatID });
@@ -89,6 +93,21 @@ public async Task<IActionResult> Create([Bind("OrbatUnitID,OrbatID,ParentOrbatUn
             return View(orbatUnit);
         }
 
+        private async Task PrecomputeSvgImages(OrbatUnit orbatUnit)
+        {
+            orbatUnit.NatoSymbolFriendlyImageBase64 = await PrecomputeSvg(orbatUnit.GetNatoSymbol('3'), orbatUnit.UniqueDesignation);
+            orbatUnit.NatoSymbolHostileImageBase64 = await PrecomputeSvg(orbatUnit.GetNatoSymbol('6'), orbatUnit.UniqueDesignation);
+            orbatUnit.NatoSymbolHostileAssumedImageBase64 = await PrecomputeSvg(orbatUnit.GetNatoSymbol('6', '1'), orbatUnit.UniqueDesignation);
+        }
+
+        private async Task<string> PrecomputeSvg(string sidc, string? uniqueDesignation)
+        {
+            var symbol = await _app6DSymbolGenerator.GenerateAsync(sidc, new Pmad.Milsymbol.Icons.SymbolIconOptions() { UniqueDesignation = uniqueDesignation });
+            var svg = System.Text.Encoding.UTF8.GetBytes(symbol.Svg);
+            var b64 = "data:image/svg+xml;base64," + Convert.ToBase64String(svg);
+            return b64;
+        }
+
         private async Task<string> GetTrigam(int orbatID)
         {
             var rnd = new Random();
@@ -135,7 +154,7 @@ public async Task<IActionResult> Edit(int? id)
         // For more details, see http://go.microsoft.com/fwlink/?LinkId=317598.
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public async Task<IActionResult> Edit(int id, [Bind("OrbatUnitID,OrbatID,ParentOrbatUnitID,Name,UniqueDesignation,NatoSymbolIcon,NatoSymbolMod1,NatoSymbolMod2,NatoSymbolSize,NatoSymbolHQ,NatoSymbolFriendlyImageBase64,NatoSymbolHostileImageBase64,NatoSymbolHostileAssumedImageBase64,Position,Trigram")] OrbatUnit orbatUnit)
+        public async Task<IActionResult> Edit(int id, [Bind("OrbatUnitID,OrbatID,ParentOrbatUnitID,Name,UniqueDesignation,FriendSidc,Position,Trigram")] OrbatUnit orbatUnit)
         {
             if (id != orbatUnit.OrbatUnitID)
             {
@@ -162,6 +181,7 @@ public async Task<IActionResult> Edit(int id, [Bind("OrbatUnitID,OrbatID,ParentO
 
             if (ModelState.IsValid)
             {
+                await PrecomputeSvgImages(orbatUnit);
                 try
                 {
                     _context.Update(orbatUnit);
diff --git a/Arma3TacMapWebApp/Entities/Arma3TacMapContext.cs b/Arma3TacMapWebApp/Entities/Arma3TacMapContext.cs
index 5c9e00c..5b9ab9e 100644
--- a/Arma3TacMapWebApp/Entities/Arma3TacMapContext.cs
+++ b/Arma3TacMapWebApp/Entities/Arma3TacMapContext.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
-using Arma3TacMapWebApp.Entities;
 
 namespace Arma3TacMapWebApp.Entities
 {
@@ -46,7 +45,9 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
             modelBuilder.Entity<Orbat>().ToTable(nameof(Orbat));
 
-            modelBuilder.Entity<OrbatUnit>().ToTable(nameof(OrbatUnit));
+            var orbatUnit = modelBuilder.Entity<OrbatUnit>();
+            orbatUnit.Property(t => t.NatoSymbolSet).HasDefaultValue("10");
+            orbatUnit.ToTable(nameof(OrbatUnit));
 
             var userApiKey = modelBuilder.Entity<UserApiKey>();
             userApiKey.ToTable(nameof(UserApiKey));
diff --git a/Arma3TacMapWebApp/Entities/OrbatUnit.cs b/Arma3TacMapWebApp/Entities/OrbatUnit.cs
index 78ffcc0..00ca82c 100644
--- a/Arma3TacMapWebApp/Entities/OrbatUnit.cs
+++ b/Arma3TacMapWebApp/Entities/OrbatUnit.cs
@@ -1,6 +1,8 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using Pmad.Milsymbol.App6d;
 using Pmad.Milsymbol.AspNetCore.Orbat;
 
 namespace Arma3TacMapWebApp.Entities
@@ -23,6 +25,9 @@ public class OrbatUnit : IOrbatUnit
         [Display(Name = "Unique Designation")]
         public string? UniqueDesignation { get; set; }
 
+        [Display(Name = "Symbol set")]
+        public string? NatoSymbolSet { get; set; }
+
         [Display(Name = "Symbol")]
         public string? NatoSymbolIcon { get; set; }
 
@@ -49,7 +54,7 @@ public class OrbatUnit : IOrbatUnit
 
         public int Position { get; set; }
 
-        public string GetNatoSymbol(char c, char e = '0') => "100" + c + "10" + e +
+        public string GetNatoSymbol(char c, char e = '0') => "100" + c + (NatoSymbolSet ?? "10") + e +
             (NatoSymbolHQ ?? string.Empty).PadLeft(1, '0') +
             (NatoSymbolSize ?? string.Empty).PadLeft(2, '0') +
             (NatoSymbolIcon ?? string.Empty).PadLeft(6, '0') +
@@ -65,6 +70,33 @@ public string GetNatoSymbol(char c, char e = '0') => "100" + c + "10" + e +
         [MaxLength(3)]
         public string? Trigram { get; set; }
 
+        [NotMapped]
+        public string FriendSidc
+        {
+            get { return GetNatoSymbol('3'); }
+            set
+            {
+                if (App6dSymbolId.TryParse(value, out var symbolId))
+                {
+                    NatoSymbolHQ = symbolId.HqTfFdCode;
+                    NatoSymbolSize = symbolId.Amplifier;
+                    NatoSymbolIcon = symbolId.Icon;
+                    NatoSymbolMod1 = symbolId.Modifier1;
+                    NatoSymbolMod2 = symbolId.Modifier2;
+                    NatoSymbolSet = symbolId.SymbolSet;
+                }
+                else
+                {
+                    NatoSymbolHQ = "0";
+                    NatoSymbolSize = "00";
+                    NatoSymbolIcon = "000000";
+                    NatoSymbolMod1 = "00";
+                    NatoSymbolMod2 = "00";
+                    NatoSymbolSet = "10";
+                }
+            }
+        }
+
         string IOrbatUnit.Sdic => GetNatoSymbol('3');
 
         string? IOrbatUnit.CommonIdentifier => Name;
diff --git a/Arma3TacMapWebApp/Migrations/20250225194447_OrbatNatoSymbolSet.Designer.cs b/Arma3TacMapWebApp/Migrations/20250225194447_OrbatNatoSymbolSet.Designer.cs
new file mode 100644
index 0000000..b5e8bf7
--- /dev/null
+++ b/Arma3TacMapWebApp/Migrations/20250225194447_OrbatNatoSymbolSet.Designer.cs
@@ -0,0 +1,575 @@
+// <auto-generated />
+using System;
+using Arma3TacMapWebApp.Entities;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Arma3TacMapWebApp.Migrations
+{
+    [DbContext(typeof(Arma3TacMapContext))]
+    [Migration("20250225194447_OrbatNatoSymbolSet")]
+    partial class OrbatNatoSymbolSet
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.11");
+
+            modelBuilder.Entity("Arma3TacMapWebApp.Entities.MessageFieldTemplate", b =>
+                {
+                    b.Property<int>("MessageFieldTemplateID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("MessageLineTemplateID")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SortNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("MessageFieldTemplateID");
+
+                    b.HasIndex("MessageLineTemplateID");
+
+                    b.ToTable("MessageFieldTemplate", (string)null);
+                });
+
+            modelBuilder.Entity("Arma3TacMapWebApp.Entities.MessageLineTemplate", b =>
+                {
+                    b.Property<int>("MessageLineTemplateID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("MessageTemplateID")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SortNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("MessageLineTemplateID");
+
+                    b.HasIndex("MessageTemplateID");
+
+                    b.ToTable("MessageLineTemplate", (string)null);
+                });
+
+            modelBuilder.Entity("Arma3TacMapWebApp.Entities.MessageTemplate", b =>
+                {
+                    b.Property<int>("MessageTemplateID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CountryCode")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("Created")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("OwnerUserID")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Token")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Visibility")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("MessageTemplateID");
+
+                    b.HasIndex("OwnerUserID");
+
+                    b.ToTable("MessageTemplate", (string)null);
+                });
+
+            modelBuilder.Entity("Arma3TacMapWebApp.Entities.Orbat", b =>
+                {
+                    b.Property<int>("OrbatID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("Created")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("OwnerUserID")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Token")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Visibility")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("OrbatID");
+
+                    b.HasIndex("OwnerUserID");
+
+                    b.ToTable("Orbat", (string)null);
+                });
+
+            modelBuilder.Entity("Arma3TacMapWebApp.Entities.OrbatUnit", b =>
+                {
+                    b.Property<int>("OrbatUnitID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("NatoSymbolFriendlyImageBase64")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("NatoSymbolHQ")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("NatoSymbolHostileAssumedImageBase64")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("NatoSymbolHostileImageBase64")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("NatoSymbolIcon")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("NatoSymbolMod1")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("NatoSymbolMod2")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("NatoSymbolSet")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasDefaultValue("10");
+
+                    b.Property<string>("NatoSymbolSize")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("OrbatID")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("ParentOrbatUnitID")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Position")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Trigram")
+                        .HasMaxLength(3)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UniqueDesignation")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("OrbatUnitID");
+
+                    b.HasIndex("OrbatID");
+
+                    b.HasIndex("ParentOrbatUnitID");
+
+                    b.ToTable("OrbatUnit", (string)null);
+                });
+
+            modelBuilder.Entity("Arma3TacMapWebApp.Entities.TacMap", b =>
+                {
+                    b.Property<int>("TacMapID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("Created")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EventHref")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("FriendlyOrbatID")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("GameName")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasDefaultValue("arma3");
+
+                    b.Property<int?>("HostileOrbatID")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Order")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasDefaultValue(0);
+
+                    b.Property<int>("OwnerUserID")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("ParentTacMapID")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("Phase")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ReadOnlyToken")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ReadWriteToken")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("WorldName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("TacMapID");
+
+                    b.HasIndex("FriendlyOrbatID");
+
+                    b.HasIndex("HostileOrbatID");
+
+                    b.HasIndex("OwnerUserID");
+
+                    b.HasIndex("ParentTacMapID");
+
+                    b.ToTable("TacMap", (string)null);
+                });
+
+            modelBuilder.Entity("Arma3TacMapWebApp.Entities.TacMapAccess", b =>
+                {
+                    b.Property<int>("TacMapAccessID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("CanWrite")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("TacMapID")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("UserID")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("TacMapAccessID");
+
+                    b.HasIndex("TacMapID");
+
+                    b.HasIndex("UserID");
+
+                    b.ToTable("TacMapAccess", (string)null);
+                });
+
+            modelBuilder.Entity("Arma3TacMapWebApp.Entities.TacMapMarker", b =>
+                {
+                    b.Property<int>("TacMapMarkerID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("LastUpdate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("MarkerData")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("TacMapID")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("UserID")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("TacMapMarkerID");
+
+                    b.HasIndex("TacMapID");
+
+                    b.HasIndex("UserID");
+
+                    b.ToTable("TacMapMarker", (string)null);
+                });
+
+            modelBuilder.Entity("Arma3TacMapWebApp.Entities.User", b =>
+                {
+                    b.Property<int>("UserID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsService")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("LastSymbolBookmarksSaveUtc")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SteamId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserLabel")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("UserID");
+
+                    b.ToTable("User", (string)null);
+                });
+
+            modelBuilder.Entity("Arma3TacMapWebApp.Entities.UserApiKey", b =>
+                {
+                    b.Property<int>("UserApiKeyID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("HashedKey")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Salt")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("UserID")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("ValidUntil")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("UserApiKeyID");
+
+                    b.HasIndex("UserID");
+
+                    b.ToTable("UserApiKey", (string)null);
+                });
+
+            modelBuilder.Entity("Arma3TacMapWebApp.Entities.UserSymbolBookmark", b =>
+                {
+                    b.Property<int>("UserSymbolBookmarkID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Label")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Sidc")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("UserID")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("UserSymbolBookmarkID");
+
+                    b.HasIndex("UserID");
+
+                    b.ToTable("UserSymbolBookmark", (string)null);
+                });
+
+            modelBuilder.Entity("Arma3TacMapWebApp.Entities.MessageFieldTemplate", b =>
+                {
+                    b.HasOne("Arma3TacMapWebApp.Entities.MessageLineTemplate", "MessageLineTemplate")
+                        .WithMany("Fields")
+                        .HasForeignKey("MessageLineTemplateID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("MessageLineTemplate");
+                });
+
+            modelBuilder.Entity("Arma3TacMapWebApp.Entities.MessageLineTemplate", b =>
+                {
+                    b.HasOne("Arma3TacMapWebApp.Entities.MessageTemplate", "MessageTemplate")
+                        .WithMany("Lines")
+                        .HasForeignKey("MessageTemplateID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("MessageTemplate");
+                });
+
+            modelBuilder.Entity("Arma3TacMapWebApp.Entities.MessageTemplate", b =>
+                {
+                    b.HasOne("Arma3TacMapWebApp.Entities.User", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerUserID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Arma3TacMapWebApp.Entities.Orbat", b =>
+                {
+                    b.HasOne("Arma3TacMapWebApp.Entities.User", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerUserID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Arma3TacMapWebApp.Entities.OrbatUnit", b =>
+                {
+                    b.HasOne("Arma3TacMapWebApp.Entities.Orbat", "Orbat")
+                        .WithMany("Units")
+                        .HasForeignKey("OrbatID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Arma3TacMapWebApp.Entities.OrbatUnit", "Parent")
+                        .WithMany("Children")
+                        .HasForeignKey("ParentOrbatUnitID");
+
+                    b.Navigation("Orbat");
+
+                    b.Navigation("Parent");
+                });
+
+            modelBuilder.Entity("Arma3TacMapWebApp.Entities.TacMap", b =>
+                {
+                    b.HasOne("Arma3TacMapWebApp.Entities.Orbat", "FriendlyOrbat")
+                        .WithMany()
+                        .HasForeignKey("FriendlyOrbatID")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Arma3TacMapWebApp.Entities.Orbat", "HostileOrbat")
+                        .WithMany()
+                        .HasForeignKey("HostileOrbatID")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Arma3TacMapWebApp.Entities.User", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerUserID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Arma3TacMapWebApp.Entities.TacMap", "Parent")
+                        .WithMany()
+                        .HasForeignKey("ParentTacMapID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("FriendlyOrbat");
+
+                    b.Navigation("HostileOrbat");
+
+                    b.Navigation("Owner");
+
+                    b.Navigation("Parent");
+                });
+
+            modelBuilder.Entity("Arma3TacMapWebApp.Entities.TacMapAccess", b =>
+                {
+                    b.HasOne("Arma3TacMapWebApp.Entities.TacMap", "TacMap")
+                        .WithMany()
+                        .HasForeignKey("TacMapID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Arma3TacMapWebApp.Entities.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("TacMap");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Arma3TacMapWebApp.Entities.TacMapMarker", b =>
+                {
+                    b.HasOne("Arma3TacMapWebApp.Entities.TacMap", "TacMap")
+                        .WithMany()
+                        .HasForeignKey("TacMapID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Arma3TacMapWebApp.Entities.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserID");
+
+                    b.Navigation("TacMap");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Arma3TacMapWebApp.Entities.UserApiKey", b =>
+                {
+                    b.HasOne("Arma3TacMapWebApp.Entities.User", "User")
+                        .WithMany("ApiKeys")
+                        .HasForeignKey("UserID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Arma3TacMapWebApp.Entities.UserSymbolBookmark", b =>
+                {
+                    b.HasOne("Arma3TacMapWebApp.Entities.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Arma3TacMapWebApp.Entities.MessageLineTemplate", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Arma3TacMapWebApp.Entities.MessageTemplate", b =>
+                {
+                    b.Navigation("Lines");
+                });
+
+            modelBuilder.Entity("Arma3TacMapWebApp.Entities.Orbat", b =>
+                {
+                    b.Navigation("Units");
+                });
+
+            modelBuilder.Entity("Arma3TacMapWebApp.Entities.OrbatUnit", b =>
+                {
+                    b.Navigation("Children");
+                });
+
+            modelBuilder.Entity("Arma3TacMapWebApp.Entities.User", b =>
+                {
+                    b.Navigation("ApiKeys");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Arma3TacMapWebApp/Migrations/20250225194447_OrbatNatoSymbolSet.cs b/Arma3TacMapWebApp/Migrations/20250225194447_OrbatNatoSymbolSet.cs
new file mode 100644
index 0000000..041bb60
--- /dev/null
+++ b/Arma3TacMapWebApp/Migrations/20250225194447_OrbatNatoSymbolSet.cs
@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Arma3TacMapWebApp.Migrations
+{
+    /// <inheritdoc />
+    public partial class OrbatNatoSymbolSet : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "NatoSymbolSet",
+                table: "OrbatUnit",
+                type: "TEXT",
+                nullable: true,
+                defaultValue: "10");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "NatoSymbolSet",
+                table: "OrbatUnit");
+        }
+    }
+}
diff --git a/Arma3TacMapWebApp/Migrations/Arma3TacMapContextModelSnapshot.cs b/Arma3TacMapWebApp/Migrations/Arma3TacMapContextModelSnapshot.cs
index 32ab378..2c23d30 100644
--- a/Arma3TacMapWebApp/Migrations/Arma3TacMapContextModelSnapshot.cs
+++ b/Arma3TacMapWebApp/Migrations/Arma3TacMapContextModelSnapshot.cs
@@ -167,6 +167,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<string>("NatoSymbolMod2")
                         .HasColumnType("TEXT");
 
+                    b.Property<string>("NatoSymbolSet")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasDefaultValue("10");
+
                     b.Property<string>("NatoSymbolSize")
                         .HasColumnType("TEXT");
 
diff --git a/Arma3TacMapWebApp/Views/OrbatUnits/Create.cshtml b/Arma3TacMapWebApp/Views/OrbatUnits/Create.cshtml
index a575126..799324b 100644
--- a/Arma3TacMapWebApp/Views/OrbatUnits/Create.cshtml
+++ b/Arma3TacMapWebApp/Views/OrbatUnits/Create.cshtml
@@ -5,7 +5,6 @@
     ViewData["Title"] = Localizer["Create an unit"];
 }
 
-
 <div class="container">
     <nav aria-label="breadcrumb">
         <ol class="breadcrumb">
@@ -29,17 +28,5 @@
 
 @section Scripts {
     @{await Html.RenderPartialAsync("_ValidationScriptsPartial");}
-    <script src="https://cdn.jsdelivr.net/npm/milsymbol@2.0.0/dist/milsymbol.min.js">
-    </script>
-    <script src="https://cdn.jsdelivr.net/npm/milstd@0.1.6/milstd.min.js">
-    </script>
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.18/dist/js/bootstrap-select.min.js">
-    </script>
-    <script src="~/js/milstdExtra.js" type="text/javascript" asp-append-version="true">
-    </script>
-    <script src="~/js/orbatUnit.js" type="text/javascript" asp-append-version="true">
-    </script>
+    <script src="~/js/orbatUnitPage.js" asp-append-version="true"></script>
 }
-@section Styles {
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.18/dist/css/bootstrap-select.min.css" />
-}
\ No newline at end of file
diff --git a/Arma3TacMapWebApp/Views/OrbatUnits/Edit.cshtml b/Arma3TacMapWebApp/Views/OrbatUnits/Edit.cshtml
index 8fa656a..051e8f2 100644
--- a/Arma3TacMapWebApp/Views/OrbatUnits/Edit.cshtml
+++ b/Arma3TacMapWebApp/Views/OrbatUnits/Edit.cshtml
@@ -30,17 +30,5 @@
 
 @section Scripts {
     @{await Html.RenderPartialAsync("_ValidationScriptsPartial");}
-    <script src="https://cdn.jsdelivr.net/npm/milsymbol@2.0.0/dist/milsymbol.min.js">
-    </script>
-    <script src="https://cdn.jsdelivr.net/npm/milstd@0.1.6/milstd.min.js">
-    </script>
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.18/dist/js/bootstrap-select.min.js">
-    </script>
-    <script src="~/js/milstdExtra.js" type="text/javascript" asp-append-version="true">
-    </script>
-    <script src="~/js/orbatUnit.js" type="text/javascript" asp-append-version="true">
-    </script>
+    <script src="~/js/orbatUnitPage.js" asp-append-version="true"></script>
 }
-@section Styles {
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.18/dist/css/bootstrap-select.min.css" />
-}
\ No newline at end of file
diff --git a/Arma3TacMapWebApp/Views/OrbatUnits/_Form.cshtml b/Arma3TacMapWebApp/Views/OrbatUnits/_Form.cshtml
index 09821b6..363a383 100644
--- a/Arma3TacMapWebApp/Views/OrbatUnits/_Form.cshtml
+++ b/Arma3TacMapWebApp/Views/OrbatUnits/_Form.cshtml
@@ -2,9 +2,6 @@
 @inject IHtmlLocalizer<SharedResource> Localizer
 
 <input type="hidden" asp-for="OrbatID" />
-<input type="hidden" asp-for="NatoSymbolFriendlyImageBase64" />
-<input type="hidden" asp-for="NatoSymbolHostileImageBase64" />
-<input type="hidden" asp-for="NatoSymbolHostileAssumedImageBase64" />
 <input type="hidden" asp-for="Trigram" />
 <div class="form-row">
     <div class="form-group col-md-6">
@@ -32,53 +29,5 @@
         <span asp-validation-for="UniqueDesignation" class="text-danger"></span>
     </div>
 </div>
-<div class="form-row">
-    <div class="form-group col-md-8">
-        <label asp-for="NatoSymbolIcon" class="control-label"></label>
-        <select asp-for="NatoSymbolIcon" class="form-control" data-selected="@Model.NatoSymbolIcon" data-live-search="true"></select>
-        <span asp-validation-for="NatoSymbolIcon" class="text-danger"></span>
-    </div>
-
-    <div class="form-group col-md-4">
-        <label asp-for="NatoSymbolSize" class="control-label"></label>
-        <select asp-for="NatoSymbolSize" class="form-control" data-selected="@Model.NatoSymbolSize"></select>
-        <span asp-validation-for="NatoSymbolSize" class="text-danger"></span>
-    </div>
-</div>
-<div class="form-row">
-    <div class="form-group col-md-4">
-        <label asp-for="NatoSymbolMod1" class="control-label"></label>
-        <select asp-for="NatoSymbolMod1" class="form-control" data-selected="@Model.NatoSymbolMod1" data-live-search="true"></select>
-        <span asp-validation-for="NatoSymbolMod1" class="text-danger"></span>
-    </div>
-    <div class="form-group col-md-4">
-        <label asp-for="NatoSymbolMod2" class="control-label"></label>
-        <select asp-for="NatoSymbolMod2" class="form-control" data-selected="@Model.NatoSymbolMod2" data-live-search="true"></select>
-        <span asp-validation-for="NatoSymbolMod2" class="text-danger"></span>
-    </div>
-    <div class="form-group col-md-4">
-        <label asp-for="NatoSymbolHQ" class="control-label"></label>
-        <select asp-for="NatoSymbolHQ" class="form-control">
-            <option value="0" selected="selected">n/a</option>
-            <option value="1">Feint/Dummy</option>
-            <option value="2">Headquarters</option>
-            <option value="3">Feint/Dummy Headquarters</option>
-            <option value="4">Task Force</option>
-            <option value="5">Feint/Dummy Task Force</option>
-            <option value="6">Task Force Headquarters</option>
-            <option value="7">Feint/Dummy Task Force Headquarters</option>
-        </select>
-        <span asp-validation-for="NatoSymbolHQ" class="text-danger"></span>
-    </div>
-</div>
-<div class="form-row text-center align-items-center">
-    <h4 class="col-6">
-        @Html.DisplayNameFor(model => model.NatoSymbolFriendlyImageBase64)
-    </h4>
-    <h4 class="col-6">
-        @Html.DisplayNameFor(model => model.NatoSymbolHostileImageBase64)
-    </h4>
-    <div class="col-6" id="PreviewFriendly"></div>
-    <div class="col-6" id="PreviewHostile"></div>
-</div>
 
+<pmad-symbol-selector asp-for="FriendSidc" layout="OrbatIcon" />
diff --git a/Arma3TacMapWebApp/Views/Orbats/Details.cshtml b/Arma3TacMapWebApp/Views/Orbats/Details.cshtml
index d42d46f..35a6e9b 100644
--- a/Arma3TacMapWebApp/Views/Orbats/Details.cshtml
+++ b/Arma3TacMapWebApp/Views/Orbats/Details.cshtml
@@ -14,9 +14,11 @@
     @if (roots != null && roots.Count() == 1)
     {
         var root = roots.First();
-        <pmad-orbat root-unit="@root"
-            unit-title="@(u => ((Arma3TacMapWebApp.Entities.OrbatUnit)u).UniqueDesignation)"
-            unit-link-controller="OrbatUnits" unit-link-action="Details" unit-link-route="@(u => new { id = ((Arma3TacMapWebApp.Entities.OrbatUnit)u).OrbatUnitID })" />
+        <div class="mb-5">
+            <pmad-orbat root-unit="@root"
+                unit-title="@(u => ((Arma3TacMapWebApp.Entities.OrbatUnit)u).UniqueDesignation)"
+                unit-link-controller="OrbatUnits" unit-link-action="Edit" unit-link-route="@(u => new { id = ((Arma3TacMapWebApp.Entities.OrbatUnit)u).OrbatUnitID })" />
+        </div>
     }
 
     <div>
@@ -66,12 +68,12 @@
         <tbody>
             @foreach (var item in Model.Units!)
             {
-                var sdic = item.GetNatoSymbol('3');
-                var symbol = await App6dSymbolGenerator.GenerateAsync(sdic, new Pmad.Milsymbol.Icons.SymbolIconOptions());
+                var sidc = item.GetNatoSymbol('3');
+                var symbol = await App6dSymbolGenerator.GenerateAsync(sidc, new Pmad.Milsymbol.Icons.SymbolIconOptions());
                 var svg = System.Text.Encoding.UTF8.GetBytes(symbol.Svg);
             <tr>
                 <td>
-                    <img src="data:image/svg+xml;base64,@Convert.ToBase64String(svg)" height="@(symbol.Height/2)" alt="@sdic" />
+                    <img src="data:image/svg+xml;base64,@Convert.ToBase64String(svg)" height="@(symbol.Height/2)" alt="@sidc" />
                 </td>
                 <td>
                     @Html.DisplayFor(modelItem => item.UniqueDesignation)
diff --git a/Arma3TacMapWebApp/wwwroot/js/orbatUnit.js b/Arma3TacMapWebApp/wwwroot/js/orbatUnit.js
deleted file mode 100644
index 16d9b65..0000000
--- a/Arma3TacMapWebApp/wwwroot/js/orbatUnit.js
+++ /dev/null
@@ -1,106 +0,0 @@
-function applySymbol() {
-    applySymbolOne('3', '0', 'NatoSymbolFriendlyImageBase64', 'PreviewFriendly');
-    applySymbolOne('6', '0', 'NatoSymbolHostileImageBase64', 'PreviewHostile');
-    applySymbolOne('6', '1', 'NatoSymbolHostileAssumedImageBase64');
-}
-
-function applySymbolOne(c, e, hidden, area) {
-    var symbol = '100' + c + '10' + e;
-    symbol += $('#NatoSymbolHQ').val() || '0';
-    symbol += $('#NatoSymbolSize').val() || '00';
-    symbol += $('#NatoSymbolIcon').val() || '000000';
-    symbol += $('#NatoSymbolMod1').val() || '00';
-    symbol += $('#NatoSymbolMod2').val() || '00';
-    var config = {
-        uniqueDesignation: $('#UniqueDesignation').val(),
-        size: 70
-    };
-    var sym = new ms.Symbol(symbol, config);
-    var src = sym.asCanvas(window.devicePixelRatio).toDataURL();
-    if (area) {
-        $('#' + area).empty().append($('<img></img>')
-            .attr({
-                src: src,
-                width: sym.getSize().width,
-                height: sym.getSize().height
-            })
-        );
-    }
-    $('#' + hidden).val(src);
-    return symbol;
-}
-
-
-$(function () {
-    var id = '0003';
-    var symbolset = '10';
-
-    ms.setStandard("APP6"); // We always use APP6 edition D
-
-    $('#NatoSymbolSize').empty();
-    $.each(echelonMobilityTowedarray(symbolset), function (name, value) {
-        var sym = new ms.Symbol(id + symbolset + '00' + value.code + '0000000000', { size: 16 });
-        var labelHtml = '<img class="mil-icon" src="' + sym.asCanvas(window.devicePixelRatio).toDataURL() + '" width="' + sym.getSize().width + '" height="' + sym.getSize().height + '"> ' + value.name;
-        $('#NatoSymbolSize').append($('<option></option>').attr({ value: value.code, 'data-content': labelHtml }).text(value.name));
-    });
-
-    var data = milstd.app6d[symbolset];
-
-    $('#NatoSymbolIcon').empty();
-    $.each(data['main icon'], function (name, value) {
-        var sym = new ms.Symbol(id + symbolset + '0000' + value.code + '0000', { size: 16 });
-        var labelHtml = '<img class="mil-icon" src="' + sym.asCanvas(window.devicePixelRatio).toDataURL() + '" width="' + sym.getSize().width + '" height="' + sym.getSize().height + '"> ';
-        var labelText = '';
-        if (value['entity type']) {
-            if (value['entity subtype']) {
-                labelHtml += '<span class="font-weight-light text-muted">' + value.entity + ' - ' + value['entity type'] + '</span> - <strong>' + value['entity subtype'] + '</strong>';
-                labelText = value.entity + ' - ' + value['entity type'] + ' - ' + value['entity subtype'];
-            } else {
-                labelHtml += '<span class="font-weight-light text-muted">' + value.entity + '</span> - <strong>' + value['entity type'] + '</strong>';
-                labelText = value.entity + ' - ' + value['entity subtype'];
-            }
-        }
-        else {
-            labelHtml += '<strong>' + value.entity + '</strong>';
-            labelText = value.entity;
-
-            $('#NatoSymbolIcon').append($('<option></option>').attr({ 'data-divider': 'true' }));
-        }
-        $('#NatoSymbolIcon').append($('<option></option>').attr({ value: value.code, 'data-content': labelHtml }).text(labelText));
-    });
-
-    $('#NatoSymbolMod1').empty();
-    $.each(data['modifier 1'], function (name, value) {
-        var sym = new ms.Symbol(id + symbolset + '0000000000' + value.code + '00', { size: 16 });
-        var labelHtml = '<img class="mil-icon" src="' + sym.asCanvas(window.devicePixelRatio).toDataURL() + '" width="' + sym.getSize().width + '" height="' + sym.getSize().height + '"> ' + value.modifier;
-        $('#NatoSymbolMod1').append($('<option></option>').attr({ value: value.code, 'data-content': labelHtml }).text(value.modifier));
-    });
-
-    $('#NatoSymbolMod2').empty();
-    $.each(data['modifier 2'], function (name, value) {
-        var sym = new ms.Symbol(id + symbolset + '000000000000' + value.code, { size: 16 });
-        var labelHtml = '<img class="mil-icon" src="' + sym.asCanvas(window.devicePixelRatio).toDataURL() + '" width="' + sym.getSize().width + '" height="' + sym.getSize().height + '"> ' + value.modifier;
-        $('#NatoSymbolMod2').append($('<option></option>').attr({ value: value.code, 'data-content': labelHtml }).text(value.modifier));
-    });
-
-    // data-selected
-    $('#NatoSymbolSize').val($('#NatoSymbolSize').attr('data-selected'));
-    $('#NatoSymbolIcon').val($('#NatoSymbolIcon').attr('data-selected'));
-    $('#NatoSymbolMod1').val($('#NatoSymbolMod1').attr('data-selected'));
-    $('#NatoSymbolMod2').val($('#NatoSymbolMod2').attr('data-selected'));
-    $('#NatoSymbolHQ').val($('#NatoSymbolHQ').attr('data-selected'));
-
-    $('#NatoSymbolSize').selectpicker();
-    $('#NatoSymbolIcon').selectpicker();
-    $('#NatoSymbolMod1').selectpicker();
-    $('#NatoSymbolMod2').selectpicker();
-    $('#NatoSymbolHQ').selectpicker();
-
-    $('#NatoSymbolSize').on('change',applySymbol);
-    $('#NatoSymbolIcon').on('change',applySymbol);
-    $('#NatoSymbolMod1').on('change',applySymbol);
-    $('#NatoSymbolMod2').on('change',applySymbol);
-    $('#NatoSymbolHQ').on('change', applySymbol);
-    $('#UniqueDesignation').on('change', applySymbol);
-    applySymbol();
-});
\ No newline at end of file
diff --git a/Arma3TacMapWebApp/wwwroot/js/orbatUnitPage.js b/Arma3TacMapWebApp/wwwroot/js/orbatUnitPage.js
new file mode 100644
index 0000000..793f7a0
--- /dev/null
+++ b/Arma3TacMapWebApp/wwwroot/js/orbatUnitPage.js
@@ -0,0 +1,34 @@
+document.addEventListener("DOMContentLoaded", function () {
+
+    let fields = {
+        uniqueDesignation: document.getElementById('UniqueDesignation')
+    };
+
+    Object.getOwnPropertyNames(fields).forEach(name => {
+        fields[name].addEventListener('change', function () {
+            PmadMilsymbolSelector.getInstance('FriendSidc').updatePreview();
+        });
+    });
+
+    PmadMilsymbolSelector.setOptions("FriendSidc", {
+        getSymbolOptions: function () {
+            let options = {};
+            Object.getOwnPropertyNames(fields).forEach(name => {
+                let value = fields[name].value;
+                if (value !== '') {
+                    options[name] = value;
+                }
+            });
+            return options;
+        },
+        symbolUpdatedCallback: function (sidc, optionsWithDegrees, symbol) {
+            if (sidc.substring(3, 4) != "3" || sidc.substring(6, 7) != "0") {
+                // Force std id to "3" and status to "0" as required by backend
+                PmadMilsymbolSelector.getInstance('FriendSidc').setValue(
+                    sidc.substring(0, 3) + "3" + sidc.substring(4, 6) + "0" + sidc.substring(7)
+                );
+            }
+        }
+    });
+
+});
\ No newline at end of file