diff --git a/public/images/ui/pokemon_icons_8.json b/public/images/ui/pokemon_icons_8.json
index 916fb8728..101c937b1 100644
--- a/public/images/ui/pokemon_icons_8.json
+++ b/public/images/ui/pokemon_icons_8.json
@@ -4,8 +4,8 @@
 			"image": "pokemon_icons_8.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 252,
-				"h": 807
+				"w": 255,
+				"h": 809
 			},
 			"scale": 1,
 			"frames": [
@@ -3111,8 +3111,8 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 0,
-						"y": 311,
+						"x": 222,
+						"y": 286,
 						"w": 33,
 						"h": 25
 					}
@@ -3132,7 +3132,7 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 33,
+						"x": 0,
 						"y": 311,
 						"w": 16,
 						"h": 25
@@ -3153,7 +3153,7 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 49,
+						"x": 16,
 						"y": 311,
 						"w": 16,
 						"h": 25
@@ -3174,7 +3174,7 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 65,
+						"x": 32,
 						"y": 311,
 						"w": 24,
 						"h": 25
@@ -3195,7 +3195,7 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 89,
+						"x": 56,
 						"y": 311,
 						"w": 24,
 						"h": 25
@@ -3216,7 +3216,7 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 113,
+						"x": 80,
 						"y": 311,
 						"w": 27,
 						"h": 25
@@ -3237,7 +3237,7 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 140,
+						"x": 107,
 						"y": 311,
 						"w": 27,
 						"h": 25
@@ -3258,7 +3258,7 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 167,
+						"x": 134,
 						"y": 311,
 						"w": 20,
 						"h": 25
@@ -3279,7 +3279,7 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 187,
+						"x": 154,
 						"y": 311,
 						"w": 20,
 						"h": 25
@@ -3300,7 +3300,7 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 207,
+						"x": 174,
 						"y": 311,
 						"w": 24,
 						"h": 25
@@ -3321,8 +3321,8 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 0,
-						"y": 336,
+						"x": 198,
+						"y": 311,
 						"w": 24,
 						"h": 25
 					}
@@ -3342,8 +3342,8 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 24,
-						"y": 336,
+						"x": 222,
+						"y": 311,
 						"w": 30,
 						"h": 25
 					}
@@ -3363,7 +3363,7 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 54,
+						"x": 0,
 						"y": 336,
 						"w": 30,
 						"h": 25
@@ -3384,7 +3384,7 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 84,
+						"x": 30,
 						"y": 336,
 						"w": 32,
 						"h": 25
@@ -3405,7 +3405,7 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 116,
+						"x": 62,
 						"y": 336,
 						"w": 32,
 						"h": 25
@@ -3426,7 +3426,7 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 148,
+						"x": 94,
 						"y": 336,
 						"w": 30,
 						"h": 25
@@ -3447,7 +3447,7 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 178,
+						"x": 124,
 						"y": 336,
 						"w": 30,
 						"h": 25
@@ -3468,7 +3468,7 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 208,
+						"x": 154,
 						"y": 336,
 						"w": 29,
 						"h": 25
@@ -3489,8 +3489,8 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 0,
-						"y": 361,
+						"x": 183,
+						"y": 336,
 						"w": 29,
 						"h": 25
 					}
@@ -3510,8 +3510,8 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 29,
-						"y": 361,
+						"x": 212,
+						"y": 336,
 						"w": 26,
 						"h": 25
 					}
@@ -3531,7 +3531,7 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 55,
+						"x": 0,
 						"y": 361,
 						"w": 26,
 						"h": 25
@@ -3552,7 +3552,7 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 81,
+						"x": 26,
 						"y": 361,
 						"w": 30,
 						"h": 25
@@ -3573,7 +3573,7 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 111,
+						"x": 56,
 						"y": 361,
 						"w": 30,
 						"h": 25
@@ -3594,7 +3594,7 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 141,
+						"x": 86,
 						"y": 361,
 						"w": 33,
 						"h": 25
@@ -3615,7 +3615,7 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 174,
+						"x": 119,
 						"y": 361,
 						"w": 33,
 						"h": 25
@@ -3636,7 +3636,7 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 207,
+						"x": 152,
 						"y": 361,
 						"w": 18,
 						"h": 25
@@ -3657,7 +3657,7 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 225,
+						"x": 170,
 						"y": 361,
 						"w": 18,
 						"h": 25
@@ -3678,8 +3678,8 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 0,
-						"y": 386,
+						"x": 188,
+						"y": 361,
 						"w": 27,
 						"h": 25
 					}
@@ -3699,8 +3699,8 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 27,
-						"y": 386,
+						"x": 215,
+						"y": 361,
 						"w": 27,
 						"h": 25
 					}
@@ -3720,7 +3720,7 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 54,
+						"x": 0,
 						"y": 386,
 						"w": 29,
 						"h": 25
@@ -3741,7 +3741,7 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 83,
+						"x": 29,
 						"y": 386,
 						"w": 29,
 						"h": 25
@@ -3762,7 +3762,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 112,
+						"x": 58,
 						"y": 386,
 						"w": 24,
 						"h": 26
@@ -3783,7 +3783,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 136,
+						"x": 82,
 						"y": 386,
 						"w": 24,
 						"h": 26
@@ -3804,7 +3804,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 160,
+						"x": 106,
 						"y": 386,
 						"w": 28,
 						"h": 26
@@ -3825,7 +3825,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 188,
+						"x": 134,
 						"y": 386,
 						"w": 28,
 						"h": 26
@@ -3846,7 +3846,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 216,
+						"x": 162,
 						"y": 386,
 						"w": 26,
 						"h": 26
@@ -3867,8 +3867,8 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 0,
-						"y": 412,
+						"x": 188,
+						"y": 386,
 						"w": 26,
 						"h": 26
 					}
@@ -3888,8 +3888,8 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 26,
-						"y": 412,
+						"x": 214,
+						"y": 386,
 						"w": 25,
 						"h": 26
 					}
@@ -3909,7 +3909,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 51,
+						"x": 0,
 						"y": 412,
 						"w": 25,
 						"h": 26
@@ -3930,7 +3930,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 76,
+						"x": 25,
 						"y": 412,
 						"w": 29,
 						"h": 26
@@ -3951,7 +3951,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 105,
+						"x": 54,
 						"y": 412,
 						"w": 29,
 						"h": 26
@@ -3972,7 +3972,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 134,
+						"x": 83,
 						"y": 412,
 						"w": 29,
 						"h": 26
@@ -3993,7 +3993,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 163,
+						"x": 112,
 						"y": 412,
 						"w": 29,
 						"h": 26
@@ -4014,7 +4014,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 192,
+						"x": 141,
 						"y": 412,
 						"w": 24,
 						"h": 26
@@ -4035,7 +4035,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 216,
+						"x": 165,
 						"y": 412,
 						"w": 24,
 						"h": 26
@@ -4056,8 +4056,8 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 0,
-						"y": 438,
+						"x": 189,
+						"y": 412,
 						"w": 29,
 						"h": 26
 					}
@@ -4077,8 +4077,8 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 29,
-						"y": 438,
+						"x": 218,
+						"y": 412,
 						"w": 29,
 						"h": 26
 					}
@@ -4098,7 +4098,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 58,
+						"x": 0,
 						"y": 438,
 						"w": 22,
 						"h": 26
@@ -4119,7 +4119,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 80,
+						"x": 22,
 						"y": 438,
 						"w": 22,
 						"h": 26
@@ -4140,7 +4140,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 102,
+						"x": 44,
 						"y": 438,
 						"w": 25,
 						"h": 26
@@ -4161,7 +4161,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 127,
+						"x": 69,
 						"y": 438,
 						"w": 25,
 						"h": 26
@@ -4182,7 +4182,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 152,
+						"x": 94,
 						"y": 438,
 						"w": 21,
 						"h": 26
@@ -4203,7 +4203,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 173,
+						"x": 115,
 						"y": 438,
 						"w": 21,
 						"h": 26
@@ -4224,7 +4224,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 194,
+						"x": 136,
 						"y": 438,
 						"w": 28,
 						"h": 26
@@ -4245,7 +4245,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 222,
+						"x": 164,
 						"y": 438,
 						"w": 28,
 						"h": 26
@@ -4266,8 +4266,8 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 0,
-						"y": 464,
+						"x": 192,
+						"y": 438,
 						"w": 35,
 						"h": 26
 					}
@@ -4287,7 +4287,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 35,
+						"x": 0,
 						"y": 464,
 						"w": 35,
 						"h": 26
@@ -4308,7 +4308,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 70,
+						"x": 35,
 						"y": 464,
 						"w": 35,
 						"h": 26
@@ -4329,7 +4329,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 105,
+						"x": 70,
 						"y": 464,
 						"w": 35,
 						"h": 26
@@ -4350,7 +4350,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 140,
+						"x": 105,
 						"y": 464,
 						"w": 26,
 						"h": 26
@@ -4371,7 +4371,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 166,
+						"x": 131,
 						"y": 464,
 						"w": 26,
 						"h": 26
@@ -4392,7 +4392,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 192,
+						"x": 157,
 						"y": 464,
 						"w": 28,
 						"h": 26
@@ -4413,7 +4413,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 220,
+						"x": 185,
 						"y": 464,
 						"w": 28,
 						"h": 26
@@ -4434,8 +4434,8 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 0,
-						"y": 490,
+						"x": 213,
+						"y": 464,
 						"w": 34,
 						"h": 26
 					}
@@ -4455,7 +4455,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 34,
+						"x": 0,
 						"y": 490,
 						"w": 34,
 						"h": 26
@@ -4476,7 +4476,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 68,
+						"x": 34,
 						"y": 490,
 						"w": 40,
 						"h": 26
@@ -4497,7 +4497,7 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 108,
+						"x": 74,
 						"y": 490,
 						"w": 40,
 						"h": 26
@@ -4518,7 +4518,7 @@
 						"h": 27
 					},
 					"frame": {
-						"x": 148,
+						"x": 114,
 						"y": 490,
 						"w": 27,
 						"h": 27
@@ -4539,7 +4539,7 @@
 						"h": 27
 					},
 					"frame": {
-						"x": 175,
+						"x": 141,
 						"y": 490,
 						"w": 27,
 						"h": 27
@@ -4560,7 +4560,7 @@
 						"h": 27
 					},
 					"frame": {
-						"x": 202,
+						"x": 168,
 						"y": 490,
 						"w": 28,
 						"h": 27
@@ -4581,8 +4581,8 @@
 						"h": 27
 					},
 					"frame": {
-						"x": 0,
-						"y": 517,
+						"x": 196,
+						"y": 490,
 						"w": 28,
 						"h": 27
 					}
@@ -4602,8 +4602,8 @@
 						"h": 27
 					},
 					"frame": {
-						"x": 28,
-						"y": 517,
+						"x": 224,
+						"y": 490,
 						"w": 18,
 						"h": 27
 					}
@@ -4623,7 +4623,7 @@
 						"h": 27
 					},
 					"frame": {
-						"x": 46,
+						"x": 0,
 						"y": 517,
 						"w": 18,
 						"h": 27
@@ -4644,7 +4644,7 @@
 						"h": 27
 					},
 					"frame": {
-						"x": 64,
+						"x": 18,
 						"y": 517,
 						"w": 24,
 						"h": 27
@@ -4665,7 +4665,7 @@
 						"h": 27
 					},
 					"frame": {
-						"x": 88,
+						"x": 42,
 						"y": 517,
 						"w": 24,
 						"h": 27
@@ -4686,7 +4686,7 @@
 						"h": 27
 					},
 					"frame": {
-						"x": 112,
+						"x": 66,
 						"y": 517,
 						"w": 24,
 						"h": 27
@@ -4707,7 +4707,7 @@
 						"h": 27
 					},
 					"frame": {
-						"x": 136,
+						"x": 90,
 						"y": 517,
 						"w": 24,
 						"h": 27
@@ -4728,7 +4728,7 @@
 						"h": 27
 					},
 					"frame": {
-						"x": 160,
+						"x": 114,
 						"y": 517,
 						"w": 25,
 						"h": 27
@@ -4749,7 +4749,7 @@
 						"h": 27
 					},
 					"frame": {
-						"x": 185,
+						"x": 139,
 						"y": 517,
 						"w": 25,
 						"h": 27
@@ -4770,7 +4770,7 @@
 						"h": 27
 					},
 					"frame": {
-						"x": 210,
+						"x": 164,
 						"y": 517,
 						"w": 27,
 						"h": 27
@@ -4791,8 +4791,8 @@
 						"h": 27
 					},
 					"frame": {
-						"x": 0,
-						"y": 544,
+						"x": 191,
+						"y": 517,
 						"w": 27,
 						"h": 27
 					}
@@ -4812,8 +4812,8 @@
 						"h": 27
 					},
 					"frame": {
-						"x": 27,
-						"y": 544,
+						"x": 218,
+						"y": 517,
 						"w": 30,
 						"h": 27
 					}
@@ -4833,7 +4833,7 @@
 						"h": 27
 					},
 					"frame": {
-						"x": 57,
+						"x": 0,
 						"y": 544,
 						"w": 30,
 						"h": 27
@@ -4854,7 +4854,7 @@
 						"h": 27
 					},
 					"frame": {
-						"x": 87,
+						"x": 30,
 						"y": 544,
 						"w": 28,
 						"h": 27
@@ -4875,7 +4875,7 @@
 						"h": 27
 					},
 					"frame": {
-						"x": 115,
+						"x": 58,
 						"y": 544,
 						"w": 28,
 						"h": 27
@@ -4896,7 +4896,7 @@
 						"h": 28
 					},
 					"frame": {
-						"x": 143,
+						"x": 86,
 						"y": 544,
 						"w": 19,
 						"h": 28
@@ -4917,7 +4917,7 @@
 						"h": 28
 					},
 					"frame": {
-						"x": 162,
+						"x": 105,
 						"y": 544,
 						"w": 19,
 						"h": 28
@@ -4938,7 +4938,7 @@
 						"h": 28
 					},
 					"frame": {
-						"x": 181,
+						"x": 124,
 						"y": 544,
 						"w": 26,
 						"h": 28
@@ -4959,7 +4959,7 @@
 						"h": 28
 					},
 					"frame": {
-						"x": 207,
+						"x": 150,
 						"y": 544,
 						"w": 26,
 						"h": 28
@@ -4980,8 +4980,8 @@
 						"h": 28
 					},
 					"frame": {
-						"x": 0,
-						"y": 572,
+						"x": 176,
+						"y": 544,
 						"w": 27,
 						"h": 28
 					}
@@ -5001,8 +5001,8 @@
 						"h": 28
 					},
 					"frame": {
-						"x": 27,
-						"y": 572,
+						"x": 203,
+						"y": 544,
 						"w": 27,
 						"h": 28
 					}
@@ -5022,7 +5022,7 @@
 						"h": 28
 					},
 					"frame": {
-						"x": 54,
+						"x": 0,
 						"y": 572,
 						"w": 40,
 						"h": 28
@@ -5043,7 +5043,7 @@
 						"h": 28
 					},
 					"frame": {
-						"x": 94,
+						"x": 40,
 						"y": 572,
 						"w": 40,
 						"h": 28
@@ -5064,7 +5064,7 @@
 						"h": 28
 					},
 					"frame": {
-						"x": 134,
+						"x": 80,
 						"y": 572,
 						"w": 32,
 						"h": 28
@@ -5085,7 +5085,7 @@
 						"h": 28
 					},
 					"frame": {
-						"x": 166,
+						"x": 112,
 						"y": 572,
 						"w": 32,
 						"h": 28
@@ -5106,7 +5106,7 @@
 						"h": 28
 					},
 					"frame": {
-						"x": 198,
+						"x": 144,
 						"y": 572,
 						"w": 30,
 						"h": 28
@@ -5127,8 +5127,8 @@
 						"h": 28
 					},
 					"frame": {
-						"x": 0,
-						"y": 600,
+						"x": 174,
+						"y": 572,
 						"w": 30,
 						"h": 28
 					}
@@ -5148,8 +5148,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 30,
-						"y": 600,
+						"x": 204,
+						"y": 572,
 						"w": 24,
 						"h": 29
 					}
@@ -5169,8 +5169,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 54,
-						"y": 600,
+						"x": 228,
+						"y": 572,
 						"w": 24,
 						"h": 29
 					}
@@ -5190,8 +5190,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 78,
-						"y": 600,
+						"x": 0,
+						"y": 601,
 						"w": 27,
 						"h": 29
 					}
@@ -5211,8 +5211,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 105,
-						"y": 600,
+						"x": 27,
+						"y": 601,
 						"w": 27,
 						"h": 29
 					}
@@ -5232,8 +5232,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 132,
-						"y": 600,
+						"x": 54,
+						"y": 601,
 						"w": 31,
 						"h": 29
 					}
@@ -5253,8 +5253,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 163,
-						"y": 600,
+						"x": 85,
+						"y": 601,
 						"w": 31,
 						"h": 29
 					}
@@ -5274,8 +5274,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 194,
-						"y": 600,
+						"x": 116,
+						"y": 601,
 						"w": 27,
 						"h": 29
 					}
@@ -5295,8 +5295,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 221,
-						"y": 600,
+						"x": 143,
+						"y": 601,
 						"w": 27,
 						"h": 29
 					}
@@ -5316,8 +5316,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 0,
-						"y": 629,
+						"x": 170,
+						"y": 601,
 						"w": 32,
 						"h": 29
 					}
@@ -5337,8 +5337,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 32,
-						"y": 629,
+						"x": 202,
+						"y": 601,
 						"w": 32,
 						"h": 29
 					}
@@ -5358,8 +5358,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 64,
-						"y": 629,
+						"x": 0,
+						"y": 630,
 						"w": 33,
 						"h": 29
 					}
@@ -5379,8 +5379,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 97,
-						"y": 629,
+						"x": 33,
+						"y": 630,
 						"w": 33,
 						"h": 29
 					}
@@ -5400,8 +5400,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 130,
-						"y": 629,
+						"x": 66,
+						"y": 630,
 						"w": 19,
 						"h": 29
 					}
@@ -5421,8 +5421,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 149,
-						"y": 629,
+						"x": 85,
+						"y": 630,
 						"w": 19,
 						"h": 29
 					}
@@ -5442,8 +5442,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 168,
-						"y": 629,
+						"x": 104,
+						"y": 630,
 						"w": 28,
 						"h": 29
 					}
@@ -5463,8 +5463,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 196,
-						"y": 629,
+						"x": 132,
+						"y": 630,
 						"w": 28,
 						"h": 29
 					}
@@ -5484,8 +5484,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 224,
-						"y": 629,
+						"x": 160,
+						"y": 630,
 						"w": 24,
 						"h": 29
 					}
@@ -5505,8 +5505,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 0,
-						"y": 658,
+						"x": 184,
+						"y": 630,
 						"w": 24,
 						"h": 29
 					}
@@ -5526,8 +5526,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 24,
-						"y": 658,
+						"x": 208,
+						"y": 630,
 						"w": 23,
 						"h": 29
 					}
@@ -5547,8 +5547,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 47,
-						"y": 658,
+						"x": 231,
+						"y": 630,
 						"w": 23,
 						"h": 29
 					}
@@ -5568,8 +5568,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 70,
-						"y": 658,
+						"x": 0,
+						"y": 659,
 						"w": 30,
 						"h": 29
 					}
@@ -5589,8 +5589,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 100,
-						"y": 658,
+						"x": 30,
+						"y": 659,
 						"w": 30,
 						"h": 29
 					}
@@ -5610,8 +5610,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 130,
-						"y": 658,
+						"x": 60,
+						"y": 659,
 						"w": 22,
 						"h": 29
 					}
@@ -5631,8 +5631,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 152,
-						"y": 658,
+						"x": 82,
+						"y": 659,
 						"w": 22,
 						"h": 29
 					}
@@ -5652,8 +5652,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 174,
-						"y": 658,
+						"x": 104,
+						"y": 659,
 						"w": 30,
 						"h": 29
 					}
@@ -5673,8 +5673,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 204,
-						"y": 658,
+						"x": 134,
+						"y": 659,
 						"w": 30,
 						"h": 29
 					}
@@ -5694,8 +5694,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 0,
-						"y": 687,
+						"x": 164,
+						"y": 659,
 						"w": 26,
 						"h": 29
 					}
@@ -5715,8 +5715,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 26,
-						"y": 687,
+						"x": 190,
+						"y": 659,
 						"w": 26,
 						"h": 29
 					}
@@ -5736,8 +5736,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 52,
-						"y": 687,
+						"x": 216,
+						"y": 659,
 						"w": 17,
 						"h": 30
 					}
@@ -5757,8 +5757,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 69,
-						"y": 687,
+						"x": 233,
+						"y": 659,
 						"w": 17,
 						"h": 30
 					}
@@ -5778,8 +5778,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 86,
-						"y": 687,
+						"x": 0,
+						"y": 689,
 						"w": 32,
 						"h": 30
 					}
@@ -5799,8 +5799,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 118,
-						"y": 687,
+						"x": 32,
+						"y": 689,
 						"w": 32,
 						"h": 30
 					}
@@ -5820,8 +5820,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 150,
-						"y": 687,
+						"x": 64,
+						"y": 689,
 						"w": 39,
 						"h": 30
 					}
@@ -5841,8 +5841,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 189,
-						"y": 687,
+						"x": 103,
+						"y": 689,
 						"w": 39,
 						"h": 30
 					}
@@ -5862,8 +5862,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 717,
+						"x": 142,
+						"y": 689,
 						"w": 32,
 						"h": 30
 					}
@@ -5883,8 +5883,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 32,
-						"y": 717,
+						"x": 174,
+						"y": 689,
 						"w": 32,
 						"h": 30
 					}
@@ -5904,8 +5904,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 64,
-						"y": 717,
+						"x": 206,
+						"y": 689,
 						"w": 34,
 						"h": 30
 					}
@@ -5925,8 +5925,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 98,
-						"y": 717,
+						"x": 0,
+						"y": 719,
 						"w": 34,
 						"h": 30
 					}
@@ -5946,8 +5946,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 132,
-						"y": 717,
+						"x": 34,
+						"y": 719,
 						"w": 36,
 						"h": 30
 					}
@@ -5967,8 +5967,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 168,
-						"y": 717,
+						"x": 70,
+						"y": 719,
 						"w": 36,
 						"h": 30
 					}
@@ -5988,8 +5988,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 204,
-						"y": 717,
+						"x": 106,
+						"y": 719,
 						"w": 40,
 						"h": 30
 					}
@@ -6009,8 +6009,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 747,
+						"x": 146,
+						"y": 719,
 						"w": 35,
 						"h": 30
 					}
@@ -6030,8 +6030,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 35,
-						"y": 747,
+						"x": 181,
+						"y": 719,
 						"w": 40,
 						"h": 30
 					}
@@ -6051,8 +6051,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 75,
-						"y": 747,
+						"x": 0,
+						"y": 749,
 						"w": 35,
 						"h": 30
 					}
@@ -6072,8 +6072,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 110,
-						"y": 747,
+						"x": 35,
+						"y": 749,
 						"w": 26,
 						"h": 30
 					}
@@ -6093,8 +6093,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 136,
-						"y": 747,
+						"x": 61,
+						"y": 749,
 						"w": 28,
 						"h": 30
 					}
@@ -6114,8 +6114,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 164,
-						"y": 747,
+						"x": 89,
+						"y": 749,
 						"w": 26,
 						"h": 30
 					}
@@ -6135,12 +6135,54 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 190,
-						"y": 747,
+						"x": 115,
+						"y": 749,
 						"w": 28,
 						"h": 30
 					}
 				},
+				{
+					"filename": "901-bloodmoon",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 0,
+						"w": 32,
+						"h": 30
+					},
+					"frame": {
+						"x": 143,
+						"y": 749,
+						"w": 32,
+						"h": 30
+					}
+				},
+				{
+					"filename": "901s-bloodmoon",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 4,
+						"y": 0,
+						"w": 32,
+						"h": 30
+					},
+					"frame": {
+						"x": 175,
+						"y": 749,
+						"w": 32,
+						"h": 30
+					}
+				},
 				{
 					"filename": "905-incarnate",
 					"rotated": false,
@@ -6156,8 +6198,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 218,
-						"y": 747,
+						"x": 207,
+						"y": 749,
 						"w": 34,
 						"h": 30
 					}
@@ -6178,7 +6220,7 @@
 					},
 					"frame": {
 						"x": 0,
-						"y": 777,
+						"y": 779,
 						"w": 34,
 						"h": 30
 					}
@@ -6199,7 +6241,7 @@
 					},
 					"frame": {
 						"x": 34,
-						"y": 777,
+						"y": 779,
 						"w": 31,
 						"h": 30
 					}
@@ -6220,7 +6262,7 @@
 					},
 					"frame": {
 						"x": 65,
-						"y": 777,
+						"y": 779,
 						"w": 31,
 						"h": 30
 					}
@@ -6241,7 +6283,7 @@
 					},
 					"frame": {
 						"x": 96,
-						"y": 777,
+						"y": 779,
 						"w": 27,
 						"h": 30
 					}
@@ -6262,7 +6304,7 @@
 					},
 					"frame": {
 						"x": 123,
-						"y": 777,
+						"y": 779,
 						"w": 27,
 						"h": 30
 					}
@@ -6283,7 +6325,7 @@
 					},
 					"frame": {
 						"x": 150,
-						"y": 777,
+						"y": 779,
 						"w": 27,
 						"h": 30
 					}
@@ -6304,7 +6346,7 @@
 					},
 					"frame": {
 						"x": 177,
-						"y": 777,
+						"y": 779,
 						"w": 27,
 						"h": 30
 					}
@@ -6325,7 +6367,7 @@
 					},
 					"frame": {
 						"x": 204,
-						"y": 777,
+						"y": 779,
 						"w": 19,
 						"h": 30
 					}
@@ -6346,7 +6388,7 @@
 					},
 					"frame": {
 						"x": 223,
-						"y": 777,
+						"y": 779,
 						"w": 19,
 						"h": 30
 					}
@@ -6357,6 +6399,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:cd4505464b19462bb1d435c915ddcc80:876c47b8fb7d41fbdb6b7ce724c8e3fd:8190d2ecf16422e962cfb1a751b5e1fc$"
+		"smartupdate": "$TexturePacker:SmartUpdate:329fbdefa23c7270b894270a12c5f17f:24ad44a356662302da27f2c46fb16e4b:8190d2ecf16422e962cfb1a751b5e1fc$"
 	}
 }
diff --git a/public/images/ui/pokemon_icons_8.png b/public/images/ui/pokemon_icons_8.png
index 9c86c8a92..dff913fb5 100644
Binary files a/public/images/ui/pokemon_icons_8.png and b/public/images/ui/pokemon_icons_8.png differ
diff --git a/public/images/ui/pokemon_icons_9.json b/public/images/ui/pokemon_icons_9.json
index ba9044d94..702514c9e 100644
--- a/public/images/ui/pokemon_icons_9.json
+++ b/public/images/ui/pokemon_icons_9.json
@@ -4,11 +4,53 @@
 			"image": "pokemon_icons_9.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 128,
-				"h": 367
+				"w": 125,
+				"h": 449
 			},
 			"scale": 1,
 			"frames": [
+				{
+					"filename": "8194",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 10,
+						"w": 20,
+						"h": 19
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 20,
+						"h": 19
+					}
+				},
+				{
+					"filename": "8194s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 10,
+						"w": 20,
+						"h": 19
+					},
+					"frame": {
+						"x": 20,
+						"y": 0,
+						"w": 20,
+						"h": 19
+					}
+				},
 				{
 					"filename": "985",
 					"rotated": false,
@@ -24,7 +66,7 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 0,
+						"x": 40,
 						"y": 0,
 						"w": 29,
 						"h": 23
@@ -45,12 +87,54 @@
 						"h": 23
 					},
 					"frame": {
-						"x": 29,
+						"x": 69,
 						"y": 0,
 						"w": 29,
 						"h": 23
 					}
 				},
+				{
+					"filename": "8128",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 6,
+						"w": 27,
+						"h": 23
+					},
+					"frame": {
+						"x": 98,
+						"y": 0,
+						"w": 27,
+						"h": 23
+					}
+				},
+				{
+					"filename": "8128s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 6,
+						"w": 27,
+						"h": 23
+					},
+					"frame": {
+						"x": 0,
+						"y": 23,
+						"w": 27,
+						"h": 23
+					}
+				},
 				{
 					"filename": "1011",
 					"rotated": false,
@@ -66,8 +150,8 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 58,
-						"y": 0,
+						"x": 27,
+						"y": 23,
 						"w": 21,
 						"h": 24
 					}
@@ -87,8 +171,8 @@
 						"h": 24
 					},
 					"frame": {
-						"x": 79,
-						"y": 0,
+						"x": 48,
+						"y": 23,
 						"w": 21,
 						"h": 24
 					}
@@ -108,8 +192,8 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 100,
-						"y": 0,
+						"x": 69,
+						"y": 23,
 						"w": 25,
 						"h": 25
 					}
@@ -129,8 +213,8 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 0,
-						"y": 25,
+						"x": 94,
+						"y": 23,
 						"w": 25,
 						"h": 25
 					}
@@ -150,8 +234,8 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 25,
-						"y": 25,
+						"x": 0,
+						"y": 48,
 						"w": 30,
 						"h": 25
 					}
@@ -171,54 +255,12 @@
 						"h": 25
 					},
 					"frame": {
-						"x": 55,
-						"y": 25,
+						"x": 30,
+						"y": 48,
 						"w": 30,
 						"h": 25
 					}
 				},
-				{
-					"filename": "1022",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 28,
-						"h": 25
-					},
-					"frame": {
-						"x": 85,
-						"y": 25,
-						"w": 28,
-						"h": 25
-					}
-				},
-				{
-					"filename": "1022s",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 40,
-						"h": 30
-					},
-					"spriteSourceSize": {
-						"x": 6,
-						"y": 4,
-						"w": 28,
-						"h": 25
-					},
-					"frame": {
-						"x": 0,
-						"y": 50,
-						"w": 28,
-						"h": 25
-					}
-				},
 				{
 					"filename": "987",
 					"rotated": false,
@@ -234,8 +276,8 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 28,
-						"y": 50,
+						"x": 60,
+						"y": 48,
 						"w": 26,
 						"h": 26
 					}
@@ -255,8 +297,8 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 54,
-						"y": 50,
+						"x": 86,
+						"y": 48,
 						"w": 26,
 						"h": 26
 					}
@@ -276,8 +318,8 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 80,
-						"y": 50,
+						"x": 0,
+						"y": 74,
 						"w": 22,
 						"h": 26
 					}
@@ -297,12 +339,54 @@
 						"h": 26
 					},
 					"frame": {
-						"x": 102,
-						"y": 50,
+						"x": 22,
+						"y": 74,
 						"w": 22,
 						"h": 26
 					}
 				},
+				{
+					"filename": "8128-aqua",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 4,
+						"w": 30,
+						"h": 26
+					},
+					"frame": {
+						"x": 44,
+						"y": 74,
+						"w": 30,
+						"h": 26
+					}
+				},
+				{
+					"filename": "8128s-aqua",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 4,
+						"w": 30,
+						"h": 26
+					},
+					"frame": {
+						"x": 74,
+						"y": 74,
+						"w": 30,
+						"h": 26
+					}
+				},
 				{
 					"filename": "984",
 					"rotated": false,
@@ -319,7 +403,7 @@
 					},
 					"frame": {
 						"x": 0,
-						"y": 76,
+						"y": 100,
 						"w": 34,
 						"h": 27
 					}
@@ -340,7 +424,7 @@
 					},
 					"frame": {
 						"x": 34,
-						"y": 76,
+						"y": 100,
 						"w": 34,
 						"h": 27
 					}
@@ -361,7 +445,7 @@
 					},
 					"frame": {
 						"x": 68,
-						"y": 76,
+						"y": 100,
 						"w": 32,
 						"h": 27
 					}
@@ -382,11 +466,53 @@
 					},
 					"frame": {
 						"x": 0,
-						"y": 103,
+						"y": 127,
 						"w": 32,
 						"h": 27
 					}
 				},
+				{
+					"filename": "1022",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 2,
+						"w": 31,
+						"h": 27
+					},
+					"frame": {
+						"x": 32,
+						"y": 127,
+						"w": 31,
+						"h": 27
+					}
+				},
+				{
+					"filename": "1022s",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 2,
+						"w": 31,
+						"h": 27
+					},
+					"frame": {
+						"x": 63,
+						"y": 127,
+						"w": 31,
+						"h": 27
+					}
+				},
 				{
 					"filename": "979",
 					"rotated": false,
@@ -402,8 +528,8 @@
 						"h": 28
 					},
 					"frame": {
-						"x": 32,
-						"y": 103,
+						"x": 94,
+						"y": 127,
 						"w": 29,
 						"h": 28
 					}
@@ -423,8 +549,8 @@
 						"h": 28
 					},
 					"frame": {
-						"x": 61,
-						"y": 103,
+						"x": 0,
+						"y": 155,
 						"w": 29,
 						"h": 28
 					}
@@ -444,8 +570,8 @@
 						"h": 28
 					},
 					"frame": {
-						"x": 90,
-						"y": 103,
+						"x": 29,
+						"y": 155,
 						"w": 24,
 						"h": 28
 					}
@@ -465,8 +591,8 @@
 						"h": 28
 					},
 					"frame": {
-						"x": 0,
-						"y": 131,
+						"x": 53,
+						"y": 155,
 						"w": 24,
 						"h": 28
 					}
@@ -486,8 +612,8 @@
 						"h": 28
 					},
 					"frame": {
-						"x": 24,
-						"y": 131,
+						"x": 77,
+						"y": 155,
 						"w": 32,
 						"h": 28
 					}
@@ -507,8 +633,8 @@
 						"h": 28
 					},
 					"frame": {
-						"x": 56,
-						"y": 131,
+						"x": 0,
+						"y": 183,
 						"w": 32,
 						"h": 28
 					}
@@ -528,8 +654,8 @@
 						"h": 28
 					},
 					"frame": {
-						"x": 88,
-						"y": 131,
+						"x": 32,
+						"y": 183,
 						"w": 34,
 						"h": 28
 					}
@@ -549,8 +675,8 @@
 						"h": 28
 					},
 					"frame": {
-						"x": 0,
-						"y": 159,
+						"x": 66,
+						"y": 183,
 						"w": 34,
 						"h": 28
 					}
@@ -570,8 +696,8 @@
 						"h": 28
 					},
 					"frame": {
-						"x": 34,
-						"y": 159,
+						"x": 100,
+						"y": 183,
 						"w": 23,
 						"h": 28
 					}
@@ -591,8 +717,8 @@
 						"h": 28
 					},
 					"frame": {
-						"x": 57,
-						"y": 159,
+						"x": 0,
+						"y": 211,
 						"w": 23,
 						"h": 28
 					}
@@ -612,8 +738,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 80,
-						"y": 159,
+						"x": 23,
+						"y": 211,
 						"w": 27,
 						"h": 29
 					}
@@ -633,8 +759,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 0,
-						"y": 188,
+						"x": 50,
+						"y": 211,
 						"w": 27,
 						"h": 29
 					}
@@ -654,8 +780,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 27,
-						"y": 188,
+						"x": 77,
+						"y": 211,
 						"w": 34,
 						"h": 29
 					}
@@ -675,8 +801,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 61,
-						"y": 188,
+						"x": 0,
+						"y": 240,
 						"w": 34,
 						"h": 29
 					}
@@ -696,8 +822,8 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 95,
-						"y": 188,
+						"x": 34,
+						"y": 240,
 						"w": 24,
 						"h": 29
 					}
@@ -717,12 +843,54 @@
 						"h": 29
 					},
 					"frame": {
-						"x": 0,
-						"y": 217,
+						"x": 58,
+						"y": 240,
 						"w": 24,
 						"h": 29
 					}
 				},
+				{
+					"filename": "8128-blaze",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 1,
+						"w": 31,
+						"h": 29
+					},
+					"frame": {
+						"x": 82,
+						"y": 240,
+						"w": 31,
+						"h": 29
+					}
+				},
+				{
+					"filename": "8128s-blaze",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 1,
+						"w": 31,
+						"h": 29
+					},
+					"frame": {
+						"x": 0,
+						"y": 269,
+						"w": 31,
+						"h": 29
+					}
+				},
 				{
 					"filename": "981",
 					"rotated": false,
@@ -738,8 +906,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 24,
-						"y": 217,
+						"x": 31,
+						"y": 269,
 						"w": 25,
 						"h": 30
 					}
@@ -759,8 +927,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 49,
-						"y": 217,
+						"x": 56,
+						"y": 269,
 						"w": 25,
 						"h": 30
 					}
@@ -780,8 +948,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 74,
-						"y": 217,
+						"x": 81,
+						"y": 269,
 						"w": 27,
 						"h": 30
 					}
@@ -801,8 +969,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 101,
-						"y": 217,
+						"x": 0,
+						"y": 299,
 						"w": 27,
 						"h": 30
 					}
@@ -822,8 +990,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 247,
+						"x": 27,
+						"y": 299,
 						"w": 28,
 						"h": 30
 					}
@@ -843,8 +1011,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 28,
-						"y": 247,
+						"x": 55,
+						"y": 299,
 						"w": 28,
 						"h": 30
 					}
@@ -864,8 +1032,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 56,
-						"y": 247,
+						"x": 83,
+						"y": 299,
 						"w": 29,
 						"h": 30
 					}
@@ -885,8 +1053,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 85,
-						"y": 247,
+						"x": 0,
+						"y": 329,
 						"w": 29,
 						"h": 30
 					}
@@ -906,8 +1074,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 277,
+						"x": 29,
+						"y": 329,
 						"w": 29,
 						"h": 30
 					}
@@ -927,8 +1095,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 29,
-						"y": 277,
+						"x": 58,
+						"y": 329,
 						"w": 29,
 						"h": 30
 					}
@@ -948,8 +1116,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 58,
-						"y": 277,
+						"x": 87,
+						"y": 329,
 						"w": 33,
 						"h": 30
 					}
@@ -969,8 +1137,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 91,
-						"y": 277,
+						"x": 0,
+						"y": 359,
 						"w": 33,
 						"h": 30
 					}
@@ -984,15 +1152,15 @@
 						"h": 30
 					},
 					"spriteSourceSize": {
-						"x": 7,
+						"x": 3,
 						"y": 0,
-						"w": 26,
+						"w": 33,
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 307,
-						"w": 26,
+						"x": 33,
+						"y": 359,
+						"w": 33,
 						"h": 30
 					}
 				},
@@ -1005,15 +1173,15 @@
 						"h": 30
 					},
 					"spriteSourceSize": {
-						"x": 7,
+						"x": 3,
 						"y": 0,
-						"w": 26,
+						"w": 33,
 						"h": 30
 					},
 					"frame": {
-						"x": 26,
-						"y": 307,
-						"w": 26,
+						"x": 66,
+						"y": 359,
+						"w": 33,
 						"h": 30
 					}
 				},
@@ -1026,15 +1194,15 @@
 						"h": 30
 					},
 					"spriteSourceSize": {
-						"x": 5,
+						"x": 4,
 						"y": 0,
-						"w": 31,
+						"w": 33,
 						"h": 30
 					},
 					"frame": {
-						"x": 52,
-						"y": 307,
-						"w": 31,
+						"x": 0,
+						"y": 389,
+						"w": 33,
 						"h": 30
 					}
 				},
@@ -1047,15 +1215,15 @@
 						"h": 30
 					},
 					"spriteSourceSize": {
-						"x": 5,
+						"x": 4,
 						"y": 0,
-						"w": 31,
+						"w": 33,
 						"h": 30
 					},
 					"frame": {
-						"x": 83,
-						"y": 307,
-						"w": 31,
+						"x": 33,
+						"y": 389,
+						"w": 33,
 						"h": 30
 					}
 				},
@@ -1074,8 +1242,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 0,
-						"y": 337,
+						"x": 66,
+						"y": 389,
 						"w": 32,
 						"h": 30
 					}
@@ -1095,8 +1263,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 32,
-						"y": 337,
+						"x": 0,
+						"y": 419,
 						"w": 32,
 						"h": 30
 					}
@@ -1116,8 +1284,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 64,
-						"y": 337,
+						"x": 32,
+						"y": 419,
 						"w": 22,
 						"h": 30
 					}
@@ -1137,8 +1305,8 @@
 						"h": 30
 					},
 					"frame": {
-						"x": 86,
-						"y": 337,
+						"x": 54,
+						"y": 419,
 						"w": 22,
 						"h": 30
 					}
@@ -1149,6 +1317,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:3f2a38c3e3657bf7b9dcfcab30d14f3e:90f931f5945cd87c01ae6d4d4da9e4e0:6fb417eff82c0971c86b4818772ba292$"
+		"smartupdate": "$TexturePacker:SmartUpdate:08e8b433699d2eec848a23537f768e83:6af67c3bacff6ddb10829c9668f79a32:6fb417eff82c0971c86b4818772ba292$"
 	}
 }
diff --git a/public/images/ui/pokemon_icons_9.png b/public/images/ui/pokemon_icons_9.png
index 8c41ae44e..1b9510ceb 100644
Binary files a/public/images/ui/pokemon_icons_9.png and b/public/images/ui/pokemon_icons_9.png differ