diff --git a/jmsfx-server/pom.xml b/jmsfx-server/pom.xml
index f0c0de26..4bd200c2 100644
--- a/jmsfx-server/pom.xml
+++ b/jmsfx-server/pom.xml
@@ -25,9 +25,15 @@
 	        <artifactId>spring-boot-starter-thymeleaf</artifactId>
             <version>${spring.boot.version}</version>
 	    </dependency>
+	    <dependency>
+	        <groupId>io.github.ctgnz</groupId>
+	        <artifactId>jmsfx-core</artifactId>
+	        <version>${project.version}</version>
+	    </dependency>
 	    <dependency>
 	        <groupId>io.github.ctgnz</groupId>
 	        <artifactId>jmsfx-standard</artifactId>
+	        <scope>runtime</scope>
 	        <version>2.0.0-SNAPSHOT</version>
 	    </dependency>
         <!-- JavaFX resolves its native classifier from the build host, so a jar
diff --git a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/SpringWebConfig.java b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/SpringWebConfig.java
index b6eebe00..98855f5f 100644
--- a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/SpringWebConfig.java
+++ b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/SpringWebConfig.java
@@ -1,5 +1,7 @@
 package io.github.ctgnz.jmsfx.server;
 
+import java.util.List;
+
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -9,6 +11,7 @@
 import org.springframework.context.support.ResourceBundleMessageSource;
 import org.springframework.format.FormatterRegistry;
 import org.springframework.format.datetime.DateFormatter;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -17,6 +20,8 @@
 import org.thymeleaf.spring6.view.ThymeleafViewResolver;
 import org.thymeleaf.templatemode.TemplateMode;
 
+import io.github.ctgnz.jmsfx.server.icon.SymbologyArgumentResolver;
+
 @Configuration
 @EnableWebMvc
 @ComponentScan
@@ -50,6 +55,20 @@ public ResourceBundleMessageSource messageSource() {
         return messageSource;
     }
 
+    /**
+     * Lets a handler take jmsfx-core's interfaces - a {@code SymbolSet}, an {@code Entity} - and have them resolved against the library on the classpath, rather than converted to
+     * a generated enum. See {@link SymbologyArgumentResolver} for why a converter cannot do it.
+     */
+    @Override
+    public void addArgumentResolvers(final List<HandlerMethodArgumentResolver> resolvers) {
+        resolvers.add(symbologyArgumentResolver());
+    }
+
+    @Bean
+    public SymbologyArgumentResolver symbologyArgumentResolver() {
+        return new SymbologyArgumentResolver();
+    }
+
     @Override
     public void addFormatters(final FormatterRegistry registry) {
         registry.addFormatter(dateFormatter());
diff --git a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/WebController.java b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/WebController.java
index 3e36849b..c54265dc 100644
--- a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/WebController.java
+++ b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/WebController.java
@@ -1,7 +1,5 @@
 package io.github.ctgnz.jmsfx.server;
 
-import java.util.Arrays;
-
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -9,8 +7,9 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.server.ResponseStatusException;
 
+import io.github.ctgnz.jmsfx.IconLibrary;
+import io.github.ctgnz.jmsfx.SymbolSet;
 import io.github.ctgnz.jmsfx.server.icon.SymbolSetSummary;
-import io.github.ctgnz.jmsfx.standard.SymbolSetEnum;
 
 @Controller
 public class WebController {
@@ -54,7 +53,9 @@ public String symbologyPrimer() {
         "/browse/{symbolSetId}"
     })
     public String browseSymbolSet(@PathVariable String symbolSetId, Model model) {
-        SymbolSetEnum symbolSet = Arrays.stream(SymbolSetEnum.values())
+        SymbolSet symbolSet = IconLibrary.discover()
+            .getSymbolSets()
+            .stream()
             .filter(candidate -> candidate.getId()
                 .equals(symbolSetId))
             .findFirst()
diff --git a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/ActivityIconController.java b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/ActivityIconController.java
deleted file mode 100644
index 2eede6cb..00000000
--- a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/ActivityIconController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.github.ctgnz.jmsfx.server.icon;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.github.ctgnz.jmsfx.AmplifierListItem;
-import io.github.ctgnz.jmsfx.standard.SymbolSetEnum;
-import io.github.ctgnz.jmsfx.standard.activity.ActivityEntity;
-import io.github.ctgnz.jmsfx.standard.activity.ActivityEntitySubType;
-import io.github.ctgnz.jmsfx.standard.activity.ActivityEntityType;
-import io.github.ctgnz.jmsfx.standard.activity.ActivitySectorOneModifier;
-import io.github.ctgnz.jmsfx.standard.activity.ActivitySectorTwoModifier;
-
-@RestController
-@RequestMapping("/Activity")
-public class ActivityIconController extends IconRestController<ActivityEntity, ActivityEntityType, ActivityEntitySubType, ActivitySectorOneModifier, ActivitySectorTwoModifier, AmplifierListItem> {
-
-    public ActivityIconController() {
-        super(SymbolSetEnum.ACTIVITY);
-    }
-
-}
diff --git a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/AirIconController.java b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/AirIconController.java
deleted file mode 100644
index 97005e1c..00000000
--- a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/AirIconController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.github.ctgnz.jmsfx.server.icon;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.github.ctgnz.jmsfx.AmplifierListItem;
-import io.github.ctgnz.jmsfx.standard.SymbolSetEnum;
-import io.github.ctgnz.jmsfx.standard.air.AirEntity;
-import io.github.ctgnz.jmsfx.standard.air.AirEntitySubType;
-import io.github.ctgnz.jmsfx.standard.air.AirEntityType;
-import io.github.ctgnz.jmsfx.standard.air.AirSectorOneModifier;
-import io.github.ctgnz.jmsfx.standard.air.AirSectorTwoModifier;
-
-@RestController
-@RequestMapping("/Air")
-public class AirIconController extends IconRestController<AirEntity, AirEntityType, AirEntitySubType, AirSectorOneModifier, AirSectorTwoModifier, AmplifierListItem> {
-
-    public AirIconController() {
-        super(SymbolSetEnum.AIR);
-    }
-
-}
diff --git a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/AirMissileIconController.java b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/AirMissileIconController.java
deleted file mode 100644
index ccfa00a8..00000000
--- a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/AirMissileIconController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.github.ctgnz.jmsfx.server.icon;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.github.ctgnz.jmsfx.AmplifierListItem;
-import io.github.ctgnz.jmsfx.EntitySubType;
-import io.github.ctgnz.jmsfx.EntityType;
-import io.github.ctgnz.jmsfx.standard.SymbolSetEnum;
-import io.github.ctgnz.jmsfx.standard.airmissile.AirMissileEntity;
-import io.github.ctgnz.jmsfx.standard.airmissile.AirMissileSectorOneModifier;
-import io.github.ctgnz.jmsfx.standard.airmissile.AirMissileSectorTwoModifier;
-
-@RestController
-@RequestMapping("/AirMissile")
-public class AirMissileIconController extends IconRestController<AirMissileEntity, EntityType, EntitySubType, AirMissileSectorOneModifier, AirMissileSectorTwoModifier, AmplifierListItem> {
-
-    public AirMissileIconController() {
-        super(SymbolSetEnum.AIR_MISSILE);
-    }
-
-}
diff --git a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/CommonIconController.java b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/CommonIconController.java
deleted file mode 100644
index 42aba7d0..00000000
--- a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/CommonIconController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.github.ctgnz.jmsfx.server.icon;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.github.ctgnz.jmsfx.AmplifierListItem;
-import io.github.ctgnz.jmsfx.standard.SymbolSetEnum;
-import io.github.ctgnz.jmsfx.standard.common.CommonEntity;
-import io.github.ctgnz.jmsfx.standard.common.CommonEntitySubType;
-import io.github.ctgnz.jmsfx.standard.common.CommonEntityType;
-import io.github.ctgnz.jmsfx.standard.common.CommonSectorOneModifier;
-import io.github.ctgnz.jmsfx.standard.common.CommonSectorTwoModifier;
-
-@RestController
-@RequestMapping("/Common")
-public class CommonIconController extends IconRestController<CommonEntity, CommonEntityType, CommonEntitySubType, CommonSectorOneModifier, CommonSectorTwoModifier, AmplifierListItem> {
-
-    public CommonIconController() {
-        super(SymbolSetEnum.COMMON);
-    }
-
-}
diff --git a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/ControlMeasureIconController.java b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/ControlMeasureIconController.java
deleted file mode 100644
index c888dd35..00000000
--- a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/ControlMeasureIconController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.github.ctgnz.jmsfx.server.icon;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.github.ctgnz.jmsfx.standard.SymbolSetEnum;
-import io.github.ctgnz.jmsfx.standard.amplifier.UnitEchelon;
-import io.github.ctgnz.jmsfx.standard.controlmeasure.ControlMeasureEntity;
-import io.github.ctgnz.jmsfx.standard.controlmeasure.ControlMeasureEntitySubType;
-import io.github.ctgnz.jmsfx.standard.controlmeasure.ControlMeasureEntityType;
-import io.github.ctgnz.jmsfx.standard.controlmeasure.ControlMeasureSectorOneModifier;
-import io.github.ctgnz.jmsfx.standard.controlmeasure.ControlMeasureSectorTwoModifier;
-
-@RestController
-@RequestMapping("/ControlMeasure")
-public class ControlMeasureIconController extends IconRestController<ControlMeasureEntity, ControlMeasureEntityType, ControlMeasureEntitySubType, ControlMeasureSectorOneModifier, ControlMeasureSectorTwoModifier, UnitEchelon> {
-
-    public ControlMeasureIconController() {
-        super(SymbolSetEnum.CONTROL_MEASURE);
-    }
-
-}
diff --git a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/CyberspaceAirIconController.java b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/CyberspaceAirIconController.java
deleted file mode 100644
index 058c2aaa..00000000
--- a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/CyberspaceAirIconController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.github.ctgnz.jmsfx.server.icon;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.github.ctgnz.jmsfx.AmplifierListItem;
-import io.github.ctgnz.jmsfx.EntitySubType;
-import io.github.ctgnz.jmsfx.standard.SymbolSetEnum;
-import io.github.ctgnz.jmsfx.standard.cyberspaceair.CyberspaceAirEntity;
-import io.github.ctgnz.jmsfx.standard.cyberspaceair.CyberspaceAirEntityType;
-import io.github.ctgnz.jmsfx.standard.cyberspaceair.CyberspaceAirSectorOneModifier;
-import io.github.ctgnz.jmsfx.standard.cyberspaceair.CyberspaceAirSectorTwoModifier;
-
-@RestController
-@RequestMapping("/CyberspaceAir")
-public class CyberspaceAirIconController extends IconRestController<CyberspaceAirEntity, CyberspaceAirEntityType, EntitySubType, CyberspaceAirSectorOneModifier, CyberspaceAirSectorTwoModifier, AmplifierListItem> {
-
-    public CyberspaceAirIconController() {
-        super(SymbolSetEnum.CYBERSPACE_AIR);
-    }
-
-}
diff --git a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/CyberspaceDismountedIndividualIconController.java b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/CyberspaceDismountedIndividualIconController.java
deleted file mode 100644
index d73b7415..00000000
--- a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/CyberspaceDismountedIndividualIconController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.github.ctgnz.jmsfx.server.icon;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.github.ctgnz.jmsfx.AmplifierListItem;
-import io.github.ctgnz.jmsfx.EntitySubType;
-import io.github.ctgnz.jmsfx.standard.SymbolSetEnum;
-import io.github.ctgnz.jmsfx.standard.cyberspacedismountedindividual.CyberspaceDismountedIndividualEntity;
-import io.github.ctgnz.jmsfx.standard.cyberspacedismountedindividual.CyberspaceDismountedIndividualEntityType;
-import io.github.ctgnz.jmsfx.standard.cyberspacedismountedindividual.CyberspaceDismountedIndividualSectorOneModifier;
-import io.github.ctgnz.jmsfx.standard.cyberspacedismountedindividual.CyberspaceDismountedIndividualSectorTwoModifier;
-
-@RestController
-@RequestMapping("/CyberspaceDismountedIndividual")
-public class CyberspaceDismountedIndividualIconController extends IconRestController<CyberspaceDismountedIndividualEntity, CyberspaceDismountedIndividualEntityType, EntitySubType, CyberspaceDismountedIndividualSectorOneModifier, CyberspaceDismountedIndividualSectorTwoModifier, AmplifierListItem> {
-
-    public CyberspaceDismountedIndividualIconController() {
-        super(SymbolSetEnum.CYBERSPACE_DISMOUNTED);
-    }
-
-}
diff --git a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/CyberspaceIconController.java b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/CyberspaceIconController.java
deleted file mode 100644
index 62211ae3..00000000
--- a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/CyberspaceIconController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.github.ctgnz.jmsfx.server.icon;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.github.ctgnz.jmsfx.EntitySubType;
-import io.github.ctgnz.jmsfx.standard.SymbolSetEnum;
-import io.github.ctgnz.jmsfx.standard.amplifier.UnitEchelon;
-import io.github.ctgnz.jmsfx.standard.cyberspace.CyberspaceEntity;
-import io.github.ctgnz.jmsfx.standard.cyberspace.CyberspaceEntityType;
-import io.github.ctgnz.jmsfx.standard.cyberspace.CyberspaceSectorOneModifier;
-import io.github.ctgnz.jmsfx.standard.cyberspace.CyberspaceSectorTwoModifier;
-
-@RestController
-@RequestMapping("/Cyberspace")
-public class CyberspaceIconController extends IconRestController<CyberspaceEntity, CyberspaceEntityType, EntitySubType, CyberspaceSectorOneModifier, CyberspaceSectorTwoModifier, UnitEchelon> {
-
-    public CyberspaceIconController() {
-        super(SymbolSetEnum.CYBERSPACE);
-    }
-
-}
diff --git a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/CyberspaceLandEquipmentIconController.java b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/CyberspaceLandEquipmentIconController.java
deleted file mode 100644
index 121e8ffe..00000000
--- a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/CyberspaceLandEquipmentIconController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.github.ctgnz.jmsfx.server.icon;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.github.ctgnz.jmsfx.AmplifierListItem;
-import io.github.ctgnz.jmsfx.EntitySubType;
-import io.github.ctgnz.jmsfx.standard.SymbolSetEnum;
-import io.github.ctgnz.jmsfx.standard.cyberspacelandequipment.CyberspaceLandEquipmentEntity;
-import io.github.ctgnz.jmsfx.standard.cyberspacelandequipment.CyberspaceLandEquipmentEntityType;
-import io.github.ctgnz.jmsfx.standard.cyberspacelandequipment.CyberspaceLandEquipmentSectorOneModifier;
-import io.github.ctgnz.jmsfx.standard.cyberspacelandequipment.CyberspaceLandEquipmentSectorTwoModifier;
-
-@RestController
-@RequestMapping("/CyberspaceLandEquipment")
-public class CyberspaceLandEquipmentIconController extends IconRestController<CyberspaceLandEquipmentEntity, CyberspaceLandEquipmentEntityType, EntitySubType, CyberspaceLandEquipmentSectorOneModifier, CyberspaceLandEquipmentSectorTwoModifier, AmplifierListItem> {
-
-    public CyberspaceLandEquipmentIconController() {
-        super(SymbolSetEnum.CYBERSPACE_LAND_EQUIPMENT);
-    }
-
-}
diff --git a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/CyberspaceLandInstallationIconController.java b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/CyberspaceLandInstallationIconController.java
deleted file mode 100644
index 8e966f6a..00000000
--- a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/CyberspaceLandInstallationIconController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.github.ctgnz.jmsfx.server.icon;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.github.ctgnz.jmsfx.AmplifierListItem;
-import io.github.ctgnz.jmsfx.EntitySubType;
-import io.github.ctgnz.jmsfx.standard.SymbolSetEnum;
-import io.github.ctgnz.jmsfx.standard.cyberspacelandinstallation.CyberspaceLandInstallationEntity;
-import io.github.ctgnz.jmsfx.standard.cyberspacelandinstallation.CyberspaceLandInstallationEntityType;
-import io.github.ctgnz.jmsfx.standard.cyberspacelandinstallation.CyberspaceLandInstallationSectorOneModifier;
-import io.github.ctgnz.jmsfx.standard.cyberspacelandinstallation.CyberspaceLandInstallationSectorTwoModifier;
-
-@RestController
-@RequestMapping("/CyberspaceLandInstallation")
-public class CyberspaceLandInstallationIconController extends IconRestController<CyberspaceLandInstallationEntity, CyberspaceLandInstallationEntityType, EntitySubType, CyberspaceLandInstallationSectorOneModifier, CyberspaceLandInstallationSectorTwoModifier, AmplifierListItem> {
-
-    public CyberspaceLandInstallationIconController() {
-        super(SymbolSetEnum.CYBERSPACE_LAND_INSTALLATION);
-    }
-
-}
diff --git a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/CyberspaceLandUnitIconController.java b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/CyberspaceLandUnitIconController.java
deleted file mode 100644
index 611ff416..00000000
--- a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/CyberspaceLandUnitIconController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.github.ctgnz.jmsfx.server.icon;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.github.ctgnz.jmsfx.AmplifierListItem;
-import io.github.ctgnz.jmsfx.EntitySubType;
-import io.github.ctgnz.jmsfx.standard.SymbolSetEnum;
-import io.github.ctgnz.jmsfx.standard.cyberspacelandunit.CyberspaceLandUnitEntity;
-import io.github.ctgnz.jmsfx.standard.cyberspacelandunit.CyberspaceLandUnitEntityType;
-import io.github.ctgnz.jmsfx.standard.cyberspacelandunit.CyberspaceLandUnitSectorOneModifier;
-import io.github.ctgnz.jmsfx.standard.cyberspacelandunit.CyberspaceLandUnitSectorTwoModifier;
-
-@RestController
-@RequestMapping("/CyberspaceLandUnit")
-public class CyberspaceLandUnitIconController extends IconRestController<CyberspaceLandUnitEntity, CyberspaceLandUnitEntityType, EntitySubType, CyberspaceLandUnitSectorOneModifier, CyberspaceLandUnitSectorTwoModifier, AmplifierListItem> {
-
-    public CyberspaceLandUnitIconController() {
-        super(SymbolSetEnum.CYBERSPACE_LAND_UNIT);
-    }
-
-}
diff --git a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/CyberspaceSeaSubsurfaceIconController.java b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/CyberspaceSeaSubsurfaceIconController.java
deleted file mode 100644
index 39776542..00000000
--- a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/CyberspaceSeaSubsurfaceIconController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.github.ctgnz.jmsfx.server.icon;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.github.ctgnz.jmsfx.AmplifierListItem;
-import io.github.ctgnz.jmsfx.EntitySubType;
-import io.github.ctgnz.jmsfx.standard.SymbolSetEnum;
-import io.github.ctgnz.jmsfx.standard.cyberspaceseasubsurface.CyberspaceSeaSubsurfaceEntity;
-import io.github.ctgnz.jmsfx.standard.cyberspaceseasubsurface.CyberspaceSeaSubsurfaceEntityType;
-import io.github.ctgnz.jmsfx.standard.cyberspaceseasubsurface.CyberspaceSeaSubsurfaceSectorOneModifier;
-import io.github.ctgnz.jmsfx.standard.cyberspaceseasubsurface.CyberspaceSeaSubsurfaceSectorTwoModifier;
-
-@RestController
-@RequestMapping("/CyberspaceSeaSubsurface")
-public class CyberspaceSeaSubsurfaceIconController extends IconRestController<CyberspaceSeaSubsurfaceEntity, CyberspaceSeaSubsurfaceEntityType, EntitySubType, CyberspaceSeaSubsurfaceSectorOneModifier, CyberspaceSeaSubsurfaceSectorTwoModifier, AmplifierListItem> {
-
-    public CyberspaceSeaSubsurfaceIconController() {
-        super(SymbolSetEnum.CYBERSPACE_SEA_SUBSURFACE);
-    }
-
-}
diff --git a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/CyberspaceSeaSurfaceIconController.java b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/CyberspaceSeaSurfaceIconController.java
deleted file mode 100644
index 6ddc21b3..00000000
--- a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/CyberspaceSeaSurfaceIconController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.github.ctgnz.jmsfx.server.icon;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.github.ctgnz.jmsfx.AmplifierListItem;
-import io.github.ctgnz.jmsfx.EntitySubType;
-import io.github.ctgnz.jmsfx.standard.SymbolSetEnum;
-import io.github.ctgnz.jmsfx.standard.cyberspaceseasurface.CyberspaceSeaSurfaceEntity;
-import io.github.ctgnz.jmsfx.standard.cyberspaceseasurface.CyberspaceSeaSurfaceEntityType;
-import io.github.ctgnz.jmsfx.standard.cyberspaceseasurface.CyberspaceSeaSurfaceSectorOneModifier;
-import io.github.ctgnz.jmsfx.standard.cyberspaceseasurface.CyberspaceSeaSurfaceSectorTwoModifier;
-
-@RestController
-@RequestMapping("/CyberspaceSeaSurface")
-public class CyberspaceSeaSurfaceIconController extends IconRestController<CyberspaceSeaSurfaceEntity, CyberspaceSeaSurfaceEntityType, EntitySubType, CyberspaceSeaSurfaceSectorOneModifier, CyberspaceSeaSurfaceSectorTwoModifier, AmplifierListItem> {
-
-    public CyberspaceSeaSurfaceIconController() {
-        super(SymbolSetEnum.CYBERSPACE_SEA_SURFACE);
-    }
-
-}
diff --git a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/CyberspaceSpaceIconController.java b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/CyberspaceSpaceIconController.java
deleted file mode 100644
index ffb91288..00000000
--- a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/CyberspaceSpaceIconController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.github.ctgnz.jmsfx.server.icon;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.github.ctgnz.jmsfx.AmplifierListItem;
-import io.github.ctgnz.jmsfx.EntitySubType;
-import io.github.ctgnz.jmsfx.standard.SymbolSetEnum;
-import io.github.ctgnz.jmsfx.standard.cyberspacespace.CyberspaceSpaceEntity;
-import io.github.ctgnz.jmsfx.standard.cyberspacespace.CyberspaceSpaceEntityType;
-import io.github.ctgnz.jmsfx.standard.cyberspacespace.CyberspaceSpaceSectorOneModifier;
-import io.github.ctgnz.jmsfx.standard.cyberspacespace.CyberspaceSpaceSectorTwoModifier;
-
-@RestController
-@RequestMapping("/CyberspaceSpace")
-public class CyberspaceSpaceIconController extends IconRestController<CyberspaceSpaceEntity, CyberspaceSpaceEntityType, EntitySubType, CyberspaceSpaceSectorOneModifier, CyberspaceSpaceSectorTwoModifier, AmplifierListItem> {
-
-    public CyberspaceSpaceIconController() {
-        super(SymbolSetEnum.CYBERSPACE_SPACE);
-    }
-
-}
diff --git a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/DismountedIndividualIconController.java b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/DismountedIndividualIconController.java
deleted file mode 100644
index 41d8bf72..00000000
--- a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/DismountedIndividualIconController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.github.ctgnz.jmsfx.server.icon;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.github.ctgnz.jmsfx.standard.SymbolSetEnum;
-import io.github.ctgnz.jmsfx.standard.amplifier.LeadershipRole;
-import io.github.ctgnz.jmsfx.standard.dismountedindividual.DismountedIndividualEntity;
-import io.github.ctgnz.jmsfx.standard.dismountedindividual.DismountedIndividualEntitySubType;
-import io.github.ctgnz.jmsfx.standard.dismountedindividual.DismountedIndividualEntityType;
-import io.github.ctgnz.jmsfx.standard.dismountedindividual.DismountedIndividualSectorOneModifier;
-import io.github.ctgnz.jmsfx.standard.dismountedindividual.DismountedIndividualSectorTwoModifier;
-
-@RestController
-@RequestMapping("/DismountedIndividual")
-public class DismountedIndividualIconController extends IconRestController<DismountedIndividualEntity, DismountedIndividualEntityType, DismountedIndividualEntitySubType, DismountedIndividualSectorOneModifier, DismountedIndividualSectorTwoModifier, LeadershipRole> {
-
-    public DismountedIndividualIconController() {
-        super(SymbolSetEnum.DISMOUNTED);
-    }
-
-}
diff --git a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/IconGeneratorController.java b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/IconGeneratorController.java
index e8b703be..5b1269ec 100644
--- a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/IconGeneratorController.java
+++ b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/IconGeneratorController.java
@@ -1,24 +1,25 @@
 package io.github.ctgnz.jmsfx.server.icon;
 
-import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import io.github.ctgnz.jmsfx.standard.SymbolSetEnum;
+import io.github.ctgnz.jmsfx.IconLibrary;
 
 @RestController
 @RequestMapping("/info")
 public class IconGeneratorController {
 
+    /** The symbol sets of whichever library is on the classpath, each carrying the path segment the icon API is reached at. */
     @GetMapping("/symbols")
     public List<SymbolSetSummary> getSupportedSymbolSets() {
-        return Arrays.stream(SymbolSetEnum.values())
+        return IconLibrary.discover()
+            .getSymbolSets()
+            .stream()
             .map(SymbolSetSummary::of)
-            .collect(Collectors.toList());
+            .toList();
     }
 
 }
diff --git a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/IconRestController.java b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/IconRestController.java
index 3142da91..f8b9b274 100644
--- a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/IconRestController.java
+++ b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/IconRestController.java
@@ -6,8 +6,9 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import nz.co.ctg.foxglove.FoxgloveParser;
 
@@ -18,116 +19,103 @@
 import io.github.ctgnz.jmsfx.IconLibrary;
 import io.github.ctgnz.jmsfx.SectorOneModifier;
 import io.github.ctgnz.jmsfx.SectorTwoModifier;
+import io.github.ctgnz.jmsfx.SymbolSet;
 import io.github.ctgnz.jmsfx.icon.IdentificationSymbol;
-import io.github.ctgnz.jmsfx.standard.SymbolSetEnum;
 
-public abstract class IconRestController<E extends Entity, T extends EntityType, S extends EntitySubType, M extends SectorOneModifier, N extends SectorTwoModifier, A extends AmplifierListItem> {
-    private final SymbolSetEnum symbolSet;
-    private final FoxgloveParser parser = new FoxgloveParser();
+/**
+ * The icon API, for whichever symbology library is on the classpath.
+ * <p>
+ * This used to be an abstract class with six type parameters and twenty-three subclasses, one per symbol set, each binding those parameters to one set's generated enums and fixing
+ * its own URL prefix. That shape existed for a single reason: Spring converts a {@code @PathVariable} of an enum type through {@code Enum.valueOf}, so a handler had to name a
+ * concrete enum to accept one. The symbol set moves into the path and {@link SymbologyArgumentResolver} does the resolving, so the handlers can take jmsfx-core's interfaces and no
+ * generated type is named anywhere in this module.
+ * <p>
+ * The URLs are unchanged. The prefix each subclass declared was {@link SymbolSetSummary#pathFor} applied to its set, which is now simply matched rather than hard-coded, and path
+ * segments are still the Java enum constant names {@link CodeElementSummary} publishes.
+ * <p>
+ * See jmsfx#93, and jmsfx#76 for the same move made in jmsfx-creator.
+ */
+@RestController
+@RequestMapping("/{" + SymbologyArgumentResolver.SYMBOL_SET + "}")
+public class IconRestController {
 
-    public IconRestController(SymbolSetEnum symbolSet) {
-        this.symbolSet = symbolSet;
-    }
+    private final FoxgloveParser parser = new FoxgloveParser();
 
     @GetMapping("/modifier/one")
-    public List<CodeElementSummary> listSectorOneModifiers() {
-        return symbolSet.getSectorOneModifiers()
-            .stream()
-            .map(CodeElementSummary::of)
-            .toList();
+    public List<CodeElementSummary> listSectorOneModifiers(SymbolSet symbolSet) {
+        return summarise(symbolSet.getSectorOneModifiers());
     }
 
     @GetMapping("/modifier/two")
-    public List<CodeElementSummary> listSectorTwoModifiers() {
-        return symbolSet.getSectorTwoModifiers()
-            .stream()
-            .map(CodeElementSummary::of)
-            .toList();
+    public List<CodeElementSummary> listSectorTwoModifiers(SymbolSet symbolSet) {
+        return summarise(symbolSet.getSectorTwoModifiers());
     }
 
     @GetMapping("/amplifier")
-    public List<CodeElementSummary> listAmplifiers() {
-        return symbolSet.getAmplifierList()
-            .stream()
-            .map(CodeElementSummary::of)
-            .toList();
+    public List<CodeElementSummary> listAmplifiers(SymbolSet symbolSet) {
+        return summarise(symbolSet.getAmplifierList());
     }
 
     @GetMapping("/entity/list")
-    public List<CodeElementSummary> listEntities() {
-        return symbolSet.getEntities()
-            .stream()
-            .map(CodeElementSummary::of)
-            .toList();
+    public List<CodeElementSummary> listEntities(SymbolSet symbolSet) {
+        return summarise(symbolSet.getEntities());
     }
 
     @GetMapping("/entityType/{entity}/list")
-    public List<CodeElementSummary> listEntityTypes(@PathVariable E entity) {
-        return entity.getEntityTypes()
-            .stream()
-            .map(CodeElementSummary::of)
-            .toList();
+    public List<CodeElementSummary> listEntityTypes(Entity entity) {
+        return summarise(entity.getEntityTypes());
     }
 
     @GetMapping("/entitySubType/{entityType}/list")
-    public List<CodeElementSummary> listEntitySubTypes(@PathVariable T entityType) {
-        return entityType.getEntitySubTypes()
-            .stream()
-            .map(CodeElementSummary::of)
-            .toList();
+    public List<CodeElementSummary> listEntitySubTypes(EntityType entityType) {
+        return summarise(entityType.getEntitySubTypes());
     }
 
     @GetMapping("/symbol")
-    public ResponseEntity<byte[]> generateFrameOnlySymbol(@RequestParam(required = false) M sectorOneMod,
-                                                          @RequestParam(required = false) N sectorTwoMod,
-                                                          @RequestParam(required = false) A amplifier,
+    public ResponseEntity<byte[]> generateFrameOnlySymbol(SymbolSet symbolSet, SectorOneModifier sectorOneMod, SectorTwoModifier sectorTwoMod, AmplifierListItem amplifier,
                                                           @RequestParam(defaultValue = "false") boolean trim) throws Exception {
-        return renderSvg(buildSymbol(null, null, null, sectorOneMod, sectorTwoMod, amplifier), trim);
+        return renderSvg(buildSymbol(symbolSet, null, null, null, sectorOneMod, sectorTwoMod, amplifier), trim);
     }
 
     @GetMapping("/symbol/modifier/one/{sectorOneMod}")
-    public ResponseEntity<byte[]> generateModifierOneSymbol(@PathVariable M sectorOneMod,
+    public ResponseEntity<byte[]> generateModifierOneSymbol(SymbolSet symbolSet, SectorOneModifier sectorOneMod,
                                                             @RequestParam(defaultValue = "false") boolean trim) throws Exception {
-        return renderSvg(buildSymbol(null, null, null, sectorOneMod, null, null), trim);
+        return renderSvg(buildSymbol(symbolSet, null, null, null, sectorOneMod, null, null), trim);
     }
 
     @GetMapping("/symbol/modifier/two/{sectorTwoMod}")
-    public ResponseEntity<byte[]> generateModifierTwoSymbol(@PathVariable N sectorTwoMod,
+    public ResponseEntity<byte[]> generateModifierTwoSymbol(SymbolSet symbolSet, SectorTwoModifier sectorTwoMod,
                                                             @RequestParam(defaultValue = "false") boolean trim) throws Exception {
-        return renderSvg(buildSymbol(null, null, null, null, sectorTwoMod, null), trim);
+        return renderSvg(buildSymbol(symbolSet, null, null, null, null, sectorTwoMod, null), trim);
     }
 
     @GetMapping("/symbol/entity/{entity}")
-    public ResponseEntity<byte[]> generateEntitySymbol(@PathVariable E entity,
-                                                       @RequestParam(required = false) M sectorOneMod,
-                                                       @RequestParam(required = false) N sectorTwoMod,
-                                                       @RequestParam(required = false) A amplifier,
-                                                       @RequestParam(defaultValue = "false") boolean trim) throws Exception {
-        return renderSvg(buildSymbol(entity, null, null, sectorOneMod, sectorTwoMod, amplifier), trim);
+    public ResponseEntity<byte[]> generateEntitySymbol(SymbolSet symbolSet, Entity entity, SectorOneModifier sectorOneMod, SectorTwoModifier sectorTwoMod,
+                                                       AmplifierListItem amplifier, @RequestParam(defaultValue = "false") boolean trim) throws Exception {
+        return renderSvg(buildSymbol(symbolSet, entity, null, null, sectorOneMod, sectorTwoMod, amplifier), trim);
     }
 
-    @SuppressWarnings("unchecked")
     @GetMapping("/symbol/{entityType}/{entitySubType}")
-    public ResponseEntity<byte[]> generateEntitySubTypeSymbol(@PathVariable T entityType,
-                                                              @PathVariable S entitySubType,
-                                                              @RequestParam(required = false) M sectorOneMod,
-                                                              @RequestParam(required = false) N sectorTwoMod,
-                                                              @RequestParam(required = false) A amplifier,
+    public ResponseEntity<byte[]> generateEntitySubTypeSymbol(SymbolSet symbolSet, EntityType entityType, EntitySubType entitySubType, SectorOneModifier sectorOneMod,
+                                                              SectorTwoModifier sectorTwoMod, AmplifierListItem amplifier,
                                                               @RequestParam(defaultValue = "false") boolean trim) throws Exception {
-        return renderSvg(buildSymbol((E) entityType.getEntity(), entityType, entitySubType, sectorOneMod, sectorTwoMod, amplifier), trim);
+        return renderSvg(buildSymbol(symbolSet, entityType.getEntity(), entityType, entitySubType, sectorOneMod, sectorTwoMod, amplifier), trim);
     }
 
-    @SuppressWarnings("unchecked")
     @GetMapping("/symbol/{entityType}")
-    public ResponseEntity<byte[]> generateSymbol(@PathVariable T entityType,
-                                                 @RequestParam(required = false) M sectorOneMod,
-                                                 @RequestParam(required = false) N sectorTwoMod,
-                                                 @RequestParam(required = false) A amplifier,
-                                                 @RequestParam(defaultValue = "false") boolean trim) throws Exception {
-        return renderSvg(buildSymbol((E) entityType.getEntity(), entityType, null, sectorOneMod, sectorTwoMod, amplifier), trim);
+    public ResponseEntity<byte[]> generateSymbol(SymbolSet symbolSet, EntityType entityType, SectorOneModifier sectorOneMod, SectorTwoModifier sectorTwoMod,
+                                                 AmplifierListItem amplifier, @RequestParam(defaultValue = "false") boolean trim) throws Exception {
+        return renderSvg(buildSymbol(symbolSet, entityType.getEntity(), entityType, null, sectorOneMod, sectorTwoMod, amplifier), trim);
+    }
+
+    private static List<CodeElementSummary> summarise(List<? extends io.github.ctgnz.jmsfx.CodeElement> elements) {
+        return elements.stream()
+            .map(CodeElementSummary::of)
+            .toList();
     }
 
-    private IdentificationSymbol buildSymbol(E entity, T entityType, S entitySubType, M sectorOneMod, N sectorTwoMod, A amplifier) {
+    private IdentificationSymbol buildSymbol(SymbolSet symbolSet, Entity entity, EntityType entityType, EntitySubType entitySubType, SectorOneModifier sectorOneMod,
+                                             SectorTwoModifier sectorTwoMod, AmplifierListItem amplifier) {
         IdentificationSymbol symbol = new IdentificationSymbol(IconLibrary.discover());
         symbol.symbolSetProperty()
             .set(symbolSet);
diff --git a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/LandCivilianIconController.java b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/LandCivilianIconController.java
deleted file mode 100644
index fc454cd2..00000000
--- a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/LandCivilianIconController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.github.ctgnz.jmsfx.server.icon;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.github.ctgnz.jmsfx.AmplifierListItem;
-import io.github.ctgnz.jmsfx.EntitySubType;
-import io.github.ctgnz.jmsfx.standard.SymbolSetEnum;
-import io.github.ctgnz.jmsfx.standard.landcivilian.LandCivilianEntity;
-import io.github.ctgnz.jmsfx.standard.landcivilian.LandCivilianEntityType;
-import io.github.ctgnz.jmsfx.standard.landcivilian.LandCivilianSectorOneModifier;
-import io.github.ctgnz.jmsfx.standard.landcivilian.LandCivilianSectorTwoModifier;
-
-@RestController
-@RequestMapping("/LandCivilian")
-public class LandCivilianIconController extends IconRestController<LandCivilianEntity, LandCivilianEntityType, EntitySubType, LandCivilianSectorOneModifier, LandCivilianSectorTwoModifier, AmplifierListItem> {
-
-    public LandCivilianIconController() {
-        super(SymbolSetEnum.LAND_CIVILIAN);
-    }
-
-}
diff --git a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/LandEquipmentIconController.java b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/LandEquipmentIconController.java
deleted file mode 100644
index 450b7aaf..00000000
--- a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/LandEquipmentIconController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.github.ctgnz.jmsfx.server.icon;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.github.ctgnz.jmsfx.standard.SymbolSetEnum;
-import io.github.ctgnz.jmsfx.standard.amplifier.EquipmentMobility;
-import io.github.ctgnz.jmsfx.standard.landequipment.LandEquipmentEntity;
-import io.github.ctgnz.jmsfx.standard.landequipment.LandEquipmentEntitySubType;
-import io.github.ctgnz.jmsfx.standard.landequipment.LandEquipmentEntityType;
-import io.github.ctgnz.jmsfx.standard.landequipment.LandEquipmentSectorOneModifier;
-import io.github.ctgnz.jmsfx.standard.landequipment.LandEquipmentSectorTwoModifier;
-
-@RestController
-@RequestMapping("/LandEquipment")
-public class LandEquipmentIconController extends IconRestController<LandEquipmentEntity, LandEquipmentEntityType, LandEquipmentEntitySubType, LandEquipmentSectorOneModifier, LandEquipmentSectorTwoModifier, EquipmentMobility> {
-
-    public LandEquipmentIconController() {
-        super(SymbolSetEnum.LAND_EQUIPMENT);
-    }
-
-}
diff --git a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/LandInstallationIconController.java b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/LandInstallationIconController.java
deleted file mode 100644
index 3360d8e0..00000000
--- a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/LandInstallationIconController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.github.ctgnz.jmsfx.server.icon;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.github.ctgnz.jmsfx.standard.SymbolSetEnum;
-import io.github.ctgnz.jmsfx.standard.amplifier.EquipmentMobility;
-import io.github.ctgnz.jmsfx.standard.landinstallation.LandInstallationEntity;
-import io.github.ctgnz.jmsfx.standard.landinstallation.LandInstallationEntitySubType;
-import io.github.ctgnz.jmsfx.standard.landinstallation.LandInstallationEntityType;
-import io.github.ctgnz.jmsfx.standard.landinstallation.LandInstallationSectorOneModifier;
-import io.github.ctgnz.jmsfx.standard.landinstallation.LandInstallationSectorTwoModifier;
-
-@RestController
-@RequestMapping("/LandInstallation")
-public class LandInstallationIconController extends IconRestController<LandInstallationEntity, LandInstallationEntityType, LandInstallationEntitySubType, LandInstallationSectorOneModifier, LandInstallationSectorTwoModifier, EquipmentMobility> {
-
-    public LandInstallationIconController() {
-        super(SymbolSetEnum.LAND_INSTALLATION);
-    }
-
-}
diff --git a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/LandUnitsIconController.java b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/LandUnitsIconController.java
deleted file mode 100644
index b8d5dc1f..00000000
--- a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/LandUnitsIconController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.github.ctgnz.jmsfx.server.icon;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.github.ctgnz.jmsfx.standard.SymbolSetEnum;
-import io.github.ctgnz.jmsfx.standard.amplifier.UnitEchelon;
-import io.github.ctgnz.jmsfx.standard.landunits.LandUnitsEntity;
-import io.github.ctgnz.jmsfx.standard.landunits.LandUnitsEntitySubType;
-import io.github.ctgnz.jmsfx.standard.landunits.LandUnitsEntityType;
-import io.github.ctgnz.jmsfx.standard.landunits.LandUnitsSectorOneModifier;
-import io.github.ctgnz.jmsfx.standard.landunits.LandUnitsSectorTwoModifier;
-
-@RestController
-@RequestMapping("/LandUnits")
-public class LandUnitsIconController extends IconRestController<LandUnitsEntity, LandUnitsEntityType, LandUnitsEntitySubType, LandUnitsSectorOneModifier, LandUnitsSectorTwoModifier, UnitEchelon> {
-
-    public LandUnitsIconController() {
-        super(SymbolSetEnum.LAND_UNIT);
-    }
-
-}
diff --git a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/MineWarfareIconController.java b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/MineWarfareIconController.java
deleted file mode 100644
index be0139a7..00000000
--- a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/MineWarfareIconController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.github.ctgnz.jmsfx.server.icon;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.github.ctgnz.jmsfx.AmplifierListItem;
-import io.github.ctgnz.jmsfx.standard.SymbolSetEnum;
-import io.github.ctgnz.jmsfx.standard.minewarfare.MineWarfareEntity;
-import io.github.ctgnz.jmsfx.standard.minewarfare.MineWarfareEntitySubType;
-import io.github.ctgnz.jmsfx.standard.minewarfare.MineWarfareEntityType;
-import io.github.ctgnz.jmsfx.standard.minewarfare.MineWarfareSectorOneModifier;
-import io.github.ctgnz.jmsfx.standard.minewarfare.MineWarfareSectorTwoModifier;
-
-@RestController
-@RequestMapping("/MineWarfare")
-public class MineWarfareIconController extends IconRestController<MineWarfareEntity, MineWarfareEntityType, MineWarfareEntitySubType, MineWarfareSectorOneModifier, MineWarfareSectorTwoModifier, AmplifierListItem> {
-
-    public MineWarfareIconController() {
-        super(SymbolSetEnum.MINE_WARFARE);
-    }
-
-}
diff --git a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/SeaSubsurfaceIconController.java b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/SeaSubsurfaceIconController.java
deleted file mode 100644
index 418c9384..00000000
--- a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/SeaSubsurfaceIconController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.github.ctgnz.jmsfx.server.icon;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.github.ctgnz.jmsfx.AmplifierListItem;
-import io.github.ctgnz.jmsfx.standard.SymbolSetEnum;
-import io.github.ctgnz.jmsfx.standard.seasubsurface.SeaSubsurfaceEntity;
-import io.github.ctgnz.jmsfx.standard.seasubsurface.SeaSubsurfaceEntitySubType;
-import io.github.ctgnz.jmsfx.standard.seasubsurface.SeaSubsurfaceEntityType;
-import io.github.ctgnz.jmsfx.standard.seasubsurface.SeaSubsurfaceSectorOneModifier;
-import io.github.ctgnz.jmsfx.standard.seasubsurface.SeaSubsurfaceSectorTwoModifier;
-
-@RestController
-@RequestMapping("/SeaSubsurface")
-public class SeaSubsurfaceIconController extends IconRestController<SeaSubsurfaceEntity, SeaSubsurfaceEntityType, SeaSubsurfaceEntitySubType, SeaSubsurfaceSectorOneModifier, SeaSubsurfaceSectorTwoModifier, AmplifierListItem> {
-
-    public SeaSubsurfaceIconController() {
-        super(SymbolSetEnum.SEA_SUBSURFACE);
-    }
-
-}
diff --git a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/SeaSurfaceIconController.java b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/SeaSurfaceIconController.java
deleted file mode 100644
index 1c40275f..00000000
--- a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/SeaSurfaceIconController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.github.ctgnz.jmsfx.server.icon;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.github.ctgnz.jmsfx.standard.SymbolSetEnum;
-import io.github.ctgnz.jmsfx.standard.amplifier.TowedArrayType;
-import io.github.ctgnz.jmsfx.standard.seasurface.SeaSurfaceEntity;
-import io.github.ctgnz.jmsfx.standard.seasurface.SeaSurfaceEntitySubType;
-import io.github.ctgnz.jmsfx.standard.seasurface.SeaSurfaceEntityType;
-import io.github.ctgnz.jmsfx.standard.seasurface.SeaSurfaceSectorOneModifier;
-import io.github.ctgnz.jmsfx.standard.seasurface.SeaSurfaceSectorTwoModifier;
-
-@RestController
-@RequestMapping("/SeaSurface")
-public class SeaSurfaceIconController extends IconRestController<SeaSurfaceEntity, SeaSurfaceEntityType, SeaSurfaceEntitySubType, SeaSurfaceSectorOneModifier, SeaSurfaceSectorTwoModifier, TowedArrayType> {
-
-    public SeaSurfaceIconController() {
-        super(SymbolSetEnum.SEA_SURFACE);
-    }
-
-}
diff --git a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/SpaceIconController.java b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/SpaceIconController.java
deleted file mode 100644
index a088b346..00000000
--- a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/SpaceIconController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.github.ctgnz.jmsfx.server.icon;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.github.ctgnz.jmsfx.AmplifierListItem;
-import io.github.ctgnz.jmsfx.EntitySubType;
-import io.github.ctgnz.jmsfx.standard.SymbolSetEnum;
-import io.github.ctgnz.jmsfx.standard.space.SpaceEntity;
-import io.github.ctgnz.jmsfx.standard.space.SpaceEntityType;
-import io.github.ctgnz.jmsfx.standard.space.SpaceSectorOneModifier;
-import io.github.ctgnz.jmsfx.standard.space.SpaceSectorTwoModifier;
-
-@RestController
-@RequestMapping("/Space")
-public class SpaceIconController extends IconRestController<SpaceEntity, SpaceEntityType, EntitySubType, SpaceSectorOneModifier, SpaceSectorTwoModifier, AmplifierListItem> {
-
-    public SpaceIconController() {
-        super(SymbolSetEnum.SPACE);
-    }
-
-}
diff --git a/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/SymbologyArgumentResolver.java b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/SymbologyArgumentResolver.java
new file mode 100644
index 00000000..c45d4c52
--- /dev/null
+++ b/jmsfx-server/src/main/java/io/github/ctgnz/jmsfx/server/icon/SymbologyArgumentResolver.java
@@ -0,0 +1,140 @@
+package io.github.ctgnz.jmsfx.server.icon;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import org.springframework.core.MethodParameter;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.support.WebDataBinderFactory;
+import org.springframework.web.context.request.NativeWebRequest;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.method.support.ModelAndViewContainer;
+import org.springframework.web.server.ResponseStatusException;
+import org.springframework.web.servlet.HandlerMapping;
+
+import io.github.ctgnz.jmsfx.AmplifierListItem;
+import io.github.ctgnz.jmsfx.CodeElement;
+import io.github.ctgnz.jmsfx.Entity;
+import io.github.ctgnz.jmsfx.EntitySubType;
+import io.github.ctgnz.jmsfx.EntityType;
+import io.github.ctgnz.jmsfx.IconLibrary;
+import io.github.ctgnz.jmsfx.SectorOneModifier;
+import io.github.ctgnz.jmsfx.SectorTwoModifier;
+import io.github.ctgnz.jmsfx.SymbolSet;
+
+/**
+ * Resolves a handler's symbology arguments against the library on the classpath, rather than by converting a path variable to a generated enum.
+ * <p>
+ * Conversion is what tied the icon API to one library. Spring converts a {@code @PathVariable} of an enum type through {@code Enum.valueOf}, so a handler had to <em>name</em> a
+ * concrete enum in its signature - which meant a controller per symbol set, each binding {@link IconRestController}'s type parameters to one set's generated types, and the whole
+ * lot recompiled for a different library. jmsfx#90 is what that costs: several of those bindings were wrong and only a request could reveal it.
+ * <p>
+ * A resolver can do what a {@code Converter} cannot: see the rest of the request. Every value here is resolved <em>within</em> the symbol set named earlier in the same path, so
+ * the handlers can take the interface types from jmsfx-core and the concrete types never appear.
+ * <p>
+ * Values are matched on the Java enum constant name, which is what {@link CodeElementSummary} publishes as {@code name} and what the previous conversion consumed - so a caller's
+ * URLs are unchanged. That every implementor is an enum is an assumption this shares with {@code CodeElementSummary}; it holds because they are all generated that way.
+ */
+@Component
+public class SymbologyArgumentResolver implements HandlerMethodArgumentResolver {
+
+    /** The path variable naming the symbol set, which every other value here is resolved within. */
+    static final String SYMBOL_SET = "symbolSet";
+
+    @Override
+    public boolean supportsParameter(MethodParameter parameter) {
+        Class<?> type = parameter.getParameterType();
+        return SymbolSet.class == type || Entity.class == type || EntityType.class == type || EntitySubType.class == type || SectorOneModifier.class == type
+               || SectorTwoModifier.class == type || AmplifierListItem.class == type;
+    }
+
+    @Override
+    public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer container, NativeWebRequest request, WebDataBinderFactory binderFactory) {
+        SymbolSet symbolSet = symbolSet(request);
+        Class<?> type = parameter.getParameterType();
+        if (SymbolSet.class == type) {
+            return symbolSet;
+        }
+
+        String name = parameter.getParameterName();
+        // A path variable first, then a query parameter. Which one a value arrives in is a property of
+        // the endpoint rather than of the value - an amplifier is a query parameter on /symbol and the
+        // sector modifiers are path variables on /symbol/modifier/one - so the resolver takes it from
+        // wherever it appears rather than needing an annotation on every argument to say which.
+        String value = Optional.ofNullable(pathVariables(request).get(name))
+            .orElseGet(() -> request.getParameter(name));
+        if (value == null || value.isBlank()) {
+            // Absent is a legitimate answer for the optional query parameters; a path variable cannot be
+            // absent, because the mapping that matched the request is what put it there.
+            return null;
+        }
+        return find(candidates(symbolSet, type), value, name);
+    }
+
+    /** The symbol set named in the path, matched by the same function that wrote the URL segment in the first place. */
+    private SymbolSet symbolSet(NativeWebRequest request) {
+        String path = pathVariables(request).get(SYMBOL_SET);
+        if (path == null) {
+            throw new IllegalStateException("a handler taking symbology arguments must be mapped under /{" + SYMBOL_SET + "}");
+        }
+        return IconLibrary.discover()
+            .getSymbolSets()
+            .stream()
+            .filter(candidate -> SymbolSetSummary.pathFor(candidate)
+                .equals(path))
+            .findFirst()
+            .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Unknown symbol set: " + path));
+    }
+
+    /**
+     * What a value of this type could be, within this symbol set.
+     * <p>
+     * Entity types and sub-types are reached through their parents rather than held by the set directly, which is also what makes them unambiguous: a type's name is unique within
+     * its set, so flattening loses nothing.
+     */
+    private List<? extends CodeElement> candidates(SymbolSet symbolSet, Class<?> type) {
+        if (Entity.class == type) {
+            return symbolSet.getEntities();
+        }
+        if (EntityType.class == type) {
+            return symbolSet.getEntities()
+                .stream()
+                .flatMap(entity -> entity.getEntityTypes()
+                    .stream())
+                .toList();
+        }
+        if (EntitySubType.class == type) {
+            return symbolSet.getEntities()
+                .stream()
+                .flatMap(entity -> entity.getEntityTypes()
+                    .stream())
+                .flatMap(entityType -> entityType.getEntitySubTypes()
+                    .stream())
+                .toList();
+        }
+        if (SectorOneModifier.class == type) {
+            return symbolSet.getSectorOneModifiers();
+        }
+        if (SectorTwoModifier.class == type) {
+            return symbolSet.getSectorTwoModifiers();
+        }
+        return symbolSet.getAmplifierList();
+    }
+
+    private CodeElement find(List<? extends CodeElement> candidates, String value, String what) {
+        return candidates.stream()
+            .filter(candidate -> candidate instanceof Enum<?> constant && constant.name()
+                .equals(value))
+            .findFirst()
+            .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, String.format("Unknown %s: %s", what, value)));
+    }
+
+    @SuppressWarnings("unchecked")
+    private Map<String, String> pathVariables(NativeWebRequest request) {
+        Map<String, String> variables = (Map<String, String>) request.getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE, NativeWebRequest.SCOPE_REQUEST);
+        return variables == null ? Map.of() : variables;
+    }
+
+}