diff --git a/README.md b/README.md
index e1a0458035..55c3b368de 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![](https://github.com/foundryvtt/dnd5e/blob/v10-dev/media/repo-dnd5e.jpg?raw=true)
+![](https://github.com/foundryvtt/dnd5e/blob/master/ui/official/dnd5e-repo.jpg?raw=true)
 
 # Foundry Virtual Tabletop - Dungeons & Dragons Fifth Edition Game System
 
diff --git a/media/repo-dnd5e.jpg b/media/repo-dnd5e.jpg
deleted file mode 100644
index ba4ef5a7c7..0000000000
Binary files a/media/repo-dnd5e.jpg and /dev/null differ
diff --git a/system.json b/system.json
index 11b94d23d8..9c7e9ba75d 100644
--- a/system.json
+++ b/system.json
@@ -202,12 +202,18 @@
       "type": "cover",
       "loop": false,
       "flags": {}
+    },
+    {
+      "type": "setup",
+      "url": "systems/dnd5e/ui/official/dnd5e-repo.jpg",
+      "thumbnail": "systems/dnd5e/ui/official/dnd5e-thumbnail.jpg"
     }
   ],
   "socket": true,
   "gridDistance": 5,
   "gridUnits": "ft",
   "primaryTokenAttribute": "attributes.hp",
+  "background": "systems/dnd5e/ui/official/dnd5e-background.webp",
   "flags": {
     "needsMigrationVersion": "3.0.0",
     "compatibleMigrationVersion": "0.8",
diff --git a/ui/official/dnd5e-background.webp b/ui/official/dnd5e-background.webp
new file mode 100644
index 0000000000..e4c9243051
Binary files /dev/null and b/ui/official/dnd5e-background.webp differ
diff --git a/ui/official/dnd5e-repo.jpg b/ui/official/dnd5e-repo.jpg
new file mode 100644
index 0000000000..f56faea40e
Binary files /dev/null and b/ui/official/dnd5e-repo.jpg differ
diff --git a/ui/official/dnd5e-thumbnail.jpg b/ui/official/dnd5e-thumbnail.jpg
new file mode 100644
index 0000000000..286bbce9b2
Binary files /dev/null and b/ui/official/dnd5e-thumbnail.jpg differ