diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/autotunevend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/autotunevend.yml
index 8b2a3265e42..1bafedd4c30 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/autotunevend.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/autotunevend.yml
@@ -44,7 +44,6 @@
     pianoflatpack: 1
     uprightpianoflatpack: 1
     dawflatpack: 1
-    rickenbacker4003flatpack: 1
   contrabandInventory:
 #    SeashellInstrument: 1 This is actully just static noises
 #    ReverseCymbalsInstrument: 1 Sounds bad
@@ -52,6 +51,7 @@
 #    HelicopterInstrument: 1 Sounds bad
 #    BirdToyInstrument: 1 Sounds bad
 #    GunpetInstrument: 1 Sounds bad
+    rickenbacker4003: 1
   emaggedInventory:
 #    SuperSynthesizerInstrument: 1 # Can crash the server with some MIDI
     Rickenbacker4001Instrument: 1
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuitvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuitvend.yml
index 7f025717a02..4be5b55bb36 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuitvend.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuitvend.yml
@@ -22,10 +22,10 @@
     tileprinternfflatpack: 8
     cellchargerflatpack: 8
     borgchargerflatpack: 8
+    flatpackerflatpack: 8
     airlockflatpack: 20
     airlockglassflatpack: 20
     airlockdockingflatpack: 20
-    airlockdockingglassflatpack: 20
     DoorElectronics: 30
 #    ShuttleGunKineticCircuitboard: 10
 #    TilePrinterNFMachineCircuitboard: 8
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml
index 3627d809e06..4abda90f4fe 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml
@@ -10,16 +10,8 @@
   - type: Flatpack
     entity: Autolathe
   - type: Sprite
-    sprite: Objects/Devices/flatpack.rsi
-    layers:
-    - state: base
-    - state: overlay
-      color: "#EFB341"
-      map: ["enum.FlatpackVisualLayers.Overlay"]
-    - state: icon-default
-  - type: Tag
-    tags:
-    - DroneUsable
+    sprite: _NF/Objects/Devices/flatpacks.rsi
+    state: engineering_lathe
   - type: StaticPrice
     price: 150
 
@@ -36,12 +28,23 @@
   - type: StaticPrice
     price: 250
 
+- type: entity
+  parent: engineeringtechfabflatpack
+  id: flatpackerflatpack
+  name: flatpacker 1001 flatpack
+  description: A flatpack used for constructing a flatpacker 1001.
+  components:
+  - type: Flatpack
+    entity: MachineFlatpacker
+
 - type: entity
   parent: autolatheflatpack
   id: cellchargerflatpack
   name: cell charger flatpack
   description: A flatpack used for constructing a cell charger.
   components:
+  - type: Sprite
+    state: power_charger
   - type: Flatpack
     entity: PowerCellRecharger
   - type: StaticPrice
@@ -62,11 +65,13 @@
   name: J.R.P.A.C.M.A.N.-type portable generator flatpack
   description: A flatpack used for constructing a J.R.P.A.C.M.A.N.-type portable generator.
   components:
+  - type: Sprite
+    state: power_generator
   - type: Flatpack
     entity: PortableGeneratorJrPacman
 
 - type: entity
-  parent: autolatheflatpack
+  parent: portablegeneratorjrpacmanflatpack
   id: portablegeneratorpacmanflatpack
   name: P.A.C.M.A.N.-type portable generator flatpack
   description: A flatpack used for constructing a P.A.C.M.A.N.-type portable generator.
@@ -75,7 +80,7 @@
     entity: PortableGeneratorPacman
 
 - type: entity
-  parent: autolatheflatpack
+  parent: portablegeneratorjrpacmanflatpack
   id: portablegeneratorsuperpacmanflatpack
   name: S.U.P.E.R.P.A.C.M.A.N.-type portable generator flatpack
   description: A flatpack used for constructing a S.U.P.E.R.P.A.C.M.A.N.-type portable generator.
@@ -89,11 +94,13 @@
   name: AME controller flatpack
   description: A flatpack used for constructing an AME controller.
   components:
+  - type: Sprite
+    state: power_console_ame
   - type: Flatpack
     entity: AmeControllerUnanchored
 
 - type: entity
-  parent: autolatheflatpack
+  parent: amecontrollerflatpack
   id: radiationcollectorflatpack
   name: radiation collector flatpack
   description: A flatpack used for constructing a radiation collector.
@@ -107,11 +114,13 @@
   name: gyroscope flatpack
   description: A flatpack used for constructing a gyroscope.
   components:
+  - type: Sprite
+    state: engineering_gyroscope
   - type: Flatpack
     entity: GyroscopeUnanchored
 
 - type: entity
-  parent: autolatheflatpack
+  parent: gyroscopeflatpack
   id: gyroscopesmallflatpack
   name: small gyroscope flatpack
   description: A flatpack used for constructing a small gyroscope.
@@ -125,11 +134,13 @@
   name: thruster flatpack
   description: A flatpack used for constructing a thruster.
   components:
+  - type: Sprite
+    state: engineering_thruster
   - type: Flatpack
     entity: ThrusterUnanchored
 
 - type: entity
-  parent: autolatheflatpack
+  parent: thrusterflatpack
   id: thrustersmallflatpack
   name: small thruster flatpack
   description: A flatpack used for constructing a small thruster.
@@ -147,13 +158,7 @@
   - type: Flatpack
     entity: ExosuitFabricator
   - type: Sprite
-    sprite: Objects/Devices/flatpack.rsi
-    layers:
-    - state: base
-    - state: overlay
-      color: "#D381C9"
-      map: ["enum.FlatpackVisualLayers.Overlay"]
-    - state: icon-default
+    state: science_lathe
   - type: StaticPrice
     price: 250
 
@@ -181,6 +186,8 @@
   name: artifact analyzer flatpack
   description: A flatpack used for constructing an artifact analyzer.
   components:
+  - type: Sprite
+    state: science_artifact_analyzer
   - type: Flatpack
     entity: MachineArtifactAnalyzer
 
@@ -190,6 +197,8 @@
   name: anomaly vessel flatpack
   description: A flatpack used for constructing an anomaly vessel.
   components:
+  - type: Sprite
+    state: science_anomaly_vessel
   - type: Flatpack
     entity: MachineAnomalyVessel
 
@@ -199,6 +208,8 @@
   name: A.P.E. flatpack
   description: A flatpack used for constructing an A.P.E..
   components:
+  - type: Sprite
+    state: science_ape
   - type: Flatpack
     entity: MachineAPE
 
@@ -221,13 +232,7 @@
   - type: Flatpack
     entity: UniformPrinter
   - type: Sprite
-    sprite: Objects/Devices/flatpack.rsi
-    layers:
-    - state: base
-    - state: overlay
-      color: "#9FED58"
-      map: ["enum.FlatpackVisualLayers.Overlay"]
-    - state: icon-default
+    state: service_lathe
 
 - type: entity
   parent: uniformprinterflatpack
@@ -255,6 +260,8 @@
   name: hydroponics tray flatpack
   description: A flatpack used for constructing a hydroponics tray.
   components:
+  - type: Sprite
+    state: service_tray
   - type: Flatpack
     entity: HydroponicsTrayEmpty
 
@@ -277,13 +284,7 @@
   - type: Flatpack
     entity: MedicalTechFab
   - type: Sprite
-    sprite: Objects/Devices/flatpack.rsi
-    layers:
-    - state: base
-    - state: overlay
-      color: "#52B4E9"
-      map: ["enum.FlatpackVisualLayers.Overlay"]
-    - state: icon-default
+    state: medical_lathe
   - type: StaticPrice
     price: 250
 
@@ -297,13 +298,7 @@
   - type: Flatpack
     entity: OreProcessor
   - type: Sprite
-    sprite: Objects/Devices/flatpack.rsi
-    layers:
-    - state: base
-    - state: overlay
-      color: "#A46106"
-      map: ["enum.FlatpackVisualLayers.Overlay"]
-    - state: icon-default
+    state: supply_lathe
 
 - type: entity
   parent: oreprocessorflatpack
@@ -313,6 +308,10 @@
   components:
   - type: Flatpack
     entity: ShuttleGunKinetic
+  - type: Sprite
+    state: supply_gun
+  - type: StaticPrice
+    price: 250
 
 # Consoles
 - type: entity
@@ -321,11 +320,13 @@
   name: R&D computer flatpack
   description: A flatpack used for constructing a research and development computer.
   components:
+  - type: Sprite
+    state: science_console
   - type: Flatpack
     entity: ComputerResearchAndDevelopment
 
 - type: entity
-  parent: exosuitfabricatorflatpack
+  parent: rndcomputerflatpack
   id: analysisconsoleflatpack
   name: analysis console flatpack
   description: A flatpack used for constructing an analysis console.
@@ -339,6 +340,8 @@
   name: crew monitoring console flatpack
   description: A flatpack used for constructing a crew monitoring console.
   components:
+  - type: Sprite
+    state: medical_console
   - type: Flatpack
     entity: ComputerCrewMonitoring
 
@@ -349,6 +352,8 @@
   name: R&D server flatpack
   description: A flatpack used for constructing a research and development server.
   components:
+  - type: Sprite
+    state: science_server
   - type: Flatpack
     entity: ResearchAndDevelopmentServer
 
@@ -361,23 +366,19 @@
   - type: Flatpack
     entity: TelecomServer
   - type: Sprite
-    sprite: Objects/Devices/flatpack.rsi
-    layers:
-    - state: base
-    - state: overlay
-      color: "#334E6D"
-      map: ["enum.FlatpackVisualLayers.Overlay"]
-    - state: icon-default
+    state: command_server
 
 # Airlocks
 - type: entity
-  parent: telecommunicationserverflatpack
+  parent: autolatheflatpack
   id: airlockflatpack
   name: airlock flatpack
   description: A flatpack used for constructing an airlock.
   components:
   - type: Flatpack
     entity: Airlock
+  - type: Sprite
+    state: command_airlock
   - type: StaticPrice
     price: 95
 
@@ -415,6 +416,8 @@
   name: tuba flatpack
   description: A flatpack containing a tuba.
   components:
+  - type: Sprite
+    state: service_music
   - type: Flatpack
     entity: TubaInstrument
   - type: StaticPrice
@@ -527,12 +530,3 @@
   components:
   - type: Flatpack
     entity: DawInstrument
-
-- type: entity
-  parent: tubaflatpack
-  id: rickenbacker4003flatpack
-  name: rickenbacker 4003 flatpack
-  description: A flatpack containing a rickenbacker 4003.
-  components:
-  - type: Flatpack
-    entity: Rickenbacker4003Instrument
diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/command_airlock.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/command_airlock.png
new file mode 100644
index 00000000000..2ec0a96ab12
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/command_airlock.png differ
diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/command_server.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/command_server.png
new file mode 100644
index 00000000000..3f7ad57e38b
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/command_server.png differ
diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/engineering_gyroscope.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/engineering_gyroscope.png
new file mode 100644
index 00000000000..867d976c000
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/engineering_gyroscope.png differ
diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/engineering_lathe.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/engineering_lathe.png
new file mode 100644
index 00000000000..51683376e54
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/engineering_lathe.png differ
diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/engineering_thruster.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/engineering_thruster.png
new file mode 100644
index 00000000000..cd5dcfb070e
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/engineering_thruster.png differ
diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/medical_console.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/medical_console.png
new file mode 100644
index 00000000000..f4b1a880ff7
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/medical_console.png differ
diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/medical_lathe.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/medical_lathe.png
new file mode 100644
index 00000000000..8c4dbfb3d13
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/medical_lathe.png differ
diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/meta.json b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/meta.json
new file mode 100644
index 00000000000..c2aeba3533f
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/meta.json
@@ -0,0 +1,74 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Resprited for Frontir by erhardsteinhauer, based on sprites created by EmoGarbage404 (github) for SS14, solar-assembly-part taken from tgstation and modified at https://tgstation13.org/wiki/Guide_to_construction#Solar_Panels_and_Trackers, ame-part taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1b7952787c06c21ef1623e494dcfe7cb1f46e041",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "command_airlock"
+        },
+        {
+            "name": "command_server"
+        },
+        {
+            "name": "engineering_gyroscope"
+        },
+        {
+            "name": "engineering_lathe"
+        },
+        {
+            "name": "engineering_thruster"
+        },
+        {
+            "name": "medical_console"
+        },
+        {
+            "name": "medical_lathe"
+        },
+        {
+            "name": "power_charger"
+        },
+        {
+            "name": "power_console_ame"
+        },
+        {
+            "name": "power_generator"
+        },
+        {
+            "name": "science_anomaly_vessel"
+        },
+        {
+            "name": "science_ape"
+        },
+        {
+            "name": "science_artifact_analyzer"
+        },
+        {
+            "name": "science_console"
+        },
+        {
+            "name": "science_lathe"
+        },
+        {
+            "name": "science_server"
+        },
+        {
+            "name": "service_lathe"
+        },
+        {
+            "name": "service_music"
+        },
+        {
+            "name": "service_tray"
+        },
+        {
+            "name": "supply_gun"
+        },
+        {
+            "name": "supply_lathe"
+        }
+    ]
+}
diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/power_charger.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/power_charger.png
new file mode 100644
index 00000000000..f3570726f6d
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/power_charger.png differ
diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/power_console_ame.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/power_console_ame.png
new file mode 100644
index 00000000000..4ea4cd0ab06
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/power_console_ame.png differ
diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/power_generator.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/power_generator.png
new file mode 100644
index 00000000000..5b3ce974e32
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/power_generator.png differ
diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_anomaly_vessel.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_anomaly_vessel.png
new file mode 100644
index 00000000000..54f9539ac29
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_anomaly_vessel.png differ
diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_ape.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_ape.png
new file mode 100644
index 00000000000..4ad4695bb92
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_ape.png differ
diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_artifact_analyzer.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_artifact_analyzer.png
new file mode 100644
index 00000000000..5c7db9feaf3
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_artifact_analyzer.png differ
diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_console.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_console.png
new file mode 100644
index 00000000000..cc56a877725
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_console.png differ
diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_lathe.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_lathe.png
new file mode 100644
index 00000000000..4c463ea1b18
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_lathe.png differ
diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_server.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_server.png
new file mode 100644
index 00000000000..e4eb8a2dd34
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/science_server.png differ
diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/service_lathe.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/service_lathe.png
new file mode 100644
index 00000000000..111377cf341
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/service_lathe.png differ
diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/service_music.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/service_music.png
new file mode 100644
index 00000000000..db1a9a8aec8
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/service_music.png differ
diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/service_tray.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/service_tray.png
new file mode 100644
index 00000000000..683019d5945
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/service_tray.png differ
diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/supply_gun.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/supply_gun.png
new file mode 100644
index 00000000000..cf7b6899956
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/supply_gun.png differ
diff --git a/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/supply_lathe.png b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/supply_lathe.png
new file mode 100644
index 00000000000..8c1e503d3c6
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Devices/flatpacks.rsi/supply_lathe.png differ