diff --git a/public/images/pokemon/icons/2/154-f.png b/public/images/pokemon/icons/2/154-f.png
new file mode 100644
index 000000000000..6481cdd8a00b
Binary files /dev/null and b/public/images/pokemon/icons/2/154-f.png differ
diff --git a/public/images/pokemon/icons/2/154s-f.png b/public/images/pokemon/icons/2/154s-f.png
new file mode 100644
index 000000000000..44ded711dcd9
Binary files /dev/null and b/public/images/pokemon/icons/2/154s-f.png differ
diff --git a/public/images/pokemon/icons/3/255-f.png b/public/images/pokemon/icons/3/255-f.png
new file mode 100644
index 000000000000..bb221be21e76
Binary files /dev/null and b/public/images/pokemon/icons/3/255-f.png differ
diff --git a/public/images/pokemon/icons/3/255s-f.png b/public/images/pokemon/icons/3/255s-f.png
new file mode 100644
index 000000000000..898b17c163c4
Binary files /dev/null and b/public/images/pokemon/icons/3/255s-f.png differ
diff --git a/public/images/pokemon/icons/3/256-f.png b/public/images/pokemon/icons/3/256-f.png
new file mode 100644
index 000000000000..72800cc5e25d
Binary files /dev/null and b/public/images/pokemon/icons/3/256-f.png differ
diff --git a/public/images/pokemon/icons/3/256s-f.png b/public/images/pokemon/icons/3/256s-f.png
new file mode 100644
index 000000000000..ce6608f7bc5c
Binary files /dev/null and b/public/images/pokemon/icons/3/256s-f.png differ
diff --git a/public/images/pokemon/icons/3/257-f-mega.png b/public/images/pokemon/icons/3/257-f-mega.png
new file mode 100644
index 000000000000..ed64fe8f41f3
Binary files /dev/null and b/public/images/pokemon/icons/3/257-f-mega.png differ
diff --git a/public/images/pokemon/icons/3/257-f.png b/public/images/pokemon/icons/3/257-f.png
new file mode 100644
index 000000000000..ee42a9f75c0a
Binary files /dev/null and b/public/images/pokemon/icons/3/257-f.png differ
diff --git a/public/images/pokemon/icons/3/257s-f-mega.png b/public/images/pokemon/icons/3/257s-f-mega.png
new file mode 100644
index 000000000000..faf5e5aa30c1
Binary files /dev/null and b/public/images/pokemon/icons/3/257s-f-mega.png differ
diff --git a/public/images/pokemon/icons/3/257s-f.png b/public/images/pokemon/icons/3/257s-f.png
new file mode 100644
index 000000000000..bf59393972fb
Binary files /dev/null and b/public/images/pokemon/icons/3/257s-f.png differ
diff --git a/public/images/pokemon_icons_1.json b/public/images/pokemon_icons_1.json
index 49e471514cd6..12e26b380a5d 100644
--- a/public/images/pokemon_icons_1.json
+++ b/public/images/pokemon_icons_1.json
@@ -1647,6 +1647,27 @@
 						"h": 25
 					}
 				},
+				{
+					"filename": "85-f",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 3,
+						"w": 29,
+						"h": 25
+					},
+					"frame": {
+						"x": 55,
+						"y": 270,
+						"w": 29,
+						"h": 25
+					}
+				},
 				{
 					"filename": "22s",
 					"rotated": false,
@@ -1731,6 +1752,27 @@
 						"h": 25
 					}
 				},
+				{
+					"filename": "85s-f",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 3,
+						"w": 29,
+						"h": 25
+					},
+					"frame": {
+						"x": 56,
+						"y": 317,
+						"w": 29,
+						"h": 25
+					}
+				},
 				{
 					"filename": "9s",
 					"rotated": false,
@@ -6456,6 +6498,27 @@
 						"h": 18
 					}
 				},
+				{
+					"filename": "84-f",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 10,
+						"w": 21,
+						"h": 18
+					},
+					"frame": {
+						"x": 98,
+						"y": 712,
+						"w": 21,
+						"h": 18
+					}
+				},
 				{
 					"filename": "107",
 					"rotated": false,
@@ -6519,6 +6582,27 @@
 						"h": 18
 					}
 				},
+				{
+					"filename": "84s-f",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 10,
+						"w": 21,
+						"h": 18
+					},
+					"frame": {
+						"x": 96,
+						"y": 770,
+						"w": 21,
+						"h": 18
+					}
+				},
 				{
 					"filename": "88",
 					"rotated": false,
diff --git a/public/images/pokemon_icons_2.json b/public/images/pokemon_icons_2.json
index 5a389362bc0c..c5ebfe614875 100644
--- a/public/images/pokemon_icons_2.json
+++ b/public/images/pokemon_icons_2.json
@@ -786,6 +786,27 @@
 						"h": 27
 					}
 				},
+				{
+					"filename": "154-f",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 1,
+						"w": 23,
+						"h": 27
+					},
+					"frame": {
+						"x": 29,
+						"y": 147,
+						"w": 23,
+						"h": 27
+					}
+				},
 				{
 					"filename": "154s",
 					"rotated": false,
@@ -807,6 +828,27 @@
 						"h": 27
 					}
 				},
+				{
+					"filename": "154s-f",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 1,
+						"w": 23,
+						"h": 27
+					},
+					"frame": {
+						"x": 29,
+						"y": 174,
+						"w": 23,
+						"h": 27
+					}
+				},
 				{
 					"filename": "229-mega",
 					"rotated": false,
diff --git a/public/images/pokemon_icons_3.json b/public/images/pokemon_icons_3.json
index 220d91f52225..a1aefa0ff0b1 100644
--- a/public/images/pokemon_icons_3.json
+++ b/public/images/pokemon_icons_3.json
@@ -198,6 +198,27 @@
 						"h": 27
 					}
 				},
+				{
+					"filename": "257-f-mega",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 2,
+						"w": 32,
+						"h": 27
+					},
+					"frame": {
+						"x": 0,
+						"y": 79,
+						"w": 32,
+						"h": 27
+					}
+				},
 				{
 					"filename": "257s-mega",
 					"rotated": false,
@@ -219,6 +240,27 @@
 						"h": 27
 					}
 				},
+				{
+					"filename": "257s-f-mega",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 2,
+						"w": 32,
+						"h": 27
+					},
+					"frame": {
+						"x": 0,
+						"y": 106,
+						"w": 32,
+						"h": 27
+					}
+				},
 				{
 					"filename": "323-mega",
 					"rotated": false,
@@ -1248,6 +1290,27 @@
 						"h": 26
 					}
 				},
+				{
+					"filename": "257-f",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 2,
+						"w": 25,
+						"h": 26
+					},
+					"frame": {
+						"x": 28,
+						"y": 556,
+						"w": 25,
+						"h": 26
+					}
+				},
 				{
 					"filename": "257s",
 					"rotated": false,
@@ -1269,6 +1332,27 @@
 						"h": 26
 					}
 				},
+				{
+					"filename": "257s-f",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 7,
+						"y": 2,
+						"w": 25,
+						"h": 26
+					},
+					"frame": {
+						"x": 28,
+						"y": 582,
+						"w": 25,
+						"h": 26
+					}
+				},
 				{
 					"filename": "359-mega",
 					"rotated": false,
@@ -1605,6 +1689,27 @@
 						"h": 25
 					}
 				},
+				{
+					"filename": "256-f",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 3,
+						"w": 23,
+						"h": 25
+					},
+					"frame": {
+						"x": 98,
+						"y": 72,
+						"w": 23,
+						"h": 25
+					}
+				},
 				{
 					"filename": "282s-mega",
 					"rotated": false,
@@ -5553,6 +5658,27 @@
 						"h": 19
 					}
 				},
+				{
+					"filename": "255-f",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 9,
+						"w": 13,
+						"h": 19
+					},
+					"frame": {
+						"x": 204,
+						"y": 342,
+						"w": 13,
+						"h": 19
+					}
+				},
 				{
 					"filename": "307s",
 					"rotated": false,
diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts
index ff53fdb9392f..203e545503a2 100644
--- a/src/data/pokemon-species.ts
+++ b/src/data/pokemon-species.ts
@@ -363,6 +363,12 @@ export abstract class PokemonSpeciesForm {
     }
 
     switch (this.speciesId) {
+      case Species.DODUO:
+      case Species.DODRIO:
+      case Species.MEGANIUM:
+      case Species.TORCHIC:
+      case Species.COMBUSKEN:
+      case Species.BLAZIKEN:
       case Species.HIPPOPOTAS:
       case Species.HIPPOWDON:
       case Species.UNFEZANT: