diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97a5ea0..a08f1c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Upcoming version
 
+- Using official generic icons as default custom icons
 - Unique night order bubble for each player with the same role
 - Adding some special votes
 - Automatic Djinn and Bootlegger
diff --git a/src/assets/icons/demon.png b/src/assets/icons/demon.png
new file mode 100644
index 0000000..527e473
Binary files /dev/null and b/src/assets/icons/demon.png differ
diff --git a/src/assets/icons/fabled.png b/src/assets/icons/fabled.png
new file mode 100644
index 0000000..6281cd6
Binary files /dev/null and b/src/assets/icons/fabled.png differ
diff --git a/src/assets/icons/minion.png b/src/assets/icons/minion.png
index 13f85d7..d347374 100644
Binary files a/src/assets/icons/minion.png and b/src/assets/icons/minion.png differ
diff --git a/src/assets/icons/outsider.png b/src/assets/icons/outsider.png
index ba5d4f6..29f4819 100644
Binary files a/src/assets/icons/outsider.png and b/src/assets/icons/outsider.png differ
diff --git a/src/assets/icons/townsfolk.png b/src/assets/icons/townsfolk.png
new file mode 100644
index 0000000..0798cfe
Binary files /dev/null and b/src/assets/icons/townsfolk.png differ
diff --git a/src/assets/icons/traveler.png b/src/assets/icons/traveler.png
index 8bd4039..7141ee1 100644
Binary files a/src/assets/icons/traveler.png and b/src/assets/icons/traveler.png differ
diff --git a/src/store/index.js b/src/store/index.js
index 7b66ae6..3b23eef 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -238,11 +238,11 @@ export default new Vuex.Store({
           if (rolesJSONbyId.get(role.id)) return role;
           role.imageAlt = // map team to generic icon
             {
-              townsfolk: "good",
+              townsfolk: "townsfolk",
               outsider: "outsider",
               minion: "minion",
-              demon: "evil",
-              fabled: "bootlegger",
+              demon: "demon",
+              fabled: "fabled",
               traveler: "traveler",
             }[role.team] || "custom";
           role.firstNight = Math.abs(role.firstNight);