diff --git a/data/pkmn.json b/data/pkmn.json
index c23934a3..88d29ff3 100644
--- a/data/pkmn.json
+++ b/data/pkmn.json
@@ -220,7 +220,8 @@
       "jpn": "spear"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "mega": {}
     },
     "name": {
       "eng": "Beedrill",
@@ -265,7 +266,8 @@
       "jpn": "pigeot"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "mega": {}
     },
     "name": {
       "eng": "Pidgeot",
@@ -1218,7 +1220,8 @@
       "jpn": "yadoran"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "mega": {}
     },
     "name": {
       "eng": "Slowbro",
@@ -3226,7 +3229,8 @@
       "jpn": "haganeil"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "mega": {}
     },
     "name": {
       "eng": "Steelix",
@@ -3924,7 +3928,8 @@
       "jpn": "jukain"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "mega": {}
     },
     "name": {
       "eng": "Sceptile",
@@ -4015,7 +4020,8 @@
       "jpn": "laglarge"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "mega": {}
     },
     "name": {
       "eng": "Swampert",
@@ -4646,7 +4652,8 @@
       "jpn": "yamirami"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "mega": {}
     },
     "name": {
       "eng": "Sableye",
@@ -4907,7 +4914,8 @@
       "jpn": "samehader"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "mega": {}
     },
     "name": {
       "eng": "Sharpedo",
@@ -4967,7 +4975,8 @@
       "jpn": "bakuda"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "mega": {}
     },
     "name": {
       "eng": "Camerupt",
@@ -5132,7 +5141,8 @@
       "jpn": "tyltalis"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "mega": {}
     },
     "name": {
       "eng": "Altaria",
@@ -5567,7 +5577,8 @@
       "jpn": "onigori"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "mega": {}
     },
     "name": {
       "eng": "Glalie",
@@ -5732,7 +5743,8 @@
       "jpn": "bohmander"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "mega": {}
     },
     "name": {
       "eng": "Salamence",
@@ -5777,7 +5789,8 @@
       "jpn": "metagross"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "mega": {}
     },
     "name": {
       "eng": "Metagross",
@@ -5871,7 +5884,8 @@
       "jpn": "kaiorga"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "primal": {}
     },
     "name": {
       "eng": "Kyogre",
@@ -5886,7 +5900,8 @@
       "jpn": "groudon"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "primal": {}
     },
     "name": {
       "eng": "Groudon",
@@ -5901,7 +5916,8 @@
       "jpn": "rayquaza"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "mega": {}
     },
     "name": {
       "eng": "Rayquaza",
@@ -6595,7 +6611,8 @@
       "jpn": "mimilop"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "mega": {}
     },
     "name": {
       "eng": "Lopunny",
@@ -7307,7 +7324,8 @@
       "jpn": "erureido"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "mega": {}
     },
     "name": {
       "eng": "Gallade",
@@ -8230,7 +8248,8 @@
       "jpn": "tabunne"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "mega": {}
     },
     "name": {
       "eng": "Audino",
@@ -11248,7 +11267,8 @@
       "jpn": "diancie"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "mega": {}
     },
     "name": {
       "eng": "Diancie",
@@ -11263,7 +11283,8 @@
       "jpn": "hoopa"
     },
     "icons": {
-      ".": {}
+      ".": {},
+      "unbound": {}
     },
     "name": {
       "eng": "Hoopa",
diff --git a/icons/pokemon/regular/altaria-mega.png b/icons/pokemon/regular/altaria-mega.png
new file mode 100755
index 00000000..115aabac
Binary files /dev/null and b/icons/pokemon/regular/altaria-mega.png differ
diff --git a/icons/pokemon/regular/audino-mega.png b/icons/pokemon/regular/audino-mega.png
new file mode 100755
index 00000000..3687752d
Binary files /dev/null and b/icons/pokemon/regular/audino-mega.png differ
diff --git a/icons/pokemon/regular/beedrill-mega.png b/icons/pokemon/regular/beedrill-mega.png
new file mode 100755
index 00000000..1477726a
Binary files /dev/null and b/icons/pokemon/regular/beedrill-mega.png differ
diff --git a/icons/pokemon/regular/blaziken.png b/icons/pokemon/regular/blaziken.png
old mode 100644
new mode 100755
index 0bd7d1a6..1ccbaf5e
Binary files a/icons/pokemon/regular/blaziken.png and b/icons/pokemon/regular/blaziken.png differ
diff --git a/icons/pokemon/regular/camerupt-mega.png b/icons/pokemon/regular/camerupt-mega.png
new file mode 100755
index 00000000..c43331cc
Binary files /dev/null and b/icons/pokemon/regular/camerupt-mega.png differ
diff --git a/icons/pokemon/regular/combusken.png b/icons/pokemon/regular/combusken.png
old mode 100644
new mode 100755
index 359f9d0e..4ac6bac0
Binary files a/icons/pokemon/regular/combusken.png and b/icons/pokemon/regular/combusken.png differ
diff --git a/icons/pokemon/regular/diancie-mega.png b/icons/pokemon/regular/diancie-mega.png
new file mode 100755
index 00000000..61f140ae
Binary files /dev/null and b/icons/pokemon/regular/diancie-mega.png differ
diff --git a/icons/pokemon/regular/diancie.png b/icons/pokemon/regular/diancie.png
old mode 100644
new mode 100755
index 44de1581..8ad3f839
Binary files a/icons/pokemon/regular/diancie.png and b/icons/pokemon/regular/diancie.png differ
diff --git a/icons/pokemon/regular/gallade-mega.png b/icons/pokemon/regular/gallade-mega.png
new file mode 100755
index 00000000..e636d306
Binary files /dev/null and b/icons/pokemon/regular/gallade-mega.png differ
diff --git a/icons/pokemon/regular/gallade.png b/icons/pokemon/regular/gallade.png
old mode 100644
new mode 100755
index 54c0b92a..066483ef
Binary files a/icons/pokemon/regular/gallade.png and b/icons/pokemon/regular/gallade.png differ
diff --git a/icons/pokemon/regular/glalie-mega.png b/icons/pokemon/regular/glalie-mega.png
new file mode 100755
index 00000000..3bef37e2
Binary files /dev/null and b/icons/pokemon/regular/glalie-mega.png differ
diff --git a/icons/pokemon/regular/groudon-primal.png b/icons/pokemon/regular/groudon-primal.png
new file mode 100755
index 00000000..2200ebb1
Binary files /dev/null and b/icons/pokemon/regular/groudon-primal.png differ
diff --git a/icons/pokemon/regular/hoopa-unbound.png b/icons/pokemon/regular/hoopa-unbound.png
new file mode 100755
index 00000000..5f62d501
Binary files /dev/null and b/icons/pokemon/regular/hoopa-unbound.png differ
diff --git a/icons/pokemon/regular/kyogre-primal.png b/icons/pokemon/regular/kyogre-primal.png
new file mode 100755
index 00000000..b1e03892
Binary files /dev/null and b/icons/pokemon/regular/kyogre-primal.png differ
diff --git a/icons/pokemon/regular/lopunny-mega.png b/icons/pokemon/regular/lopunny-mega.png
new file mode 100755
index 00000000..2e34c4af
Binary files /dev/null and b/icons/pokemon/regular/lopunny-mega.png differ
diff --git a/icons/pokemon/regular/ludicolo.png b/icons/pokemon/regular/ludicolo.png
old mode 100644
new mode 100755
index bb9a644b..3e27a1ad
Binary files a/icons/pokemon/regular/ludicolo.png and b/icons/pokemon/regular/ludicolo.png differ
diff --git a/icons/pokemon/regular/metagross-mega.png b/icons/pokemon/regular/metagross-mega.png
new file mode 100755
index 00000000..1b681eab
Binary files /dev/null and b/icons/pokemon/regular/metagross-mega.png differ
diff --git a/icons/pokemon/regular/metagross.png b/icons/pokemon/regular/metagross.png
old mode 100644
new mode 100755
index 7a07a9d1..91b3ef3a
Binary files a/icons/pokemon/regular/metagross.png and b/icons/pokemon/regular/metagross.png differ
diff --git a/icons/pokemon/regular/nuzleaf.png b/icons/pokemon/regular/nuzleaf.png
old mode 100644
new mode 100755
index 01285bea..aa43fbf3
Binary files a/icons/pokemon/regular/nuzleaf.png and b/icons/pokemon/regular/nuzleaf.png differ
diff --git a/icons/pokemon/regular/pidgeot-mega.png b/icons/pokemon/regular/pidgeot-mega.png
new file mode 100755
index 00000000..35856286
Binary files /dev/null and b/icons/pokemon/regular/pidgeot-mega.png differ
diff --git a/icons/pokemon/regular/rayquaza-mega.png b/icons/pokemon/regular/rayquaza-mega.png
new file mode 100755
index 00000000..8d4571d0
Binary files /dev/null and b/icons/pokemon/regular/rayquaza-mega.png differ
diff --git a/icons/pokemon/regular/sableye-mega.png b/icons/pokemon/regular/sableye-mega.png
new file mode 100755
index 00000000..fbf4ddf7
Binary files /dev/null and b/icons/pokemon/regular/sableye-mega.png differ
diff --git a/icons/pokemon/regular/sableye.png b/icons/pokemon/regular/sableye.png
old mode 100644
new mode 100755
index 723dc1f8..81746dfa
Binary files a/icons/pokemon/regular/sableye.png and b/icons/pokemon/regular/sableye.png differ
diff --git a/icons/pokemon/regular/salamence-mega.png b/icons/pokemon/regular/salamence-mega.png
new file mode 100755
index 00000000..a0c556d2
Binary files /dev/null and b/icons/pokemon/regular/salamence-mega.png differ
diff --git a/icons/pokemon/regular/sceptile-mega.png b/icons/pokemon/regular/sceptile-mega.png
new file mode 100755
index 00000000..e40dba0a
Binary files /dev/null and b/icons/pokemon/regular/sceptile-mega.png differ
diff --git a/icons/pokemon/regular/sharpedo-mega.png b/icons/pokemon/regular/sharpedo-mega.png
new file mode 100755
index 00000000..171181f7
Binary files /dev/null and b/icons/pokemon/regular/sharpedo-mega.png differ
diff --git a/icons/pokemon/regular/shiftry.png b/icons/pokemon/regular/shiftry.png
old mode 100644
new mode 100755
index b39410b8..d3f45c2b
Binary files a/icons/pokemon/regular/shiftry.png and b/icons/pokemon/regular/shiftry.png differ
diff --git a/icons/pokemon/regular/slowbro-mega.png b/icons/pokemon/regular/slowbro-mega.png
new file mode 100755
index 00000000..e1e628af
Binary files /dev/null and b/icons/pokemon/regular/slowbro-mega.png differ
diff --git a/icons/pokemon/regular/steelix-mega.png b/icons/pokemon/regular/steelix-mega.png
new file mode 100755
index 00000000..f1a9eb5f
Binary files /dev/null and b/icons/pokemon/regular/steelix-mega.png differ
diff --git a/icons/pokemon/regular/steelix.png b/icons/pokemon/regular/steelix.png
old mode 100644
new mode 100755
index da9901e6..b64f8832
Binary files a/icons/pokemon/regular/steelix.png and b/icons/pokemon/regular/steelix.png differ
diff --git a/icons/pokemon/regular/swampert-mega.png b/icons/pokemon/regular/swampert-mega.png
new file mode 100755
index 00000000..a4679139
Binary files /dev/null and b/icons/pokemon/regular/swampert-mega.png differ
diff --git a/icons/pokemon/regular/treecko.png b/icons/pokemon/regular/treecko.png
old mode 100644
new mode 100755
index dfda9882..3701d118
Binary files a/icons/pokemon/regular/treecko.png and b/icons/pokemon/regular/treecko.png differ
diff --git a/icons/pokemon/shiny/altaria-mega.png b/icons/pokemon/shiny/altaria-mega.png
new file mode 100755
index 00000000..f558bc79
Binary files /dev/null and b/icons/pokemon/shiny/altaria-mega.png differ
diff --git a/icons/pokemon/shiny/audino-mega.png b/icons/pokemon/shiny/audino-mega.png
new file mode 100755
index 00000000..8b907902
Binary files /dev/null and b/icons/pokemon/shiny/audino-mega.png differ
diff --git a/icons/pokemon/shiny/beedrill-mega.png b/icons/pokemon/shiny/beedrill-mega.png
new file mode 100755
index 00000000..620d7f8c
Binary files /dev/null and b/icons/pokemon/shiny/beedrill-mega.png differ
diff --git a/icons/pokemon/shiny/blaziken.png b/icons/pokemon/shiny/blaziken.png
old mode 100644
new mode 100755
index 0aa4d999..db347ee7
Binary files a/icons/pokemon/shiny/blaziken.png and b/icons/pokemon/shiny/blaziken.png differ
diff --git a/icons/pokemon/shiny/camerupt-mega.png b/icons/pokemon/shiny/camerupt-mega.png
new file mode 100755
index 00000000..4bcb6313
Binary files /dev/null and b/icons/pokemon/shiny/camerupt-mega.png differ
diff --git a/icons/pokemon/shiny/combusken.png b/icons/pokemon/shiny/combusken.png
old mode 100644
new mode 100755
index e6321505..cb5b123e
Binary files a/icons/pokemon/shiny/combusken.png and b/icons/pokemon/shiny/combusken.png differ
diff --git a/icons/pokemon/shiny/diancie-mega.png b/icons/pokemon/shiny/diancie-mega.png
new file mode 100755
index 00000000..b1e39f95
Binary files /dev/null and b/icons/pokemon/shiny/diancie-mega.png differ
diff --git a/icons/pokemon/shiny/diancie.png b/icons/pokemon/shiny/diancie.png
old mode 100644
new mode 100755
index 67160bbd..c3d2c0da
Binary files a/icons/pokemon/shiny/diancie.png and b/icons/pokemon/shiny/diancie.png differ
diff --git a/icons/pokemon/shiny/gallade-mega.png b/icons/pokemon/shiny/gallade-mega.png
new file mode 100755
index 00000000..96123be8
Binary files /dev/null and b/icons/pokemon/shiny/gallade-mega.png differ
diff --git a/icons/pokemon/shiny/gallade.png b/icons/pokemon/shiny/gallade.png
old mode 100644
new mode 100755
index 7e659f68..2cff5035
Binary files a/icons/pokemon/shiny/gallade.png and b/icons/pokemon/shiny/gallade.png differ
diff --git a/icons/pokemon/shiny/glalie-mega.png b/icons/pokemon/shiny/glalie-mega.png
new file mode 100755
index 00000000..e3bc9f64
Binary files /dev/null and b/icons/pokemon/shiny/glalie-mega.png differ
diff --git a/icons/pokemon/shiny/groudon-primal.png b/icons/pokemon/shiny/groudon-primal.png
new file mode 100755
index 00000000..9444eb34
Binary files /dev/null and b/icons/pokemon/shiny/groudon-primal.png differ
diff --git a/icons/pokemon/shiny/hoopa-unbound.png b/icons/pokemon/shiny/hoopa-unbound.png
new file mode 100755
index 00000000..97450444
Binary files /dev/null and b/icons/pokemon/shiny/hoopa-unbound.png differ
diff --git a/icons/pokemon/shiny/kyogre-primal.png b/icons/pokemon/shiny/kyogre-primal.png
new file mode 100755
index 00000000..63f1584f
Binary files /dev/null and b/icons/pokemon/shiny/kyogre-primal.png differ
diff --git a/icons/pokemon/shiny/lopunny-mega.png b/icons/pokemon/shiny/lopunny-mega.png
new file mode 100755
index 00000000..3fc11ced
Binary files /dev/null and b/icons/pokemon/shiny/lopunny-mega.png differ
diff --git a/icons/pokemon/shiny/ludicolo.png b/icons/pokemon/shiny/ludicolo.png
old mode 100644
new mode 100755
index 2c9229b8..5d65b34f
Binary files a/icons/pokemon/shiny/ludicolo.png and b/icons/pokemon/shiny/ludicolo.png differ
diff --git a/icons/pokemon/shiny/metagross-mega.png b/icons/pokemon/shiny/metagross-mega.png
new file mode 100755
index 00000000..9ff981f1
Binary files /dev/null and b/icons/pokemon/shiny/metagross-mega.png differ
diff --git a/icons/pokemon/shiny/metagross.png b/icons/pokemon/shiny/metagross.png
old mode 100644
new mode 100755
index 4c8aa6c5..50040c36
Binary files a/icons/pokemon/shiny/metagross.png and b/icons/pokemon/shiny/metagross.png differ
diff --git a/icons/pokemon/shiny/nuzleaf.png b/icons/pokemon/shiny/nuzleaf.png
old mode 100644
new mode 100755
index afc7df6d..4a58b424
Binary files a/icons/pokemon/shiny/nuzleaf.png and b/icons/pokemon/shiny/nuzleaf.png differ
diff --git a/icons/pokemon/shiny/pidgeot-mega.png b/icons/pokemon/shiny/pidgeot-mega.png
new file mode 100755
index 00000000..85aefe17
Binary files /dev/null and b/icons/pokemon/shiny/pidgeot-mega.png differ
diff --git a/icons/pokemon/shiny/rayquaza-mega.png b/icons/pokemon/shiny/rayquaza-mega.png
new file mode 100755
index 00000000..04bc6f37
Binary files /dev/null and b/icons/pokemon/shiny/rayquaza-mega.png differ
diff --git a/icons/pokemon/shiny/sableye-mega.png b/icons/pokemon/shiny/sableye-mega.png
new file mode 100755
index 00000000..8a97ca7f
Binary files /dev/null and b/icons/pokemon/shiny/sableye-mega.png differ
diff --git a/icons/pokemon/shiny/sableye.png b/icons/pokemon/shiny/sableye.png
old mode 100644
new mode 100755
index 160b1dd3..5f90bccd
Binary files a/icons/pokemon/shiny/sableye.png and b/icons/pokemon/shiny/sableye.png differ
diff --git a/icons/pokemon/shiny/salamence-mega.png b/icons/pokemon/shiny/salamence-mega.png
new file mode 100755
index 00000000..f70b07a6
Binary files /dev/null and b/icons/pokemon/shiny/salamence-mega.png differ
diff --git a/icons/pokemon/shiny/sceptile-mega.png b/icons/pokemon/shiny/sceptile-mega.png
new file mode 100755
index 00000000..6ba0b524
Binary files /dev/null and b/icons/pokemon/shiny/sceptile-mega.png differ
diff --git a/icons/pokemon/shiny/sharpedo-mega.png b/icons/pokemon/shiny/sharpedo-mega.png
new file mode 100755
index 00000000..a12f2fc4
Binary files /dev/null and b/icons/pokemon/shiny/sharpedo-mega.png differ
diff --git a/icons/pokemon/shiny/shiftry.png b/icons/pokemon/shiny/shiftry.png
old mode 100644
new mode 100755
index 4269dcfe..ccdb27ed
Binary files a/icons/pokemon/shiny/shiftry.png and b/icons/pokemon/shiny/shiftry.png differ
diff --git a/icons/pokemon/shiny/slowbro-mega.png b/icons/pokemon/shiny/slowbro-mega.png
new file mode 100755
index 00000000..1ac3cf47
Binary files /dev/null and b/icons/pokemon/shiny/slowbro-mega.png differ
diff --git a/icons/pokemon/shiny/steelix-mega.png b/icons/pokemon/shiny/steelix-mega.png
new file mode 100755
index 00000000..df19f529
Binary files /dev/null and b/icons/pokemon/shiny/steelix-mega.png differ
diff --git a/icons/pokemon/shiny/steelix.png b/icons/pokemon/shiny/steelix.png
old mode 100644
new mode 100755
index e3a3a3c5..6e42869e
Binary files a/icons/pokemon/shiny/steelix.png and b/icons/pokemon/shiny/steelix.png differ
diff --git a/icons/pokemon/shiny/swampert-mega.png b/icons/pokemon/shiny/swampert-mega.png
new file mode 100755
index 00000000..6baa385f
Binary files /dev/null and b/icons/pokemon/shiny/swampert-mega.png differ
diff --git a/icons/pokemon/shiny/treecko.png b/icons/pokemon/shiny/treecko.png
old mode 100644
new mode 100755
index d1c7af08..40f91a90
Binary files a/icons/pokemon/shiny/treecko.png and b/icons/pokemon/shiny/treecko.png differ