diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
index 7014d95457..4027e6d93c 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -87,6 +87,10 @@
       amount: 15
     - id: Pen
       amount: 2
+    - id: HandLabeler
+    - id: BoxFolderBlue
+    - id: BoxFolderRed
+    - id: BoxFolderYellow
 
 - type: entity
   id: CrateServicePersonnel
diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index d875edfabf..ca86185a12 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -25,6 +25,9 @@
           enum.PaperStatus.Written: paper_words
   - type: Item
     size: 1
+  - type: Tag
+    tags:
+    - Document
 
 - type: entity
   parent: Paper
@@ -65,3 +68,117 @@
     sprite: Objects/Misc/bureaucracy.rsi
     HeldPrefix: pen
     size: 2
+
+- type: entity
+  id: BoxFolderBase
+  parent: BoxBase
+  name: folder
+  description: A folder filled with top secret paperwork.
+  components:
+  - type: Sprite
+#    netsync: true
+    sprite: Objects/Misc/bureaucracy.rsi
+    layers:
+    - state: folder-colormap
+    - state: folder-base
+# RandomSpriteColor requires netsync which is currently incompatible with ItemMapper
+#  - type: RandomSpriteColor
+#    sprite: Objects/Misc/bureaucracy.rsi
+#    state: folder-colormap
+#    colors:
+#      red: "#cc2323"
+#      blue: "#355d99"
+#      yellow: "#b38e3c"
+#      white: "#e6e6e6"
+#      grey: "#999999"
+#      black: "#3f3f3f"
+  - type: Item
+    sprite: Objects/Misc/bureaucracy.rsi
+    size: 20
+  - type: Storage
+    capacity: 10
+    size: 10
+    whitelist:
+      tags:
+        - Document
+  - type: ItemMapper
+    mapLayers:
+      folder-overlay-paper:
+        whitelist:
+          tags:
+          - Document
+  - type: Appearance
+    visuals:
+    - type: MappedItemVisualizer
+
+- type: entity
+  id: BoxFolderRed
+  parent: BoxFolderBase
+  suffix: Red
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/bureaucracy.rsi
+    layers:
+    - state: folder-colormap
+      color: "#cc2323"
+    - state: folder-base
+
+- type: entity
+  id: BoxFolderBlue
+  parent: BoxFolderBase
+  suffix: Blue
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/bureaucracy.rsi
+    layers:
+    - state: folder-colormap
+      color: "#355d99"
+    - state: folder-base
+
+- type: entity
+  id: BoxFolderYellow
+  parent: BoxFolderBase
+  suffix: Yellow
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/bureaucracy.rsi
+    layers:
+    - state: folder-colormap
+      color: "#b38e3c"
+    - state: folder-base
+
+- type: entity
+  id: BoxFolderWhite
+  parent: BoxFolderBase
+  suffix: White
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/bureaucracy.rsi
+    layers:
+    - state: folder-white
+    - state: folder-base
+
+- type: entity
+  id: BoxFolderGrey
+  parent: BoxFolderBase
+  suffix: Grey
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/bureaucracy.rsi
+    layers:
+    - state: folder-colormap
+      color: "#999999"
+    - state: folder-base
+
+- type: entity
+  id: BoxFolderBlack
+  parent: BoxFolderBase
+  suffix: Black
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/bureaucracy.rsi
+    layers:
+    - state: folder-colormap
+      color: "#3f3f3f"
+    - state: folder-base
+
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index cd9da7e011..7eb092939b 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -99,6 +99,9 @@
 - type: Tag
   id: Debug
 
+- type: Tag
+  id: Document
+
 - type: Tag
   id: DoorElectronics
 
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-base.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-base.png
new file mode 100644
index 0000000000..5fbb47268f
Binary files /dev/null and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-base.png differ
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-colormap.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-colormap.png
new file mode 100644
index 0000000000..ce23165866
Binary files /dev/null and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-colormap.png differ
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-overlay-paper.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-overlay-paper.png
new file mode 100644
index 0000000000..82f57cdd65
Binary files /dev/null and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-overlay-paper.png differ
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-white.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-white.png
new file mode 100644
index 0000000000..e3f4fa3b18
Binary files /dev/null and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder-white.png differ
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder.png
deleted file mode 100644
index 2f2247bb1b..0000000000
Binary files a/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder_blue.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder_blue.png
deleted file mode 100644
index 35e257941b..0000000000
Binary files a/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder_blue.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder_paper.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder_paper.png
deleted file mode 100644
index a1d6d909a4..0000000000
Binary files a/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder_paper.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder_red.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder_red.png
deleted file mode 100644
index f4e2539b9b..0000000000
Binary files a/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder_red.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder_white.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder_white.png
deleted file mode 100644
index 1d85d50c26..0000000000
Binary files a/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder_white.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder_yellow.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder_yellow.png
deleted file mode 100644
index 24afe80331..0000000000
Binary files a/Resources/Textures/Objects/Misc/bureaucracy.rsi/folder_yellow.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
index ba46cfa3c6..4792a6a523 100644
--- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
@@ -56,22 +56,16 @@
       ]
     },
     {
-      "name": "folder"
+      "name": "folder-base"
     },
     {
-      "name": "folder_blue"
+      "name": "folder-colormap"
     },
     {
-      "name": "folder_paper"
+      "name": "folder-white"
     },
     {
-      "name": "folder_red"
-    },
-    {
-      "name": "folder_white"
-    },
-    {
-      "name": "folder_yellow"
+      "name": "folder-overlay-paper"
     },
     {
       "name": "label_cart"