diff --git a/eve.db b/eve.db
index 16a4c743f..0155da952 100644
Binary files a/eve.db and b/eve.db differ
diff --git a/imgs/icons/05_11.png b/imgs/icons/05_11.png
new file mode 100644
index 000000000..8cdd226a0
Binary files /dev/null and b/imgs/icons/05_11.png differ
diff --git a/imgs/icons/107_64_4.png b/imgs/icons/107_4.png
similarity index 100%
rename from imgs/icons/107_64_4.png
rename to imgs/icons/107_4.png
diff --git a/imgs/icons/108_64_22.png b/imgs/icons/108_22.png
similarity index 100%
rename from imgs/icons/108_64_22.png
rename to imgs/icons/108_22.png
diff --git a/imgs/icons/109_64_1.png b/imgs/icons/109_1.png
similarity index 100%
rename from imgs/icons/109_64_1.png
rename to imgs/icons/109_1.png
diff --git a/imgs/icons/109_64_2.png b/imgs/icons/109_2.png
similarity index 100%
rename from imgs/icons/109_64_2.png
rename to imgs/icons/109_2.png
diff --git a/imgs/icons/113_64_1.png b/imgs/icons/113_1.png
similarity index 100%
rename from imgs/icons/113_64_1.png
rename to imgs/icons/113_1.png
diff --git a/imgs/icons/113_64_2.png b/imgs/icons/113_2.png
similarity index 100%
rename from imgs/icons/113_64_2.png
rename to imgs/icons/113_2.png
diff --git a/imgs/icons/113_64_3.png b/imgs/icons/113_3.png
similarity index 100%
rename from imgs/icons/113_64_3.png
rename to imgs/icons/113_3.png
diff --git a/imgs/icons/118_64_7.png b/imgs/icons/118_7.png
similarity index 100%
rename from imgs/icons/118_64_7.png
rename to imgs/icons/118_7.png
diff --git a/imgs/icons/11_05.png b/imgs/icons/11_05.png
new file mode 100644
index 000000000..8b01bdf3a
Binary files /dev/null and b/imgs/icons/11_05.png differ
diff --git a/imgs/icons/26_12.png b/imgs/icons/26_12.png
new file mode 100644
index 000000000..001b7edd8
Binary files /dev/null and b/imgs/icons/26_12.png differ
diff --git a/imgs/icons/26_13.png b/imgs/icons/26_13.png
new file mode 100644
index 000000000..06ee6dbd9
Binary files /dev/null and b/imgs/icons/26_13.png differ
diff --git a/imgs/icons/26_15.png b/imgs/icons/26_15.png
new file mode 100644
index 000000000..87d17bdc1
Binary files /dev/null and b/imgs/icons/26_15.png differ
diff --git a/imgs/icons/26_16.png b/imgs/icons/26_16.png
new file mode 100644
index 000000000..f8598ff7c
Binary files /dev/null and b/imgs/icons/26_16.png differ
diff --git a/imgs/icons/27_05.png b/imgs/icons/27_05.png
new file mode 100644
index 000000000..68f1ca2d4
Binary files /dev/null and b/imgs/icons/27_05.png differ
diff --git a/imgs/icons/53_64_16.png b/imgs/icons/53_64_16.png
deleted file mode 100644
index 0d8d74510..000000000
Binary files a/imgs/icons/53_64_16.png and /dev/null differ
diff --git a/imgs/icons/5_64_17.png b/imgs/icons/5_17.png
similarity index 100%
rename from imgs/icons/5_64_17.png
rename to imgs/icons/5_17.png
diff --git a/imgs/icons/5_64_18.png b/imgs/icons/5_18.png
similarity index 100%
rename from imgs/icons/5_64_18.png
rename to imgs/icons/5_18.png
diff --git a/imgs/icons/5_64_19.png b/imgs/icons/5_19.png
similarity index 100%
rename from imgs/icons/5_64_19.png
rename to imgs/icons/5_19.png
diff --git a/imgs/icons/5_64_20.png b/imgs/icons/5_20.png
similarity index 100%
rename from imgs/icons/5_64_20.png
rename to imgs/icons/5_20.png
diff --git a/imgs/icons/5_64_21.png b/imgs/icons/5_21.png
similarity index 100%
rename from imgs/icons/5_64_21.png
rename to imgs/icons/5_21.png
diff --git a/imgs/icons/62_09.png b/imgs/icons/62_09.png
new file mode 100644
index 000000000..6188a529e
Binary files /dev/null and b/imgs/icons/62_09.png differ
diff --git a/imgs/icons/62_10.png b/imgs/icons/62_10.png
new file mode 100644
index 000000000..0e8db2ea7
Binary files /dev/null and b/imgs/icons/62_10.png differ
diff --git a/imgs/icons/62_11.png b/imgs/icons/62_11.png
new file mode 100644
index 000000000..6ca3f4659
Binary files /dev/null and b/imgs/icons/62_11.png differ
diff --git a/imgs/icons/62_12.png b/imgs/icons/62_12.png
new file mode 100644
index 000000000..59622e1fc
Binary files /dev/null and b/imgs/icons/62_12.png differ
diff --git a/imgs/icons/62_13.png b/imgs/icons/62_13.png
new file mode 100644
index 000000000..86b2ebb46
Binary files /dev/null and b/imgs/icons/62_13.png differ
diff --git a/imgs/icons/62_14.png b/imgs/icons/62_14.png
new file mode 100644
index 000000000..5e28466bf
Binary files /dev/null and b/imgs/icons/62_14.png differ
diff --git a/imgs/icons/62_15.png b/imgs/icons/62_15.png
new file mode 100644
index 000000000..1259aa398
Binary files /dev/null and b/imgs/icons/62_15.png differ
diff --git a/imgs/icons/62_16.png b/imgs/icons/62_16.png
new file mode 100644
index 000000000..f18aafa86
Binary files /dev/null and b/imgs/icons/62_16.png differ
diff --git a/imgs/icons/70_13.png b/imgs/icons/70_13.png
new file mode 100644
index 000000000..d0fd7f436
Binary files /dev/null and b/imgs/icons/70_13.png differ
diff --git a/imgs/icons/70_14.png b/imgs/icons/70_14.png
new file mode 100644
index 000000000..95e7ad091
Binary files /dev/null and b/imgs/icons/70_14.png differ
diff --git a/imgs/icons/70_15.png b/imgs/icons/70_15.png
new file mode 100644
index 000000000..f0f44354e
Binary files /dev/null and b/imgs/icons/70_15.png differ
diff --git a/imgs/icons/70_16.png b/imgs/icons/70_16.png
new file mode 100644
index 000000000..1ef04fee6
Binary files /dev/null and b/imgs/icons/70_16.png differ
diff --git a/imgs/icons/94_64_9.png b/imgs/icons/94_9.png
similarity index 100%
rename from imgs/icons/94_64_9.png
rename to imgs/icons/94_9.png
diff --git a/imgs/icons/infantry_gear.png b/imgs/icons/infantry_gear.png
new file mode 100644
index 000000000..d58209754
Binary files /dev/null and b/imgs/icons/infantry_gear.png differ
diff --git a/imgs/icons/remote_armor_repair.png b/imgs/icons/remote_armor_repair.png
deleted file mode 100644
index 16d4337ee..000000000
Binary files a/imgs/icons/remote_armor_repair.png and /dev/null differ
diff --git a/imgs/icons/remote_hull_repairer.png b/imgs/icons/remote_hull_repairer.png
deleted file mode 100644
index 5899ec386..000000000
Binary files a/imgs/icons/remote_hull_repairer.png and /dev/null differ
diff --git a/scripts/icons_update.py b/scripts/icons_update.py
index 51c1975c2..6280d0acb 100644
--- a/scripts/icons_update.py
+++ b/scripts/icons_update.py
@@ -30,14 +30,16 @@ cursor = db.cursor()
 ICON_SIZE = (16, 16)
 
 ITEM_CATEGORIES = (
+    2,  # Celestial
     6,  # Ship
     7,  # Module
     8,  # Charge
     16,  # Skill
     18,  # Drone
     20,  # Implant
-    32  # Subsystem
+    32   # Subsystem
 )
+
 MARKET_ROOTS = {
     9,  # Modules
     1111,  # Rigs
diff --git a/scripts/jsonToSql.py b/scripts/jsonToSql.py
index 166877a0e..b2820ee7e 100755
--- a/scripts/jsonToSql.py
+++ b/scripts/jsonToSql.py
@@ -20,6 +20,7 @@
 
 import os
 import sys
+import re
 
 # Add eos root path to sys.path so we can import ourselves
 path = os.path.dirname(unicode(__file__, sys.getfilesystemencoding()))
@@ -194,6 +195,12 @@ def main(db, json_path):
                 # fix for issue 80
                 if jsonName is "icons" and "res:/ui/texture/icons/" in str(row["iconFile"]).lower():
                     row["iconFile"] = row["iconFile"].lower().replace("res:/ui/texture/icons/", "").replace(".png", "")
+                    # with res:/ui... references, it points to the actual icon file (including it's size variation of #_size_#)
+                    # strip this info out and get the identifying info
+                    split = row['iconFile'].split('_')
+                    if len(split) == 3:
+                        row['iconFile'] = "{}_{}".format(split[0], split[2])
+
                 for k, v in row.iteritems():
                     setattr(instance, fieldMap.get(k, k), v)