diff --git a/imgs/icons/03_11.png b/imgs/icons/03_11.png
deleted file mode 100644
index 98f8bd62f..000000000
Binary files a/imgs/icons/03_11.png and /dev/null differ
diff --git a/imgs/icons/11_04.png b/imgs/icons/11_4.png
similarity index 100%
rename from imgs/icons/11_04.png
rename to imgs/icons/11_4.png
diff --git a/imgs/icons/11_05.png b/imgs/icons/11_5.png
similarity index 100%
rename from imgs/icons/11_05.png
rename to imgs/icons/11_5.png
diff --git a/imgs/icons/12_04.png b/imgs/icons/12_4.png
similarity index 100%
rename from imgs/icons/12_04.png
rename to imgs/icons/12_4.png
diff --git a/imgs/icons/12_06.png b/imgs/icons/12_6.png
similarity index 100%
rename from imgs/icons/12_06.png
rename to imgs/icons/12_6.png
diff --git a/imgs/icons/12_07.png b/imgs/icons/12_7.png
similarity index 100%
rename from imgs/icons/12_07.png
rename to imgs/icons/12_7.png
diff --git a/imgs/icons/12_08.png b/imgs/icons/12_8.png
similarity index 100%
rename from imgs/icons/12_08.png
rename to imgs/icons/12_8.png
diff --git a/imgs/icons/12_09.png b/imgs/icons/12_9.png
similarity index 100%
rename from imgs/icons/12_09.png
rename to imgs/icons/12_9.png
diff --git a/imgs/icons/13_01.png b/imgs/icons/13_1.png
similarity index 100%
rename from imgs/icons/13_01.png
rename to imgs/icons/13_1.png
diff --git a/imgs/icons/13_02.png b/imgs/icons/13_2.png
similarity index 100%
rename from imgs/icons/13_02.png
rename to imgs/icons/13_2.png
diff --git a/imgs/icons/13_03.png b/imgs/icons/13_3.png
similarity index 100%
rename from imgs/icons/13_03.png
rename to imgs/icons/13_3.png
diff --git a/imgs/icons/13_04.png b/imgs/icons/13_4.png
similarity index 100%
rename from imgs/icons/13_04.png
rename to imgs/icons/13_4.png
diff --git a/imgs/icons/13_05.png b/imgs/icons/13_5.png
similarity index 100%
rename from imgs/icons/13_05.png
rename to imgs/icons/13_5.png
diff --git a/imgs/icons/13_06.png b/imgs/icons/13_6.png
similarity index 100%
rename from imgs/icons/13_06.png
rename to imgs/icons/13_6.png
diff --git a/imgs/icons/13_07.png b/imgs/icons/13_7.png
similarity index 100%
rename from imgs/icons/13_07.png
rename to imgs/icons/13_7.png
diff --git a/imgs/icons/13_08.png b/imgs/icons/13_8.png
similarity index 100%
rename from imgs/icons/13_08.png
rename to imgs/icons/13_8.png
diff --git a/imgs/icons/13_09.png b/imgs/icons/13_9.png
similarity index 100%
rename from imgs/icons/13_09.png
rename to imgs/icons/13_9.png
diff --git a/imgs/icons/14_01.png b/imgs/icons/14_1.png
similarity index 100%
rename from imgs/icons/14_01.png
rename to imgs/icons/14_1.png
diff --git a/imgs/icons/14_02.png b/imgs/icons/14_2.png
similarity index 100%
rename from imgs/icons/14_02.png
rename to imgs/icons/14_2.png
diff --git a/imgs/icons/14_03.png b/imgs/icons/14_3.png
similarity index 100%
rename from imgs/icons/14_03.png
rename to imgs/icons/14_3.png
diff --git a/imgs/icons/14_04.png b/imgs/icons/14_4.png
similarity index 100%
rename from imgs/icons/14_04.png
rename to imgs/icons/14_4.png
diff --git a/imgs/icons/14_05.png b/imgs/icons/14_5.png
similarity index 100%
rename from imgs/icons/14_05.png
rename to imgs/icons/14_5.png
diff --git a/imgs/icons/14_06.png b/imgs/icons/14_6.png
similarity index 100%
rename from imgs/icons/14_06.png
rename to imgs/icons/14_6.png
diff --git a/imgs/icons/14_07.png b/imgs/icons/14_7.png
similarity index 100%
rename from imgs/icons/14_07.png
rename to imgs/icons/14_7.png
diff --git a/imgs/icons/14_08.png b/imgs/icons/14_8.png
similarity index 100%
rename from imgs/icons/14_08.png
rename to imgs/icons/14_8.png
diff --git a/imgs/icons/14_09.png b/imgs/icons/14_9.png
similarity index 100%
rename from imgs/icons/14_09.png
rename to imgs/icons/14_9.png
diff --git a/imgs/icons/15_01.png b/imgs/icons/15_1.png
similarity index 100%
rename from imgs/icons/15_01.png
rename to imgs/icons/15_1.png
diff --git a/imgs/icons/15_02.png b/imgs/icons/15_2.png
similarity index 100%
rename from imgs/icons/15_02.png
rename to imgs/icons/15_2.png
diff --git a/imgs/icons/15_03.png b/imgs/icons/15_3.png
similarity index 100%
rename from imgs/icons/15_03.png
rename to imgs/icons/15_3.png
diff --git a/imgs/icons/15_04.png b/imgs/icons/15_4.png
similarity index 100%
rename from imgs/icons/15_04.png
rename to imgs/icons/15_4.png
diff --git a/imgs/icons/15_05.png b/imgs/icons/15_5.png
similarity index 100%
rename from imgs/icons/15_05.png
rename to imgs/icons/15_5.png
diff --git a/imgs/icons/15_06.png b/imgs/icons/15_6.png
similarity index 100%
rename from imgs/icons/15_06.png
rename to imgs/icons/15_6.png
diff --git a/imgs/icons/15_07.png b/imgs/icons/15_7.png
similarity index 100%
rename from imgs/icons/15_07.png
rename to imgs/icons/15_7.png
diff --git a/imgs/icons/15_08.png b/imgs/icons/15_8.png
similarity index 100%
rename from imgs/icons/15_08.png
rename to imgs/icons/15_8.png
diff --git a/imgs/icons/15_09.png b/imgs/icons/15_9.png
similarity index 100%
rename from imgs/icons/15_09.png
rename to imgs/icons/15_9.png
diff --git a/imgs/icons/16_01.png b/imgs/icons/16_1.png
similarity index 100%
rename from imgs/icons/16_01.png
rename to imgs/icons/16_1.png
diff --git a/imgs/icons/16_02.png b/imgs/icons/16_2.png
similarity index 100%
rename from imgs/icons/16_02.png
rename to imgs/icons/16_2.png
diff --git a/imgs/icons/16_03.png b/imgs/icons/16_3.png
similarity index 100%
rename from imgs/icons/16_03.png
rename to imgs/icons/16_3.png
diff --git a/imgs/icons/16_04.png b/imgs/icons/16_4.png
similarity index 100%
rename from imgs/icons/16_04.png
rename to imgs/icons/16_4.png
diff --git a/imgs/icons/16_05.png b/imgs/icons/16_5.png
similarity index 100%
rename from imgs/icons/16_05.png
rename to imgs/icons/16_5.png
diff --git a/imgs/icons/16_06.png b/imgs/icons/16_6.png
similarity index 100%
rename from imgs/icons/16_06.png
rename to imgs/icons/16_6.png
diff --git a/imgs/icons/16_07.png b/imgs/icons/16_7.png
similarity index 100%
rename from imgs/icons/16_07.png
rename to imgs/icons/16_7.png
diff --git a/imgs/icons/16_08.png b/imgs/icons/16_8.png
similarity index 100%
rename from imgs/icons/16_08.png
rename to imgs/icons/16_8.png
diff --git a/imgs/icons/16_09.png b/imgs/icons/16_9.png
similarity index 100%
rename from imgs/icons/16_09.png
rename to imgs/icons/16_9.png
diff --git a/imgs/icons/01_01.png b/imgs/icons/1_1.png
similarity index 100%
rename from imgs/icons/01_01.png
rename to imgs/icons/1_1.png
diff --git a/imgs/icons/01_10.png b/imgs/icons/1_10.png
similarity index 100%
rename from imgs/icons/01_10.png
rename to imgs/icons/1_10.png
diff --git a/imgs/icons/01_11.png b/imgs/icons/1_11.png
similarity index 100%
rename from imgs/icons/01_11.png
rename to imgs/icons/1_11.png
diff --git a/imgs/icons/01_13.png b/imgs/icons/1_13.png
similarity index 100%
rename from imgs/icons/01_13.png
rename to imgs/icons/1_13.png
diff --git a/imgs/icons/01_15.png b/imgs/icons/1_15.png
similarity index 100%
rename from imgs/icons/01_15.png
rename to imgs/icons/1_15.png
diff --git a/imgs/icons/01_16.png b/imgs/icons/1_16.png
similarity index 100%
rename from imgs/icons/01_16.png
rename to imgs/icons/1_16.png
diff --git a/imgs/icons/01_02.png b/imgs/icons/1_2.png
similarity index 100%
rename from imgs/icons/01_02.png
rename to imgs/icons/1_2.png
diff --git a/imgs/icons/01_03.png b/imgs/icons/1_3.png
similarity index 100%
rename from imgs/icons/01_03.png
rename to imgs/icons/1_3.png
diff --git a/imgs/icons/01_04.png b/imgs/icons/1_4.png
similarity index 100%
rename from imgs/icons/01_04.png
rename to imgs/icons/1_4.png
diff --git a/imgs/icons/01_05.png b/imgs/icons/1_5.png
similarity index 100%
rename from imgs/icons/01_05.png
rename to imgs/icons/1_5.png
diff --git a/imgs/icons/01_06.png b/imgs/icons/1_6.png
similarity index 100%
rename from imgs/icons/01_06.png
rename to imgs/icons/1_6.png
diff --git a/imgs/icons/01_07.png b/imgs/icons/1_7.png
similarity index 100%
rename from imgs/icons/01_07.png
rename to imgs/icons/1_7.png
diff --git a/imgs/icons/01_08.png b/imgs/icons/1_8.png
similarity index 100%
rename from imgs/icons/01_08.png
rename to imgs/icons/1_8.png
diff --git a/imgs/icons/01_09.png b/imgs/icons/1_9.png
similarity index 100%
rename from imgs/icons/01_09.png
rename to imgs/icons/1_9.png
diff --git a/imgs/icons/20_01.png b/imgs/icons/20_1.png
similarity index 100%
rename from imgs/icons/20_01.png
rename to imgs/icons/20_1.png
diff --git a/imgs/icons/20_02.png b/imgs/icons/20_2.png
similarity index 100%
rename from imgs/icons/20_02.png
rename to imgs/icons/20_2.png
diff --git a/imgs/icons/20_03.png b/imgs/icons/20_3.png
similarity index 100%
rename from imgs/icons/20_03.png
rename to imgs/icons/20_3.png
diff --git a/imgs/icons/20_04.png b/imgs/icons/20_4.png
similarity index 100%
rename from imgs/icons/20_04.png
rename to imgs/icons/20_4.png
diff --git a/imgs/icons/20_05.png b/imgs/icons/20_5.png
similarity index 100%
rename from imgs/icons/20_05.png
rename to imgs/icons/20_5.png
diff --git a/imgs/icons/20_06.png b/imgs/icons/20_6.png
similarity index 100%
rename from imgs/icons/20_06.png
rename to imgs/icons/20_6.png
diff --git a/imgs/icons/20_07.png b/imgs/icons/20_7.png
similarity index 100%
rename from imgs/icons/20_07.png
rename to imgs/icons/20_7.png
diff --git a/imgs/icons/20_08.png b/imgs/icons/20_8.png
similarity index 100%
rename from imgs/icons/20_08.png
rename to imgs/icons/20_8.png
diff --git a/imgs/icons/20_09.png b/imgs/icons/20_9.png
similarity index 100%
rename from imgs/icons/20_09.png
rename to imgs/icons/20_9.png
diff --git a/imgs/icons/21_01.png b/imgs/icons/21_1.png
similarity index 100%
rename from imgs/icons/21_01.png
rename to imgs/icons/21_1.png
diff --git a/imgs/icons/21_02.png b/imgs/icons/21_2.png
similarity index 100%
rename from imgs/icons/21_02.png
rename to imgs/icons/21_2.png
diff --git a/imgs/icons/21_03.png b/imgs/icons/21_3.png
similarity index 100%
rename from imgs/icons/21_03.png
rename to imgs/icons/21_3.png
diff --git a/imgs/icons/21_05.png b/imgs/icons/21_5.png
similarity index 100%
rename from imgs/icons/21_05.png
rename to imgs/icons/21_5.png
diff --git a/imgs/icons/21_06.png b/imgs/icons/21_6.png
similarity index 100%
rename from imgs/icons/21_06.png
rename to imgs/icons/21_6.png
diff --git a/imgs/icons/21_07.png b/imgs/icons/21_7.png
similarity index 100%
rename from imgs/icons/21_07.png
rename to imgs/icons/21_7.png
diff --git a/imgs/icons/21_09.png b/imgs/icons/21_9.png
similarity index 100%
rename from imgs/icons/21_09.png
rename to imgs/icons/21_9.png
diff --git a/imgs/icons/22_01.png b/imgs/icons/22_1.png
similarity index 100%
rename from imgs/icons/22_01.png
rename to imgs/icons/22_1.png
diff --git a/imgs/icons/22_02.png b/imgs/icons/22_2.png
similarity index 100%
rename from imgs/icons/22_02.png
rename to imgs/icons/22_2.png
diff --git a/imgs/icons/22_03.png b/imgs/icons/22_3.png
similarity index 100%
rename from imgs/icons/22_03.png
rename to imgs/icons/22_3.png
diff --git a/imgs/icons/22_04.png b/imgs/icons/22_4.png
similarity index 100%
rename from imgs/icons/22_04.png
rename to imgs/icons/22_4.png
diff --git a/imgs/icons/22_05.png b/imgs/icons/22_5.png
similarity index 100%
rename from imgs/icons/22_05.png
rename to imgs/icons/22_5.png
diff --git a/imgs/icons/22_06.png b/imgs/icons/22_6.png
similarity index 100%
rename from imgs/icons/22_06.png
rename to imgs/icons/22_6.png
diff --git a/imgs/icons/22_07.png b/imgs/icons/22_7.png
similarity index 100%
rename from imgs/icons/22_07.png
rename to imgs/icons/22_7.png
diff --git a/imgs/icons/22_09.png b/imgs/icons/22_9.png
similarity index 100%
rename from imgs/icons/22_09.png
rename to imgs/icons/22_9.png
diff --git a/imgs/icons/25_04.png b/imgs/icons/25_4.png
similarity index 100%
rename from imgs/icons/25_04.png
rename to imgs/icons/25_4.png
diff --git a/imgs/icons/26_01.png b/imgs/icons/26_1.png
similarity index 100%
rename from imgs/icons/26_01.png
rename to imgs/icons/26_1.png
diff --git a/imgs/icons/27_05.png b/imgs/icons/27_5.png
similarity index 100%
rename from imgs/icons/27_05.png
rename to imgs/icons/27_5.png
diff --git a/imgs/icons/27_09.png b/imgs/icons/27_9.png
similarity index 100%
rename from imgs/icons/27_09.png
rename to imgs/icons/27_9.png
diff --git a/imgs/icons/02_10.png b/imgs/icons/2_10.png
similarity index 100%
rename from imgs/icons/02_10.png
rename to imgs/icons/2_10.png
diff --git a/imgs/icons/02_11.png b/imgs/icons/2_11.png
similarity index 100%
rename from imgs/icons/02_11.png
rename to imgs/icons/2_11.png
diff --git a/imgs/icons/02_12.png b/imgs/icons/2_12.png
similarity index 100%
rename from imgs/icons/02_12.png
rename to imgs/icons/2_12.png
diff --git a/imgs/icons/02_14.png b/imgs/icons/2_14.png
similarity index 100%
rename from imgs/icons/02_14.png
rename to imgs/icons/2_14.png
diff --git a/imgs/icons/02_16.png b/imgs/icons/2_16.png
similarity index 100%
rename from imgs/icons/02_16.png
rename to imgs/icons/2_16.png
diff --git a/imgs/icons/02_02.png b/imgs/icons/2_2.png
similarity index 100%
rename from imgs/icons/02_02.png
rename to imgs/icons/2_2.png
diff --git a/imgs/icons/02_03.png b/imgs/icons/2_3.png
similarity index 100%
rename from imgs/icons/02_03.png
rename to imgs/icons/2_3.png
diff --git a/imgs/icons/02_04.png b/imgs/icons/2_4.png
similarity index 100%
rename from imgs/icons/02_04.png
rename to imgs/icons/2_4.png
diff --git a/imgs/icons/02_05.png b/imgs/icons/2_5.png
similarity index 100%
rename from imgs/icons/02_05.png
rename to imgs/icons/2_5.png
diff --git a/imgs/icons/02_07.png b/imgs/icons/2_7.png
similarity index 100%
rename from imgs/icons/02_07.png
rename to imgs/icons/2_7.png
diff --git a/imgs/icons/02_09.png b/imgs/icons/2_9.png
similarity index 100%
rename from imgs/icons/02_09.png
rename to imgs/icons/2_9.png
diff --git a/imgs/icons/34_01.png b/imgs/icons/34_1.png
similarity index 100%
rename from imgs/icons/34_01.png
rename to imgs/icons/34_1.png
diff --git a/imgs/icons/34_02.png b/imgs/icons/34_2.png
similarity index 100%
rename from imgs/icons/34_02.png
rename to imgs/icons/34_2.png
diff --git a/imgs/icons/35_01.png b/imgs/icons/35_1.png
similarity index 100%
rename from imgs/icons/35_01.png
rename to imgs/icons/35_1.png
diff --git a/imgs/icons/35_03.png b/imgs/icons/35_3.png
similarity index 100%
rename from imgs/icons/35_03.png
rename to imgs/icons/35_3.png
diff --git a/imgs/icons/35_09.png b/imgs/icons/35_9.png
similarity index 100%
rename from imgs/icons/35_09.png
rename to imgs/icons/35_9.png
diff --git a/imgs/icons/03_01.png b/imgs/icons/3_1.png
similarity index 100%
rename from imgs/icons/03_01.png
rename to imgs/icons/3_1.png
diff --git a/imgs/icons/03_10.png b/imgs/icons/3_10.png
similarity index 100%
rename from imgs/icons/03_10.png
rename to imgs/icons/3_10.png
diff --git a/imgs/icons/3_11.png b/imgs/icons/3_11.png
new file mode 100644
index 000000000..d179363e2
Binary files /dev/null and b/imgs/icons/3_11.png differ
diff --git a/imgs/icons/03_12.png b/imgs/icons/3_12.png
similarity index 100%
rename from imgs/icons/03_12.png
rename to imgs/icons/3_12.png
diff --git a/imgs/icons/03_13.png b/imgs/icons/3_13.png
similarity index 100%
rename from imgs/icons/03_13.png
rename to imgs/icons/3_13.png
diff --git a/imgs/icons/03_02.png b/imgs/icons/3_2.png
similarity index 100%
rename from imgs/icons/03_02.png
rename to imgs/icons/3_2.png
diff --git a/imgs/icons/03_04.png b/imgs/icons/3_4.png
similarity index 100%
rename from imgs/icons/03_04.png
rename to imgs/icons/3_4.png
diff --git a/imgs/icons/03_05.png b/imgs/icons/3_5.png
similarity index 100%
rename from imgs/icons/03_05.png
rename to imgs/icons/3_5.png
diff --git a/imgs/icons/03_06.png b/imgs/icons/3_6.png
similarity index 100%
rename from imgs/icons/03_06.png
rename to imgs/icons/3_6.png
diff --git a/imgs/icons/03_08.png b/imgs/icons/3_8.png
similarity index 100%
rename from imgs/icons/03_08.png
rename to imgs/icons/3_8.png
diff --git a/imgs/icons/03_09.png b/imgs/icons/3_9.png
similarity index 100%
rename from imgs/icons/03_09.png
rename to imgs/icons/3_9.png
diff --git a/imgs/icons/48_01.png b/imgs/icons/48_1.png
similarity index 100%
rename from imgs/icons/48_01.png
rename to imgs/icons/48_1.png
diff --git a/imgs/icons/48_02.png b/imgs/icons/48_2.png
similarity index 100%
rename from imgs/icons/48_02.png
rename to imgs/icons/48_2.png
diff --git a/imgs/icons/48_03.png b/imgs/icons/48_3.png
similarity index 100%
rename from imgs/icons/48_03.png
rename to imgs/icons/48_3.png
diff --git a/imgs/icons/48_04.png b/imgs/icons/48_4.png
similarity index 100%
rename from imgs/icons/48_04.png
rename to imgs/icons/48_4.png
diff --git a/imgs/icons/48_05.png b/imgs/icons/48_5.png
similarity index 100%
rename from imgs/icons/48_05.png
rename to imgs/icons/48_5.png
diff --git a/imgs/icons/48_06.png b/imgs/icons/48_6.png
similarity index 100%
rename from imgs/icons/48_06.png
rename to imgs/icons/48_6.png
diff --git a/imgs/icons/48_07.png b/imgs/icons/48_7.png
similarity index 100%
rename from imgs/icons/48_07.png
rename to imgs/icons/48_7.png
diff --git a/imgs/icons/48_08.png b/imgs/icons/48_8.png
similarity index 100%
rename from imgs/icons/48_08.png
rename to imgs/icons/48_8.png
diff --git a/imgs/icons/48_09.png b/imgs/icons/48_9.png
similarity index 100%
rename from imgs/icons/48_09.png
rename to imgs/icons/48_9.png
diff --git a/imgs/icons/49_05.png b/imgs/icons/49_5.png
similarity index 100%
rename from imgs/icons/49_05.png
rename to imgs/icons/49_5.png
diff --git a/imgs/icons/49_06.png b/imgs/icons/49_6.png
similarity index 100%
rename from imgs/icons/49_06.png
rename to imgs/icons/49_6.png
diff --git a/imgs/icons/49_07.png b/imgs/icons/49_7.png
similarity index 100%
rename from imgs/icons/49_07.png
rename to imgs/icons/49_7.png
diff --git a/imgs/icons/04_01.png b/imgs/icons/4_1.png
similarity index 100%
rename from imgs/icons/04_01.png
rename to imgs/icons/4_1.png
diff --git a/imgs/icons/04_10.png b/imgs/icons/4_10.png
similarity index 100%
rename from imgs/icons/04_10.png
rename to imgs/icons/4_10.png
diff --git a/imgs/icons/04_11.png b/imgs/icons/4_11.png
similarity index 100%
rename from imgs/icons/04_11.png
rename to imgs/icons/4_11.png
diff --git a/imgs/icons/04_12.png b/imgs/icons/4_12.png
similarity index 100%
rename from imgs/icons/04_12.png
rename to imgs/icons/4_12.png
diff --git a/imgs/icons/04_13.png b/imgs/icons/4_13.png
similarity index 100%
rename from imgs/icons/04_13.png
rename to imgs/icons/4_13.png
diff --git a/imgs/icons/04_09.png b/imgs/icons/4_9.png
similarity index 100%
rename from imgs/icons/04_09.png
rename to imgs/icons/4_9.png
diff --git a/imgs/icons/50_03.png b/imgs/icons/50_3.png
similarity index 100%
rename from imgs/icons/50_03.png
rename to imgs/icons/50_3.png
diff --git a/imgs/icons/52_01.png b/imgs/icons/52_1.png
similarity index 100%
rename from imgs/icons/52_01.png
rename to imgs/icons/52_1.png
diff --git a/imgs/icons/52_02.png b/imgs/icons/52_2.png
similarity index 100%
rename from imgs/icons/52_02.png
rename to imgs/icons/52_2.png
diff --git a/imgs/icons/52_03.png b/imgs/icons/52_3.png
similarity index 100%
rename from imgs/icons/52_03.png
rename to imgs/icons/52_3.png
diff --git a/imgs/icons/52_04.png b/imgs/icons/52_4.png
similarity index 100%
rename from imgs/icons/52_04.png
rename to imgs/icons/52_4.png
diff --git a/imgs/icons/52_05.png b/imgs/icons/52_5.png
similarity index 100%
rename from imgs/icons/52_05.png
rename to imgs/icons/52_5.png
diff --git a/imgs/icons/52_06.png b/imgs/icons/52_6.png
similarity index 100%
rename from imgs/icons/52_06.png
rename to imgs/icons/52_6.png
diff --git a/imgs/icons/52_07.png b/imgs/icons/52_7.png
similarity index 100%
rename from imgs/icons/52_07.png
rename to imgs/icons/52_7.png
diff --git a/imgs/icons/52_08.png b/imgs/icons/52_8.png
similarity index 100%
rename from imgs/icons/52_08.png
rename to imgs/icons/52_8.png
diff --git a/imgs/icons/53_01.png b/imgs/icons/53_1.png
similarity index 100%
rename from imgs/icons/53_01.png
rename to imgs/icons/53_1.png
diff --git a/imgs/icons/53_02.png b/imgs/icons/53_2.png
similarity index 100%
rename from imgs/icons/53_02.png
rename to imgs/icons/53_2.png
diff --git a/imgs/icons/53_03.png b/imgs/icons/53_3.png
similarity index 100%
rename from imgs/icons/53_03.png
rename to imgs/icons/53_3.png
diff --git a/imgs/icons/53_04.png b/imgs/icons/53_4.png
similarity index 100%
rename from imgs/icons/53_04.png
rename to imgs/icons/53_4.png
diff --git a/imgs/icons/53_05.png b/imgs/icons/53_5.png
similarity index 100%
rename from imgs/icons/53_05.png
rename to imgs/icons/53_5.png
diff --git a/imgs/icons/53_06.png b/imgs/icons/53_6.png
similarity index 100%
rename from imgs/icons/53_06.png
rename to imgs/icons/53_6.png
diff --git a/imgs/icons/53_07.png b/imgs/icons/53_7.png
similarity index 100%
rename from imgs/icons/53_07.png
rename to imgs/icons/53_7.png
diff --git a/imgs/icons/53_08.png b/imgs/icons/53_8.png
similarity index 100%
rename from imgs/icons/53_08.png
rename to imgs/icons/53_8.png
diff --git a/imgs/icons/53_09.png b/imgs/icons/53_9.png
similarity index 100%
rename from imgs/icons/53_09.png
rename to imgs/icons/53_9.png
diff --git a/imgs/icons/56_01.png b/imgs/icons/56_1.png
similarity index 100%
rename from imgs/icons/56_01.png
rename to imgs/icons/56_1.png
diff --git a/imgs/icons/56_02.png b/imgs/icons/56_2.png
similarity index 100%
rename from imgs/icons/56_02.png
rename to imgs/icons/56_2.png
diff --git a/imgs/icons/56_03.png b/imgs/icons/56_3.png
similarity index 100%
rename from imgs/icons/56_03.png
rename to imgs/icons/56_3.png
diff --git a/imgs/icons/56_04.png b/imgs/icons/56_4.png
similarity index 100%
rename from imgs/icons/56_04.png
rename to imgs/icons/56_4.png
diff --git a/imgs/icons/56_05.png b/imgs/icons/56_5.png
similarity index 100%
rename from imgs/icons/56_05.png
rename to imgs/icons/56_5.png
diff --git a/imgs/icons/56_06.png b/imgs/icons/56_6.png
similarity index 100%
rename from imgs/icons/56_06.png
rename to imgs/icons/56_6.png
diff --git a/imgs/icons/56_07.png b/imgs/icons/56_7.png
similarity index 100%
rename from imgs/icons/56_07.png
rename to imgs/icons/56_7.png
diff --git a/imgs/icons/56_08.png b/imgs/icons/56_8.png
similarity index 100%
rename from imgs/icons/56_08.png
rename to imgs/icons/56_8.png
diff --git a/imgs/icons/57_04.png b/imgs/icons/57_4.png
similarity index 100%
rename from imgs/icons/57_04.png
rename to imgs/icons/57_4.png
diff --git a/imgs/icons/05_01.png b/imgs/icons/5_1.png
similarity index 100%
rename from imgs/icons/05_01.png
rename to imgs/icons/5_1.png
diff --git a/imgs/icons/05_11.png b/imgs/icons/5_11.png
similarity index 100%
rename from imgs/icons/05_11.png
rename to imgs/icons/5_11.png
diff --git a/imgs/icons/05_12.png b/imgs/icons/5_12.png
similarity index 100%
rename from imgs/icons/05_12.png
rename to imgs/icons/5_12.png
diff --git a/imgs/icons/05_14.png b/imgs/icons/5_14.png
similarity index 100%
rename from imgs/icons/05_14.png
rename to imgs/icons/5_14.png
diff --git a/imgs/icons/05_02.png b/imgs/icons/5_2.png
similarity index 100%
rename from imgs/icons/05_02.png
rename to imgs/icons/5_2.png
diff --git a/imgs/icons/05_07.png b/imgs/icons/5_7.png
similarity index 100%
rename from imgs/icons/05_07.png
rename to imgs/icons/5_7.png
diff --git a/imgs/icons/62_01.png b/imgs/icons/62_1.png
similarity index 100%
rename from imgs/icons/62_01.png
rename to imgs/icons/62_1.png
diff --git a/imgs/icons/62_02.png b/imgs/icons/62_2.png
similarity index 100%
rename from imgs/icons/62_02.png
rename to imgs/icons/62_2.png
diff --git a/imgs/icons/62_03.png b/imgs/icons/62_3.png
similarity index 100%
rename from imgs/icons/62_03.png
rename to imgs/icons/62_3.png
diff --git a/imgs/icons/62_04.png b/imgs/icons/62_4.png
similarity index 100%
rename from imgs/icons/62_04.png
rename to imgs/icons/62_4.png
diff --git a/imgs/icons/62_05.png b/imgs/icons/62_5.png
similarity index 100%
rename from imgs/icons/62_05.png
rename to imgs/icons/62_5.png
diff --git a/imgs/icons/62_06.png b/imgs/icons/62_6.png
similarity index 100%
rename from imgs/icons/62_06.png
rename to imgs/icons/62_6.png
diff --git a/imgs/icons/62_07.png b/imgs/icons/62_7.png
similarity index 100%
rename from imgs/icons/62_07.png
rename to imgs/icons/62_7.png
diff --git a/imgs/icons/62_08.png b/imgs/icons/62_8.png
similarity index 100%
rename from imgs/icons/62_08.png
rename to imgs/icons/62_8.png
diff --git a/imgs/icons/62_09.png b/imgs/icons/62_9.png
similarity index 100%
rename from imgs/icons/62_09.png
rename to imgs/icons/62_9.png
diff --git a/imgs/icons/64_05.png b/imgs/icons/64_5.png
similarity index 100%
rename from imgs/icons/64_05.png
rename to imgs/icons/64_5.png
diff --git a/imgs/icons/64_06.png b/imgs/icons/64_6.png
similarity index 100%
rename from imgs/icons/64_06.png
rename to imgs/icons/64_6.png
diff --git a/imgs/icons/64_07.png b/imgs/icons/64_7.png
similarity index 100%
rename from imgs/icons/64_07.png
rename to imgs/icons/64_7.png
diff --git a/imgs/icons/64_08.png b/imgs/icons/64_8.png
similarity index 100%
rename from imgs/icons/64_08.png
rename to imgs/icons/64_8.png
diff --git a/imgs/icons/68_01.png b/imgs/icons/68_1.png
similarity index 100%
rename from imgs/icons/68_01.png
rename to imgs/icons/68_1.png
diff --git a/imgs/icons/68_02.png b/imgs/icons/68_2.png
similarity index 100%
rename from imgs/icons/68_02.png
rename to imgs/icons/68_2.png
diff --git a/imgs/icons/68_03.png b/imgs/icons/68_3.png
similarity index 100%
rename from imgs/icons/68_03.png
rename to imgs/icons/68_3.png
diff --git a/imgs/icons/68_04.png b/imgs/icons/68_4.png
similarity index 100%
rename from imgs/icons/68_04.png
rename to imgs/icons/68_4.png
diff --git a/imgs/icons/68_09.png b/imgs/icons/68_9.png
similarity index 100%
rename from imgs/icons/68_09.png
rename to imgs/icons/68_9.png
diff --git a/imgs/icons/70_09.png b/imgs/icons/70_09.png
deleted file mode 100644
index 090145b3e..000000000
Binary files a/imgs/icons/70_09.png and /dev/null differ
diff --git a/imgs/icons/70_03.png b/imgs/icons/70_3.png
similarity index 100%
rename from imgs/icons/70_03.png
rename to imgs/icons/70_3.png
diff --git a/imgs/icons/70_04.png b/imgs/icons/70_4.png
similarity index 100%
rename from imgs/icons/70_04.png
rename to imgs/icons/70_4.png
diff --git a/imgs/icons/70_05.png b/imgs/icons/70_5.png
similarity index 100%
rename from imgs/icons/70_05.png
rename to imgs/icons/70_5.png
diff --git a/imgs/icons/70_06.png b/imgs/icons/70_6.png
similarity index 100%
rename from imgs/icons/70_06.png
rename to imgs/icons/70_6.png
diff --git a/imgs/icons/70_07.png b/imgs/icons/70_7.png
similarity index 100%
rename from imgs/icons/70_07.png
rename to imgs/icons/70_7.png
diff --git a/imgs/icons/70_08.png b/imgs/icons/70_8.png
similarity index 100%
rename from imgs/icons/70_08.png
rename to imgs/icons/70_8.png
diff --git a/imgs/icons/74_01.png b/imgs/icons/74_1.png
similarity index 100%
rename from imgs/icons/74_01.png
rename to imgs/icons/74_1.png
diff --git a/imgs/icons/74_02.png b/imgs/icons/74_2.png
similarity index 100%
rename from imgs/icons/74_02.png
rename to imgs/icons/74_2.png
diff --git a/imgs/icons/74_03.png b/imgs/icons/74_3.png
similarity index 100%
rename from imgs/icons/74_03.png
rename to imgs/icons/74_3.png
diff --git a/imgs/icons/74_04.png b/imgs/icons/74_4.png
similarity index 100%
rename from imgs/icons/74_04.png
rename to imgs/icons/74_4.png
diff --git a/imgs/icons/74_05.png b/imgs/icons/74_5.png
similarity index 100%
rename from imgs/icons/74_05.png
rename to imgs/icons/74_5.png
diff --git a/imgs/icons/74_06.png b/imgs/icons/74_6.png
similarity index 100%
rename from imgs/icons/74_06.png
rename to imgs/icons/74_6.png
diff --git a/imgs/icons/74_07.png b/imgs/icons/74_7.png
similarity index 100%
rename from imgs/icons/74_07.png
rename to imgs/icons/74_7.png
diff --git a/imgs/icons/74_08.png b/imgs/icons/74_8.png
similarity index 100%
rename from imgs/icons/74_08.png
rename to imgs/icons/74_8.png
diff --git a/imgs/icons/74_09.png b/imgs/icons/74_9.png
similarity index 100%
rename from imgs/icons/74_09.png
rename to imgs/icons/74_9.png
diff --git a/imgs/icons/76_01.png b/imgs/icons/76_1.png
similarity index 100%
rename from imgs/icons/76_01.png
rename to imgs/icons/76_1.png
diff --git a/imgs/icons/76_04.png b/imgs/icons/76_4.png
similarity index 100%
rename from imgs/icons/76_04.png
rename to imgs/icons/76_4.png
diff --git a/imgs/icons/76_05.png b/imgs/icons/76_5.png
similarity index 100%
rename from imgs/icons/76_05.png
rename to imgs/icons/76_5.png
diff --git a/imgs/icons/76_06.png b/imgs/icons/76_6.png
similarity index 100%
rename from imgs/icons/76_06.png
rename to imgs/icons/76_6.png
diff --git a/imgs/icons/76_07.png b/imgs/icons/76_7.png
similarity index 100%
rename from imgs/icons/76_07.png
rename to imgs/icons/76_7.png
diff --git a/imgs/icons/76_08.png b/imgs/icons/76_8.png
similarity index 100%
rename from imgs/icons/76_08.png
rename to imgs/icons/76_8.png
diff --git a/imgs/icons/76_09.png b/imgs/icons/76_9.png
similarity index 100%
rename from imgs/icons/76_09.png
rename to imgs/icons/76_9.png
diff --git a/imgs/icons/79_09.png b/imgs/icons/79_9.png
similarity index 100%
rename from imgs/icons/79_09.png
rename to imgs/icons/79_9.png
diff --git a/imgs/icons/07_12.png b/imgs/icons/7_12.png
similarity index 100%
rename from imgs/icons/07_12.png
rename to imgs/icons/7_12.png
diff --git a/imgs/icons/07_15.png b/imgs/icons/7_15.png
similarity index 100%
rename from imgs/icons/07_15.png
rename to imgs/icons/7_15.png
diff --git a/imgs/icons/08_01.png b/imgs/icons/8_1.png
similarity index 100%
rename from imgs/icons/08_01.png
rename to imgs/icons/8_1.png
diff --git a/imgs/icons/08_10.png b/imgs/icons/8_10.png
similarity index 100%
rename from imgs/icons/08_10.png
rename to imgs/icons/8_10.png
diff --git a/imgs/icons/08_11.png b/imgs/icons/8_11.png
similarity index 100%
rename from imgs/icons/08_11.png
rename to imgs/icons/8_11.png
diff --git a/imgs/icons/08_12.png b/imgs/icons/8_12.png
similarity index 100%
rename from imgs/icons/08_12.png
rename to imgs/icons/8_12.png
diff --git a/imgs/icons/08_16.png b/imgs/icons/8_16.png
similarity index 100%
rename from imgs/icons/08_16.png
rename to imgs/icons/8_16.png
diff --git a/imgs/icons/08_02.png b/imgs/icons/8_2.png
similarity index 100%
rename from imgs/icons/08_02.png
rename to imgs/icons/8_2.png
diff --git a/imgs/icons/08_03.png b/imgs/icons/8_3.png
similarity index 100%
rename from imgs/icons/08_03.png
rename to imgs/icons/8_3.png
diff --git a/imgs/icons/08_04.png b/imgs/icons/8_4.png
similarity index 100%
rename from imgs/icons/08_04.png
rename to imgs/icons/8_4.png
diff --git a/imgs/icons/08_05.png b/imgs/icons/8_5.png
similarity index 100%
rename from imgs/icons/08_05.png
rename to imgs/icons/8_5.png
diff --git a/imgs/icons/08_06.png b/imgs/icons/8_6.png
similarity index 100%
rename from imgs/icons/08_06.png
rename to imgs/icons/8_6.png
diff --git a/imgs/icons/08_07.png b/imgs/icons/8_7.png
similarity index 100%
rename from imgs/icons/08_07.png
rename to imgs/icons/8_7.png
diff --git a/imgs/icons/08_08.png b/imgs/icons/8_8.png
similarity index 100%
rename from imgs/icons/08_08.png
rename to imgs/icons/8_8.png
diff --git a/imgs/icons/08_09.png b/imgs/icons/8_9.png
similarity index 100%
rename from imgs/icons/08_09.png
rename to imgs/icons/8_9.png
diff --git a/imgs/icons/95_05.png b/imgs/icons/95_5.png
similarity index 100%
rename from imgs/icons/95_05.png
rename to imgs/icons/95_5.png
diff --git a/imgs/icons/99_09.png b/imgs/icons/99_9.png
similarity index 100%
rename from imgs/icons/99_09.png
rename to imgs/icons/99_9.png
diff --git a/imgs/icons/09_16.png b/imgs/icons/9_16.png
similarity index 100%
rename from imgs/icons/09_16.png
rename to imgs/icons/9_16.png
diff --git a/imgs/icons/09_05.png b/imgs/icons/9_5.png
similarity index 100%
rename from imgs/icons/09_05.png
rename to imgs/icons/9_5.png
diff --git a/imgs/icons/multiuseanalyzer_64.png b/imgs/icons/multiuseanalyzer_64.png
new file mode 100644
index 000000000..23fb02c27
Binary files /dev/null and b/imgs/icons/multiuseanalyzer_64.png differ
diff --git a/scripts/icons_update.py b/scripts/icons_update.py
index f8cd1602c..a88ad4283 100644
--- a/scripts/icons_update.py
+++ b/scripts/icons_update.py
@@ -127,13 +127,14 @@ def unzero(fname):
         except (TypeError, ValueError):
             pass
         if size is None:
-            fname = '{}_{}{}'.format(prefix, suffix, tail)
+            fname = '{}_{}'.format(prefix, suffix)
         else:
-            fname = '{}_{}_{}{}'.format(prefix, size, suffix, tail)
+            fname = '{}_{}_{}'.format(prefix, size, suffix)
         return fname
     else:
         return fname
 
+# Get a list of needed icons based on the items / attributes / etc from the database
 for query in (query_items, query_groups, query_cats, query_market, query_attrib):
     for row in cursor.execute(query):
         fname = row[0]
@@ -142,6 +143,7 @@ for query in (query_items, query_groups, query_cats, query_market, query_attrib)
         fname = strip_path(fname)
         needed.add(fname)
 
+# Get a list of all the icons we currently have
 for fname in os.listdir(icons_dir):
     if not os.path.isfile(os.path.join(icons_dir, fname)):
         continue
@@ -151,6 +153,7 @@ for fname in os.listdir(icons_dir):
     print fname,"exists"
     existing.add(fname)
 
+# Get a list of all the icons currently available
 for dir in dirs:
     for fname in os.listdir(dir):
         if not os.path.isfile(os.path.join(dir, fname)):
@@ -163,8 +166,6 @@ for dir in dirs:
         # Often items referred to with 01_01 format,
         fnames = export.setdefault(stripped.lower(), set())
         fnames.add(fname)
-        fnames = export.setdefault(sizeless.lower(), set())
-        fnames.add(fname)
 
 def crop_image(img):
     w, h = img.size