diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/folders.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/folders.yml
new file mode 100644
index 0000000000..3ca5731bd8
--- /dev/null
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/folders.yml
@@ -0,0 +1,24 @@
+- type: entity
+  name: Random Folder Spawner
+  id: FolderSpawner
+  parent: MarkerBase
+  placement:
+    mode: PlaceFree
+  components:
+  - type: Transform
+    anchored: false
+  - type: Sprite
+    sprite: Objects/Misc/bureaucracy.rsi
+    layers:
+      - state: folder-base
+      - state: folder-colormap
+  - type: RandomSpawner
+    offset: 0
+    prototypes:
+      - BoxFolderRed
+      - BoxFolderBlue
+      - BoxFolderYellow
+      - BoxFolderWhite
+      - BoxFolderGrey
+      - BoxFolderBlack
+      - BoxFolderGreen
diff --git a/Resources/Prototypes/Entities/Structures/Storage/paper_bin.yml b/Resources/Prototypes/Entities/Structures/Storage/paper_bin.yml
index 5d53ccddd1..44caba4c0d 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/paper_bin.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/paper_bin.yml
@@ -76,3 +76,35 @@
       tags:
       - Document
       - Write
+
+- type: entity
+  parent: PaperBin
+  id: PaperBin20
+  suffix: 20
+  components:
+  - type: Bin
+    initialContents:
+    - Paper
+    - Paper
+    - Paper
+    - Paper
+    - Paper
+    - Paper
+    - Paper
+    - Paper
+    - Paper
+    - Paper
+    - Paper
+    - Paper
+    - Paper
+    - Paper
+    - Paper
+    - Paper
+    - Paper
+    - Paper
+    - Paper
+    - Paper
+    whitelist:
+      tags:
+      - Document
+      - Write