Facility Design Remake

Ideas for design remake of facilities

Core - 2x2 - 2 or 3 ports
Spawner - 3x2 - Spawner and storage of the worker in own color?
- Upgrade - 1x1 -
- Storage of other color worker - 1x1 -
Portal gtw - 3x3 like plus sign?
- Upgrade 1x1
Probe
- Upgrade 1x1
Trade Post/Transfer, T-shape with ports - or size change with upgrades instead of upgrade boxes?
- Upgrade with ports? 1x1 or 2 on one side?
Transformer - 3x3 with small icon, expanding per level? (no upgrade things)
Treasure extractor (finder). L -shape (no upgrade things)
Team hq
- Different upgrades per level?