diff --git a/data/enderio/items/advanced_cable_cluster/icon.png b/data/enderio/items/advanced_cable_cluster/icon.png
new file mode 100644
index 00000000..3630e010
Binary files /dev/null and b/data/enderio/items/advanced_cable_cluster/icon.png differ
diff --git a/data/enderio/items/advanced_inventory_relay/icon.png b/data/enderio/items/advanced_inventory_relay/icon.png
new file mode 100644
index 00000000..5df4137d
Binary files /dev/null and b/data/enderio/items/advanced_inventory_relay/icon.png differ
diff --git a/data/enderio/items/advanced_item_filter/icon.png b/data/enderio/items/advanced_item_filter/icon.png
index bcacc526..cf8fa0d8 100644
Binary files a/data/enderio/items/advanced_item_filter/icon.png and b/data/enderio/items/advanced_item_filter/icon.png differ
diff --git a/data/enderio/items/advanced_photovoltaic_cell/icon.png b/data/enderio/items/advanced_photovoltaic_cell/icon.png
index 629546f2..6d64c164 100644
Binary files a/data/enderio/items/advanced_photovoltaic_cell/icon.png and b/data/enderio/items/advanced_photovoltaic_cell/icon.png differ
diff --git a/data/enderio/items/alloy_smelter/icon.png b/data/enderio/items/alloy_smelter/icon.png
index 1d149c0c..a4634434 100644
Binary files a/data/enderio/items/alloy_smelter/icon.png and b/data/enderio/items/alloy_smelter/icon.png differ
diff --git a/data/enderio/items/attractor_obelisk/icon.png b/data/enderio/items/attractor_obelisk/icon.png
index 990b6d58..eae578a2 100644
Binary files a/data/enderio/items/attractor_obelisk/icon.png and b/data/enderio/items/attractor_obelisk/icon.png differ
diff --git a/data/enderio/items/aversion_obelisk/icon.png b/data/enderio/items/aversion_obelisk/icon.png
index a5050703..6f275039 100644
Binary files a/data/enderio/items/aversion_obelisk/icon.png and b/data/enderio/items/aversion_obelisk/icon.png differ
diff --git a/data/enderio/items/basic_capacitor/icon.png b/data/enderio/items/basic_capacitor/icon.png
index 9888a1e2..004e6681 100644
Binary files a/data/enderio/items/basic_capacitor/icon.png and b/data/enderio/items/basic_capacitor/icon.png differ
diff --git a/data/enderio/items/basic_capacitor_bank/icon.png b/data/enderio/items/basic_capacitor_bank/icon.png
index d71b63ff..680123fd 100644
Binary files a/data/enderio/items/basic_capacitor_bank/icon.png and b/data/enderio/items/basic_capacitor_bank/icon.png differ
diff --git a/data/enderio/items/basic_capacitor_bank_2/icon.png b/data/enderio/items/basic_capacitor_bank_2/icon.png
index acef03a7..f6d79052 100644
Binary files a/data/enderio/items/basic_capacitor_bank_2/icon.png and b/data/enderio/items/basic_capacitor_bank_2/icon.png differ
diff --git a/data/enderio/items/basic_gear/icon.png b/data/enderio/items/basic_gear/icon.png
index 41da3954..e492486c 100644
Binary files a/data/enderio/items/basic_gear/icon.png and b/data/enderio/items/basic_gear/icon.png differ
diff --git a/data/enderio/items/basic_item_filter/icon.png b/data/enderio/items/basic_item_filter/icon.png
index 07ede0e0..611a3be8 100644
Binary files a/data/enderio/items/basic_item_filter/icon.png and b/data/enderio/items/basic_item_filter/icon.png differ
diff --git a/data/enderio/items/binder_composite/icon.png b/data/enderio/items/binder_composite/icon.png
index 677cd2ed..5a5d00af 100644
Binary files a/data/enderio/items/binder_composite/icon.png and b/data/enderio/items/binder_composite/icon.png differ
diff --git a/data/enderio/items/block_detector/icon.png b/data/enderio/items/block_detector/icon.png
new file mode 100644
index 00000000..df38db4d
Binary files /dev/null and b/data/enderio/items/block_detector/icon.png differ
diff --git a/data/enderio/items/block_gate/icon.png b/data/enderio/items/block_gate/icon.png
new file mode 100644
index 00000000..88e3289c
Binary files /dev/null and b/data/enderio/items/block_gate/icon.png differ
diff --git a/data/enderio/items/broken_spawner/icon.png b/data/enderio/items/broken_spawner/icon.png
index 44396f45..7fc8f358 100644
Binary files a/data/enderio/items/broken_spawner/icon.png and b/data/enderio/items/broken_spawner/icon.png differ
diff --git a/data/enderio/items/broken_spawner_2/icon.png b/data/enderio/items/broken_spawner_2/icon.png
index 44396f45..7fc8f358 100644
Binary files a/data/enderio/items/broken_spawner_2/icon.png and b/data/enderio/items/broken_spawner_2/icon.png differ
diff --git a/data/enderio/items/broken_spawner_3/icon.png b/data/enderio/items/broken_spawner_3/icon.png
index 44396f45..7fc8f358 100644
Binary files a/data/enderio/items/broken_spawner_3/icon.png and b/data/enderio/items/broken_spawner_3/icon.png differ
diff --git a/data/enderio/items/broken_spawner_4/icon.png b/data/enderio/items/broken_spawner_4/icon.png
index 44396f45..7fc8f358 100644
Binary files a/data/enderio/items/broken_spawner_4/icon.png and b/data/enderio/items/broken_spawner_4/icon.png differ
diff --git a/data/enderio/items/broken_spawner_5/icon.png b/data/enderio/items/broken_spawner_5/icon.png
index 44396f45..7fc8f358 100644
Binary files a/data/enderio/items/broken_spawner_5/icon.png and b/data/enderio/items/broken_spawner_5/icon.png differ
diff --git a/data/enderio/items/broken_spawner_6/icon.png b/data/enderio/items/broken_spawner_6/icon.png
index 44396f45..7fc8f358 100644
Binary files a/data/enderio/items/broken_spawner_6/icon.png and b/data/enderio/items/broken_spawner_6/icon.png differ
diff --git a/data/enderio/items/broken_spawner_7/icon.png b/data/enderio/items/broken_spawner_7/icon.png
index 44396f45..7fc8f358 100644
Binary files a/data/enderio/items/broken_spawner_7/icon.png and b/data/enderio/items/broken_spawner_7/icon.png differ
diff --git a/data/enderio/items/cable_camouflage/icon.png b/data/enderio/items/cable_camouflage/icon.png
new file mode 100644
index 00000000..29d4a71a
Binary files /dev/null and b/data/enderio/items/cable_camouflage/icon.png differ
diff --git a/data/enderio/items/cable_cluster/icon.png b/data/enderio/items/cable_cluster/icon.png
new file mode 100644
index 00000000..d954ca87
Binary files /dev/null and b/data/enderio/items/cable_cluster/icon.png differ
diff --git a/data/enderio/items/capacitor_bank/icon.png b/data/enderio/items/capacitor_bank/icon.png
index 2706dd44..000004ef 100644
Binary files a/data/enderio/items/capacitor_bank/icon.png and b/data/enderio/items/capacitor_bank/icon.png differ
diff --git a/data/enderio/items/capacitor_bank_2/icon.png b/data/enderio/items/capacitor_bank_2/icon.png
index ad4a0341..68dad27d 100644
Binary files a/data/enderio/items/capacitor_bank_2/icon.png and b/data/enderio/items/capacitor_bank_2/icon.png differ
diff --git a/data/enderio/items/capacitor_bank_deprecated/icon.png b/data/enderio/items/capacitor_bank_deprecated/icon.png
deleted file mode 100644
index a9f8d69d..00000000
Binary files a/data/enderio/items/capacitor_bank_deprecated/icon.png and /dev/null differ
diff --git a/data/enderio/items/capacitor_bank_deprecated_2/icon.png b/data/enderio/items/capacitor_bank_deprecated_2/icon.png
deleted file mode 100644
index 0998edf0..00000000
Binary files a/data/enderio/items/capacitor_bank_deprecated_2/icon.png and /dev/null differ
diff --git a/data/enderio/items/chargeable_item_filter/icon.png b/data/enderio/items/chargeable_item_filter/icon.png
index e51fa717..bcfc6bfc 100644
Binary files a/data/enderio/items/chargeable_item_filter/icon.png and b/data/enderio/items/chargeable_item_filter/icon.png differ
diff --git a/data/enderio/items/cloud_seed_bucket_name/icon.png b/data/enderio/items/cloud_seed_bucket_name/icon.png
new file mode 100644
index 00000000..08e9f6fe
Binary files /dev/null and b/data/enderio/items/cloud_seed_bucket_name/icon.png differ
diff --git a/data/enderio/items/cloud_seed_name/icon.png b/data/enderio/items/cloud_seed_name/icon.png
new file mode 100644
index 00000000..5589fb88
Binary files /dev/null and b/data/enderio/items/cloud_seed_name/icon.png differ
diff --git a/data/enderio/items/coal_powder/icon.png b/data/enderio/items/coal_powder/icon.png
index bbb69e76..6c4412ba 100644
Binary files a/data/enderio/items/coal_powder/icon.png and b/data/enderio/items/coal_powder/icon.png differ
diff --git a/data/enderio/items/combustion_generator/icon.png b/data/enderio/items/combustion_generator/icon.png
index a4fb488a..3604f417 100644
Binary files a/data/enderio/items/combustion_generator/icon.png and b/data/enderio/items/combustion_generator/icon.png differ
diff --git a/data/enderio/items/concentrated_cloud_seed_bucket_name/icon.png b/data/enderio/items/concentrated_cloud_seed_bucket_name/icon.png
new file mode 100644
index 00000000..40ffcc41
Binary files /dev/null and b/data/enderio/items/concentrated_cloud_seed_bucket_name/icon.png differ
diff --git a/data/enderio/items/concentrated_cloud_seed_name/icon.png b/data/enderio/items/concentrated_cloud_seed_name/icon.png
new file mode 100644
index 00000000..4d5e2a1b
Binary files /dev/null and b/data/enderio/items/concentrated_cloud_seed_name/icon.png differ
diff --git a/data/enderio/items/conductive_iron/icon.png b/data/enderio/items/conductive_iron/icon.png
index b86ad676..88c2ebb9 100644
Binary files a/data/enderio/items/conductive_iron/icon.png and b/data/enderio/items/conductive_iron/icon.png differ
diff --git a/data/enderio/items/conductive_iron_block/icon.png b/data/enderio/items/conductive_iron_block/icon.png
index 4e3cabe1..6400f96e 100644
Binary files a/data/enderio/items/conductive_iron_block/icon.png and b/data/enderio/items/conductive_iron_block/icon.png differ
diff --git a/data/enderio/items/conduit_facade/icon.png b/data/enderio/items/conduit_facade/icon.png
index 483ea2c3..f204ad6f 100644
Binary files a/data/enderio/items/conduit_facade/icon.png and b/data/enderio/items/conduit_facade/icon.png differ
diff --git a/data/enderio/items/conduit_probe/icon.png b/data/enderio/items/conduit_probe/icon.png
index a039e1b6..c98f1c4a 100644
Binary files a/data/enderio/items/conduit_probe/icon.png and b/data/enderio/items/conduit_probe/icon.png differ
diff --git a/data/enderio/items/conduit_switch/icon.png b/data/enderio/items/conduit_switch/icon.png
index 108b61ef..10ed83f8 100644
Binary files a/data/enderio/items/conduit_switch/icon.png and b/data/enderio/items/conduit_switch/icon.png differ
diff --git a/data/enderio/items/coordinate_selector/icon.png b/data/enderio/items/coordinate_selector/icon.png
new file mode 100644
index 00000000..6ff18d50
Binary files /dev/null and b/data/enderio/items/coordinate_selector/icon.png differ
diff --git a/data/enderio/items/copper_powder/icon.png b/data/enderio/items/copper_powder/icon.png
new file mode 100644
index 00000000..cd1fcb8e
Binary files /dev/null and b/data/enderio/items/copper_powder/icon.png differ
diff --git a/data/enderio/items/crafter/icon.png b/data/enderio/items/crafter/icon.png
index d007e439..567748a9 100644
Binary files a/data/enderio/items/crafter/icon.png and b/data/enderio/items/crafter/icon.png differ
diff --git a/data/enderio/items/crafter/item.cg b/data/enderio/items/crafter/item.cg
deleted file mode 100644
index 47e46dd8..00000000
--- a/data/enderio/items/crafter/item.cg
+++ /dev/null
@@ -1,9 +0,0 @@
-schema: 1
-
-description: <<-END
-The Crafter is a powered auto-crafter. It consumes power every operation and can be upgraded to increase speed and energy storage with capacitors. 
-
-
-END
-
-
diff --git a/data/enderio/items/creative_buffer/icon.png b/data/enderio/items/creative_buffer/icon.png
index f2c5f387..2ba87ca7 100644
Binary files a/data/enderio/items/creative_buffer/icon.png and b/data/enderio/items/creative_buffer/icon.png differ
diff --git a/data/enderio/items/creative_capacitor_bank/icon.png b/data/enderio/items/creative_capacitor_bank/icon.png
index 288a2e94..1fe07cf5 100644
Binary files a/data/enderio/items/creative_capacitor_bank/icon.png and b/data/enderio/items/creative_capacitor_bank/icon.png differ
diff --git a/data/enderio/items/creative_capacitor_bank_deprecated/icon.png b/data/enderio/items/creative_capacitor_bank_deprecated/icon.png
deleted file mode 100644
index 13595374..00000000
Binary files a/data/enderio/items/creative_capacitor_bank_deprecated/icon.png and /dev/null differ
diff --git a/data/enderio/items/creative_supplier/icon.png b/data/enderio/items/creative_supplier/icon.png
new file mode 100644
index 00000000..2d5165e3
Binary files /dev/null and b/data/enderio/items/creative_supplier/icon.png differ
diff --git a/data/enderio/items/dark_axe/icon.png b/data/enderio/items/dark_axe/icon.png
index 497e6379..fb3eb167 100644
Binary files a/data/enderio/items/dark_axe/icon.png and b/data/enderio/items/dark_axe/icon.png differ
diff --git a/data/enderio/items/dark_axe_2/icon.png b/data/enderio/items/dark_axe_2/icon.png
index 6cc699fe..098df9e7 100644
Binary files a/data/enderio/items/dark_axe_2/icon.png and b/data/enderio/items/dark_axe_2/icon.png differ
diff --git a/data/enderio/items/dark_boots/icon.png b/data/enderio/items/dark_boots/icon.png
index e67a92a1..3f30e61c 100644
Binary files a/data/enderio/items/dark_boots/icon.png and b/data/enderio/items/dark_boots/icon.png differ
diff --git a/data/enderio/items/dark_boots_2/icon.png b/data/enderio/items/dark_boots_2/icon.png
index dce869d5..f9d967be 100644
Binary files a/data/enderio/items/dark_boots_2/icon.png and b/data/enderio/items/dark_boots_2/icon.png differ
diff --git a/data/enderio/items/dark_clear_glass/icon.png b/data/enderio/items/dark_clear_glass/icon.png
new file mode 100644
index 00000000..875a0e80
Binary files /dev/null and b/data/enderio/items/dark_clear_glass/icon.png differ
diff --git a/data/enderio/items/dark_fused_quartz/icon.png b/data/enderio/items/dark_fused_quartz/icon.png
new file mode 100644
index 00000000..63c266eb
Binary files /dev/null and b/data/enderio/items/dark_fused_quartz/icon.png differ
diff --git a/data/enderio/items/dark_helm/icon.png b/data/enderio/items/dark_helm/icon.png
index 6b7694ad..3d2d5878 100644
Binary files a/data/enderio/items/dark_helm/icon.png and b/data/enderio/items/dark_helm/icon.png differ
diff --git a/data/enderio/items/dark_helm_2/icon.png b/data/enderio/items/dark_helm_2/icon.png
index 69740b52..18c9434f 100644
Binary files a/data/enderio/items/dark_helm_2/icon.png and b/data/enderio/items/dark_helm_2/icon.png differ
diff --git a/data/enderio/items/dark_leggings/icon.png b/data/enderio/items/dark_leggings/icon.png
index 8be62f36..c4ef5b4c 100644
Binary files a/data/enderio/items/dark_leggings/icon.png and b/data/enderio/items/dark_leggings/icon.png differ
diff --git a/data/enderio/items/dark_leggings_2/icon.png b/data/enderio/items/dark_leggings_2/icon.png
index c55fc70a..814b3a47 100644
Binary files a/data/enderio/items/dark_leggings_2/icon.png and b/data/enderio/items/dark_leggings_2/icon.png differ
diff --git a/data/enderio/items/dark_pick/icon.png b/data/enderio/items/dark_pick/icon.png
index 148ea782..d2099012 100644
Binary files a/data/enderio/items/dark_pick/icon.png and b/data/enderio/items/dark_pick/icon.png differ
diff --git a/data/enderio/items/dark_pick_2/icon.png b/data/enderio/items/dark_pick_2/icon.png
index 88a49d08..e1332e9a 100644
Binary files a/data/enderio/items/dark_pick_2/icon.png and b/data/enderio/items/dark_pick_2/icon.png differ
diff --git a/data/enderio/items/dark_plate/icon.png b/data/enderio/items/dark_plate/icon.png
index 53955b82..56073917 100644
Binary files a/data/enderio/items/dark_plate/icon.png and b/data/enderio/items/dark_plate/icon.png differ
diff --git a/data/enderio/items/dark_plate_2/icon.png b/data/enderio/items/dark_plate_2/icon.png
index cfa42353..9196dd55 100644
Binary files a/data/enderio/items/dark_plate_2/icon.png and b/data/enderio/items/dark_plate_2/icon.png differ
diff --git a/data/enderio/items/dark_pressure_plate/icon.png b/data/enderio/items/dark_pressure_plate/icon.png
index 9b2512fa..1029c326 100644
Binary files a/data/enderio/items/dark_pressure_plate/icon.png and b/data/enderio/items/dark_pressure_plate/icon.png differ
diff --git a/data/enderio/items/dark_pressure_plate_2/icon.png b/data/enderio/items/dark_pressure_plate_2/icon.png
index 9b2512fa..1029c326 100644
Binary files a/data/enderio/items/dark_pressure_plate_2/icon.png and b/data/enderio/items/dark_pressure_plate_2/icon.png differ
diff --git a/data/enderio/items/dark_shears/icon.png b/data/enderio/items/dark_shears/icon.png
new file mode 100644
index 00000000..1418d252
Binary files /dev/null and b/data/enderio/items/dark_shears/icon.png differ
diff --git a/data/enderio/items/dark_shears_2/icon.png b/data/enderio/items/dark_shears_2/icon.png
new file mode 100644
index 00000000..320a4514
Binary files /dev/null and b/data/enderio/items/dark_shears_2/icon.png differ
diff --git a/data/enderio/items/dark_steel/icon.png b/data/enderio/items/dark_steel/icon.png
index 7d5bd981..d028b8c6 100644
Binary files a/data/enderio/items/dark_steel/icon.png and b/data/enderio/items/dark_steel/icon.png differ
diff --git a/data/enderio/items/dark_steel_anvil/icon.png b/data/enderio/items/dark_steel_anvil/icon.png
index 8f0ede01..1baaef89 100644
Binary files a/data/enderio/items/dark_steel_anvil/icon.png and b/data/enderio/items/dark_steel_anvil/icon.png differ
diff --git a/data/enderio/items/dark_steel_ball/icon.png b/data/enderio/items/dark_steel_ball/icon.png
index cf1f1a15..41b2f67d 100644
Binary files a/data/enderio/items/dark_steel_ball/icon.png and b/data/enderio/items/dark_steel_ball/icon.png differ
diff --git a/data/enderio/items/dark_steel_block/icon.png b/data/enderio/items/dark_steel_block/icon.png
index d9cc083f..7ed3fcda 100644
Binary files a/data/enderio/items/dark_steel_block/icon.png and b/data/enderio/items/dark_steel_block/icon.png differ
diff --git a/data/enderio/items/dark_steel_ladder/icon.png b/data/enderio/items/dark_steel_ladder/icon.png
index a81ca568..4b8f14f9 100644
Binary files a/data/enderio/items/dark_steel_ladder/icon.png and b/data/enderio/items/dark_steel_ladder/icon.png differ
diff --git a/data/enderio/items/dense_me_conduit/icon.png b/data/enderio/items/dense_me_conduit/icon.png
new file mode 100644
index 00000000..eca2d8cb
Binary files /dev/null and b/data/enderio/items/dense_me_conduit/icon.png differ
diff --git a/data/enderio/items/dimensional_transceiver/icon.png b/data/enderio/items/dimensional_transceiver/icon.png
index cdc22ca7..e83923d8 100644
Binary files a/data/enderio/items/dimensional_transceiver/icon.png and b/data/enderio/items/dimensional_transceiver/icon.png differ
diff --git a/data/enderio/items/dimensional_transceiver/item.cg b/data/enderio/items/dimensional_transceiver/item.cg
deleted file mode 100644
index d6cc1d62..00000000
--- a/data/enderio/items/dimensional_transceiver/item.cg
+++ /dev/null
@@ -1,5 +0,0 @@
-schema: 1
-
-description: A dimensional transceiver can transport items, fluids, power across any distance between dimensions.
-
-
diff --git a/data/enderio/items/double_layer_capacitor/icon.png b/data/enderio/items/double_layer_capacitor/icon.png
index 66be3288..1fe7159d 100644
Binary files a/data/enderio/items/double_layer_capacitor/icon.png and b/data/enderio/items/double_layer_capacitor/icon.png differ
diff --git a/data/enderio/items/double_sided_cable_camouflage/icon.png b/data/enderio/items/double_sided_cable_camouflage/icon.png
new file mode 100644
index 00000000..0e7b869f
Binary files /dev/null and b/data/enderio/items/double_sided_cable_camouflage/icon.png differ
diff --git a/data/enderio/items/electrical_steel/icon.png b/data/enderio/items/electrical_steel/icon.png
index bc24cf2f..73622156 100644
Binary files a/data/enderio/items/electrical_steel/icon.png and b/data/enderio/items/electrical_steel/icon.png differ
diff --git a/data/enderio/items/electrical_steel_block/icon.png b/data/enderio/items/electrical_steel_block/icon.png
index 2539e265..5c4d543b 100644
Binary files a/data/enderio/items/electrical_steel_block/icon.png and b/data/enderio/items/electrical_steel_block/icon.png differ
diff --git a/data/enderio/items/electromagnet/icon.png b/data/enderio/items/electromagnet/icon.png
index 8125a3de..d78cded8 100644
Binary files a/data/enderio/items/electromagnet/icon.png and b/data/enderio/items/electromagnet/icon.png differ
diff --git a/data/enderio/items/electromagnet_2/icon.png b/data/enderio/items/electromagnet_2/icon.png
index 87f892ae..ca395842 100644
Binary files a/data/enderio/items/electromagnet_2/icon.png and b/data/enderio/items/electromagnet_2/icon.png differ
diff --git a/data/enderio/items/enchanter/icon.png b/data/enderio/items/enchanter/icon.png
index 783543e8..ba123f81 100644
Binary files a/data/enderio/items/enchanter/icon.png and b/data/enderio/items/enchanter/icon.png differ
diff --git a/data/enderio/items/ender_crystal/icon.png b/data/enderio/items/ender_crystal/icon.png
index ab25f92f..9d956c74 100644
Binary files a/data/enderio/items/ender_crystal/icon.png and b/data/enderio/items/ender_crystal/icon.png differ
diff --git a/data/enderio/items/ender_energy_conduit/icon.png b/data/enderio/items/ender_energy_conduit/icon.png
index 99aeaf19..288ee3f9 100644
Binary files a/data/enderio/items/ender_energy_conduit/icon.png and b/data/enderio/items/ender_energy_conduit/icon.png differ
diff --git a/data/enderio/items/ender_energy_conduit/item.cg b/data/enderio/items/ender_energy_conduit/item.cg
deleted file mode 100644
index b670fd11..00000000
--- a/data/enderio/items/ender_energy_conduit/item.cg
+++ /dev/null
@@ -1,5 +0,0 @@
-schema: 1
-
-description: 
-
-
diff --git a/data/enderio/items/ender_fluid_conduit/icon.png b/data/enderio/items/ender_fluid_conduit/icon.png
index 5cc389dd..da5f6ae2 100644
Binary files a/data/enderio/items/ender_fluid_conduit/icon.png and b/data/enderio/items/ender_fluid_conduit/icon.png differ
diff --git a/data/enderio/items/ender_io/icon.png b/data/enderio/items/ender_io/icon.png
index a367710d..c8c89e3c 100644
Binary files a/data/enderio/items/ender_io/icon.png and b/data/enderio/items/ender_io/icon.png differ
diff --git a/data/enderio/items/enderios/icon.png b/data/enderio/items/enderios/icon.png
new file mode 100644
index 00000000..b16b193c
Binary files /dev/null and b/data/enderio/items/enderios/icon.png differ
diff --git a/data/enderio/items/enderium_base/icon.png b/data/enderio/items/enderium_base/icon.png
new file mode 100644
index 00000000..08263d30
Binary files /dev/null and b/data/enderio/items/enderium_base/icon.png differ
diff --git a/data/enderio/items/enderman_head/icon.png b/data/enderio/items/enderman_head/icon.png
index 22deefdb..108fbca0 100644
Binary files a/data/enderio/items/enderman_head/icon.png and b/data/enderio/items/enderman_head/icon.png differ
diff --git a/data/enderio/items/energetic_alloy/icon.png b/data/enderio/items/energetic_alloy/icon.png
index 0f6db24d..78fdeb78 100644
Binary files a/data/enderio/items/energetic_alloy/icon.png and b/data/enderio/items/energetic_alloy/icon.png differ
diff --git a/data/enderio/items/energetic_alloy_block/icon.png b/data/enderio/items/energetic_alloy_block/icon.png
index 62341a98..e7fad61c 100644
Binary files a/data/enderio/items/energetic_alloy_block/icon.png and b/data/enderio/items/energetic_alloy_block/icon.png differ
diff --git a/data/enderio/items/energy_conduit/icon.png b/data/enderio/items/energy_conduit/icon.png
index 54d10bfb..22a5c29c 100644
Binary files a/data/enderio/items/energy_conduit/icon.png and b/data/enderio/items/energy_conduit/icon.png differ
diff --git a/data/enderio/items/enhanced_energy_conduit/icon.png b/data/enderio/items/enhanced_energy_conduit/icon.png
index 7f692329..c5e95102 100644
Binary files a/data/enderio/items/enhanced_energy_conduit/icon.png and b/data/enderio/items/enhanced_energy_conduit/icon.png differ
diff --git a/data/enderio/items/enhanced_energy_conduit/item.cg b/data/enderio/items/enhanced_energy_conduit/item.cg
deleted file mode 100644
index 25934a0c..00000000
--- a/data/enderio/items/enhanced_energy_conduit/item.cg
+++ /dev/null
@@ -1,8 +0,0 @@
-schema: 1
-
-description: <<-END
-Max I/O: 5120 Rf/t  
-Tier II conduits
-END
-
-
diff --git a/data/enderio/items/enlightened_clear_glass/icon.png b/data/enderio/items/enlightened_clear_glass/icon.png
index 7fef0107..875a0e80 100644
Binary files a/data/enderio/items/enlightened_clear_glass/icon.png and b/data/enderio/items/enlightened_clear_glass/icon.png differ
diff --git a/data/enderio/items/enlightened_fused_quartz/icon.png b/data/enderio/items/enlightened_fused_quartz/icon.png
index 17c9257a..63c266eb 100644
Binary files a/data/enderio/items/enlightened_fused_quartz/icon.png and b/data/enderio/items/enlightened_fused_quartz/icon.png differ
diff --git a/data/enderio/items/enticing_crystal/icon.png b/data/enderio/items/enticing_crystal/icon.png
index 07115fa3..26c23532 100644
Binary files a/data/enderio/items/enticing_crystal/icon.png and b/data/enderio/items/enticing_crystal/icon.png differ
diff --git a/data/enderio/items/existing_item_filter/icon.png b/data/enderio/items/existing_item_filter/icon.png
index d38c2f20..559aa55b 100644
Binary files a/data/enderio/items/existing_item_filter/icon.png and b/data/enderio/items/existing_item_filter/icon.png differ
diff --git a/data/enderio/items/experience_obelisk/icon.png b/data/enderio/items/experience_obelisk/icon.png
index 9642d082..fd98ac44 100644
Binary files a/data/enderio/items/experience_obelisk/icon.png and b/data/enderio/items/experience_obelisk/icon.png differ
diff --git a/data/enderio/items/experience_rod/icon.png b/data/enderio/items/experience_rod/icon.png
index 45cfeafa..042bfd30 100644
Binary files a/data/enderio/items/experience_rod/icon.png and b/data/enderio/items/experience_rod/icon.png differ
diff --git a/data/enderio/items/farming_station/icon.png b/data/enderio/items/farming_station/icon.png
index 008697a1..e4042c7a 100644
Binary files a/data/enderio/items/farming_station/icon.png and b/data/enderio/items/farming_station/icon.png differ
diff --git a/data/enderio/items/fire_water/icon.png b/data/enderio/items/fire_water/icon.png
index 7f877e47..96ea6d13 100644
Binary files a/data/enderio/items/fire_water/icon.png and b/data/enderio/items/fire_water/icon.png differ
diff --git a/data/enderio/items/fire_water_bucket/icon.png b/data/enderio/items/fire_water_bucket/icon.png
index 00b94eff..8b1079ab 100644
Binary files a/data/enderio/items/fire_water_bucket/icon.png and b/data/enderio/items/fire_water_bucket/icon.png differ
diff --git a/data/enderio/items/flour/icon.png b/data/enderio/items/flour/icon.png
new file mode 100644
index 00000000..ac44b2ba
Binary files /dev/null and b/data/enderio/items/flour/icon.png differ
diff --git a/data/enderio/items/fluid_conduit/icon.png b/data/enderio/items/fluid_conduit/icon.png
index 099a4eca..9cb2102f 100644
Binary files a/data/enderio/items/fluid_conduit/icon.png and b/data/enderio/items/fluid_conduit/icon.png differ
diff --git a/data/enderio/items/fluid_tank/icon.png b/data/enderio/items/fluid_tank/icon.png
index f7a4cb30..3c8dbbfa 100644
Binary files a/data/enderio/items/fluid_tank/icon.png and b/data/enderio/items/fluid_tank/icon.png differ
diff --git a/data/enderio/items/frank_n_zombie/icon.png b/data/enderio/items/frank_n_zombie/icon.png
index 9a30a0ca..67e75659 100644
Binary files a/data/enderio/items/frank_n_zombie/icon.png and b/data/enderio/items/frank_n_zombie/icon.png differ
diff --git a/data/enderio/items/fused_quartz/icon.png b/data/enderio/items/fused_quartz/icon.png
index 17c9257a..63c266eb 100644
Binary files a/data/enderio/items/fused_quartz/icon.png and b/data/enderio/items/fused_quartz/icon.png differ
diff --git a/data/enderio/items/glider_wing/icon.png b/data/enderio/items/glider_wing/icon.png
index 5b845b3b..1825ed1d 100644
Binary files a/data/enderio/items/glider_wing/icon.png and b/data/enderio/items/glider_wing/icon.png differ
diff --git a/data/enderio/items/glider_wings/icon.png b/data/enderio/items/glider_wings/icon.png
index ba9aa637..9b43bbc0 100644
Binary files a/data/enderio/items/glider_wings/icon.png and b/data/enderio/items/glider_wings/icon.png differ
diff --git a/data/enderio/items/gold_powder/icon.png b/data/enderio/items/gold_powder/icon.png
index 69899176..194e8539 100644
Binary files a/data/enderio/items/gold_powder/icon.png and b/data/enderio/items/gold_powder/icon.png differ
diff --git a/data/enderio/items/hardened_conduit_facade/icon.png b/data/enderio/items/hardened_conduit_facade/icon.png
new file mode 100644
index 00000000..376b5d2f
Binary files /dev/null and b/data/enderio/items/hardened_conduit_facade/icon.png differ
diff --git a/data/enderio/items/hootch/icon.png b/data/enderio/items/hootch/icon.png
index b3c1474a..31cd1137 100644
Binary files a/data/enderio/items/hootch/icon.png and b/data/enderio/items/hootch/icon.png differ
diff --git a/data/enderio/items/hootch_bucket/icon.png b/data/enderio/items/hootch_bucket/icon.png
index 28cd3883..3528f7e6 100644
Binary files a/data/enderio/items/hootch_bucket/icon.png and b/data/enderio/items/hootch_bucket/icon.png differ
diff --git a/data/enderio/items/insulated_redstone_conduit/icon.png b/data/enderio/items/insulated_redstone_conduit/icon.png
index f698793b..63947f5c 100644
Binary files a/data/enderio/items/insulated_redstone_conduit/icon.png and b/data/enderio/items/insulated_redstone_conduit/icon.png differ
diff --git a/data/enderio/items/inventory_cable/icon.png b/data/enderio/items/inventory_cable/icon.png
new file mode 100644
index 00000000..bfc24624
Binary files /dev/null and b/data/enderio/items/inventory_cable/icon.png differ
diff --git a/data/enderio/items/inventory_panel/icon.png b/data/enderio/items/inventory_panel/icon.png
new file mode 100644
index 00000000..87691de0
Binary files /dev/null and b/data/enderio/items/inventory_panel/icon.png differ
diff --git a/data/enderio/items/inventory_relay/icon.png b/data/enderio/items/inventory_relay/icon.png
new file mode 100644
index 00000000..0dfb78f5
Binary files /dev/null and b/data/enderio/items/inventory_relay/icon.png differ
diff --git a/data/enderio/items/iron_powder/icon.png b/data/enderio/items/iron_powder/icon.png
index 02eff594..48c69815 100644
Binary files a/data/enderio/items/iron_powder/icon.png and b/data/enderio/items/iron_powder/icon.png differ
diff --git a/data/enderio/items/item_buffer/icon.png b/data/enderio/items/item_buffer/icon.png
index 00a424ba..49d12981 100644
Binary files a/data/enderio/items/item_buffer/icon.png and b/data/enderio/items/item_buffer/icon.png differ
diff --git a/data/enderio/items/item_conduit/icon.png b/data/enderio/items/item_conduit/icon.png
index 0b2c0c6a..99cc638a 100644
Binary files a/data/enderio/items/item_conduit/icon.png and b/data/enderio/items/item_conduit/icon.png differ
diff --git a/data/enderio/items/item_conduit_speed_downgrade/icon.png b/data/enderio/items/item_conduit_speed_downgrade/icon.png
new file mode 100644
index 00000000..d7e44dbd
Binary files /dev/null and b/data/enderio/items/item_conduit_speed_downgrade/icon.png differ
diff --git a/data/enderio/items/item_conduit_speed_upgrade/icon.png b/data/enderio/items/item_conduit_speed_upgrade/icon.png
index 303b2c1d..c57f0001 100644
Binary files a/data/enderio/items/item_conduit_speed_upgrade/icon.png and b/data/enderio/items/item_conduit_speed_upgrade/icon.png differ
diff --git a/data/enderio/items/item_valve/icon.png b/data/enderio/items/item_valve/icon.png
new file mode 100644
index 00000000..b04feece
Binary files /dev/null and b/data/enderio/items/item_valve/icon.png differ
diff --git a/data/enderio/items/killer_joe/icon.png b/data/enderio/items/killer_joe/icon.png
index 2b8fcdb4..35f96fc1 100644
Binary files a/data/enderio/items/killer_joe/icon.png and b/data/enderio/items/killer_joe/icon.png differ
diff --git a/data/enderio/items/light/icon.png b/data/enderio/items/light/icon.png
index 7f4d8a3c..1743aa22 100644
Binary files a/data/enderio/items/light/icon.png and b/data/enderio/items/light/icon.png differ
diff --git a/data/enderio/items/light_inverted/icon.png b/data/enderio/items/light_inverted/icon.png
index 7f4d8a3c..1743aa22 100644
Binary files a/data/enderio/items/light_inverted/icon.png and b/data/enderio/items/light_inverted/icon.png differ
diff --git a/data/enderio/items/liquid_sunshine_bucket/icon.png b/data/enderio/items/liquid_sunshine_bucket/icon.png
new file mode 100644
index 00000000..7e13dbca
Binary files /dev/null and b/data/enderio/items/liquid_sunshine_bucket/icon.png differ
diff --git a/data/enderio/items/liquid_sunshine_name/icon.png b/data/enderio/items/liquid_sunshine_name/icon.png
new file mode 100644
index 00000000..1e6f36c2
Binary files /dev/null and b/data/enderio/items/liquid_sunshine_name/icon.png differ
diff --git a/data/enderio/items/machine_chassis/icon.png b/data/enderio/items/machine_chassis/icon.png
index 847ad64b..66b4426e 100644
Binary files a/data/enderio/items/machine_chassis/icon.png and b/data/enderio/items/machine_chassis/icon.png differ
diff --git a/data/enderio/items/machine_inventory_manager/icon.png b/data/enderio/items/machine_inventory_manager/icon.png
new file mode 100644
index 00000000..fdbc9260
Binary files /dev/null and b/data/enderio/items/machine_inventory_manager/icon.png differ
diff --git a/data/enderio/items/me_conduit/icon.png b/data/enderio/items/me_conduit/icon.png
new file mode 100644
index 00000000..9f72d30f
Binary files /dev/null and b/data/enderio/items/me_conduit/icon.png differ
diff --git a/data/enderio/items/mod_item_filter/icon.png b/data/enderio/items/mod_item_filter/icon.png
index 17230b9f..d109ed07 100644
Binary files a/data/enderio/items/mod_item_filter/icon.png and b/data/enderio/items/mod_item_filter/icon.png differ
diff --git a/data/enderio/items/nutrient_distillation/icon.png b/data/enderio/items/nutrient_distillation/icon.png
index 53c9dd7d..f0673383 100644
Binary files a/data/enderio/items/nutrient_distillation/icon.png and b/data/enderio/items/nutrient_distillation/icon.png differ
diff --git a/data/enderio/items/nutrient_distillation_bucket/icon.png b/data/enderio/items/nutrient_distillation_bucket/icon.png
index c94d317d..4d80a044 100644
Binary files a/data/enderio/items/nutrient_distillation_bucket/icon.png and b/data/enderio/items/nutrient_distillation_bucket/icon.png differ
diff --git a/data/enderio/items/obsidian_powder/icon.png b/data/enderio/items/obsidian_powder/icon.png
new file mode 100644
index 00000000..405130c3
Binary files /dev/null and b/data/enderio/items/obsidian_powder/icon.png differ
diff --git a/data/enderio/items/octadic_capacitor/icon.png b/data/enderio/items/octadic_capacitor/icon.png
index f1290f71..e4f031b2 100644
Binary files a/data/enderio/items/octadic_capacitor/icon.png and b/data/enderio/items/octadic_capacitor/icon.png differ
diff --git a/data/enderio/items/omni_buffer/icon.png b/data/enderio/items/omni_buffer/icon.png
index 7cca2553..76cf6854 100644
Binary files a/data/enderio/items/omni_buffer/icon.png and b/data/enderio/items/omni_buffer/icon.png differ
diff --git a/data/enderio/items/painting_machine/icon.png b/data/enderio/items/painting_machine/icon.png
index aec31747..4c8353fb 100644
Binary files a/data/enderio/items/painting_machine/icon.png and b/data/enderio/items/painting_machine/icon.png differ
diff --git a/data/enderio/items/photovoltaic_cell/icon.png b/data/enderio/items/photovoltaic_cell/icon.png
index 3b024b38..7c067833 100644
Binary files a/data/enderio/items/photovoltaic_cell/icon.png and b/data/enderio/items/photovoltaic_cell/icon.png differ
diff --git a/data/enderio/items/power_buffer/icon.png b/data/enderio/items/power_buffer/icon.png
index 147227cb..d1d88509 100644
Binary files a/data/enderio/items/power_buffer/icon.png and b/data/enderio/items/power_buffer/icon.png differ
diff --git a/data/enderio/items/power_monitor/icon.png b/data/enderio/items/power_monitor/icon.png
index 1780d9e2..79a177d7 100644
Binary files a/data/enderio/items/power_monitor/icon.png and b/data/enderio/items/power_monitor/icon.png differ
diff --git a/data/enderio/items/powered_light/icon.png b/data/enderio/items/powered_light/icon.png
index 7f4d8a3c..1743aa22 100644
Binary files a/data/enderio/items/powered_light/icon.png and b/data/enderio/items/powered_light/icon.png differ
diff --git a/data/enderio/items/powered_light_inverted/icon.png b/data/enderio/items/powered_light_inverted/icon.png
index 7f4d8a3c..1743aa22 100644
Binary files a/data/enderio/items/powered_light_inverted/icon.png and b/data/enderio/items/powered_light_inverted/icon.png differ
diff --git a/data/enderio/items/powered_spawner/icon.png b/data/enderio/items/powered_spawner/icon.png
index 441f9c94..dc4fd798 100644
Binary files a/data/enderio/items/powered_spawner/icon.png and b/data/enderio/items/powered_spawner/icon.png differ
diff --git a/data/enderio/items/powered_spawner_2/icon.png b/data/enderio/items/powered_spawner_2/icon.png
index 441f9c94..dc4fd798 100644
Binary files a/data/enderio/items/powered_spawner_2/icon.png and b/data/enderio/items/powered_spawner_2/icon.png differ
diff --git a/data/enderio/items/powered_spawner_3/icon.png b/data/enderio/items/powered_spawner_3/icon.png
index 441f9c94..dc4fd798 100644
Binary files a/data/enderio/items/powered_spawner_3/icon.png and b/data/enderio/items/powered_spawner_3/icon.png differ
diff --git a/data/enderio/items/pressurized_fluid_conduit/icon.png b/data/enderio/items/pressurized_fluid_conduit/icon.png
index 756023b1..5f9035ef 100644
Binary files a/data/enderio/items/pressurized_fluid_conduit/icon.png and b/data/enderio/items/pressurized_fluid_conduit/icon.png differ
diff --git a/data/enderio/items/pressurized_fluid_tank/icon.png b/data/enderio/items/pressurized_fluid_tank/icon.png
index afd1eab2..d62117c2 100644
Binary files a/data/enderio/items/pressurized_fluid_tank/icon.png and b/data/enderio/items/pressurized_fluid_tank/icon.png differ
diff --git a/data/enderio/items/pulsating_crystal/icon.png b/data/enderio/items/pulsating_crystal/icon.png
index 69d163df..e69c41c1 100644
Binary files a/data/enderio/items/pulsating_crystal/icon.png and b/data/enderio/items/pulsating_crystal/icon.png differ
diff --git a/data/enderio/items/pulsating_iron/icon.png b/data/enderio/items/pulsating_iron/icon.png
index 3e318694..89aff0d8 100644
Binary files a/data/enderio/items/pulsating_iron/icon.png and b/data/enderio/items/pulsating_iron/icon.png differ
diff --git a/data/enderio/items/pulsating_iron_block/icon.png b/data/enderio/items/pulsating_iron_block/icon.png
index d780f186..ff51efef 100644
Binary files a/data/enderio/items/pulsating_iron_block/icon.png and b/data/enderio/items/pulsating_iron_block/icon.png differ
diff --git a/data/enderio/items/pulsating_iron_nugget/icon.png b/data/enderio/items/pulsating_iron_nugget/icon.png
index d63409e2..a323375d 100644
Binary files a/data/enderio/items/pulsating_iron_nugget/icon.png and b/data/enderio/items/pulsating_iron_nugget/icon.png differ
diff --git a/data/enderio/items/quite_clear_glass/icon.png b/data/enderio/items/quite_clear_glass/icon.png
index 7fef0107..875a0e80 100644
Binary files a/data/enderio/items/quite_clear_glass/icon.png and b/data/enderio/items/quite_clear_glass/icon.png differ
diff --git a/data/enderio/items/rapid_item_valve/icon.png b/data/enderio/items/rapid_item_valve/icon.png
new file mode 100644
index 00000000..c9fbb972
Binary files /dev/null and b/data/enderio/items/rapid_item_valve/icon.png differ
diff --git a/data/enderio/items/redstone_alloy/icon.png b/data/enderio/items/redstone_alloy/icon.png
index f01e932f..ff286799 100644
Binary files a/data/enderio/items/redstone_alloy/icon.png and b/data/enderio/items/redstone_alloy/icon.png differ
diff --git a/data/enderio/items/redstone_alloy_block/icon.png b/data/enderio/items/redstone_alloy_block/icon.png
index 0f53bfee..048a889a 100644
Binary files a/data/enderio/items/redstone_alloy_block/icon.png and b/data/enderio/items/redstone_alloy_block/icon.png differ
diff --git a/data/enderio/items/redstone_conduit/icon.png b/data/enderio/items/redstone_conduit/icon.png
index 5276fb28..2a231a49 100644
Binary files a/data/enderio/items/redstone_conduit/icon.png and b/data/enderio/items/redstone_conduit/icon.png differ
diff --git a/data/enderio/items/redstone_emitter/icon.png b/data/enderio/items/redstone_emitter/icon.png
new file mode 100644
index 00000000..04e3ebcc
Binary files /dev/null and b/data/enderio/items/redstone_emitter/icon.png differ
diff --git a/data/enderio/items/redstone_receiver/icon.png b/data/enderio/items/redstone_receiver/icon.png
new file mode 100644
index 00000000..4da759ba
Binary files /dev/null and b/data/enderio/items/redstone_receiver/icon.png differ
diff --git a/data/enderio/items/reinforced_obsidian/icon.png b/data/enderio/items/reinforced_obsidian/icon.png
index 90634b52..08d3d53b 100644
Binary files a/data/enderio/items/reinforced_obsidian/icon.png and b/data/enderio/items/reinforced_obsidian/icon.png differ
diff --git a/data/enderio/items/remote_awareness_upgrade/icon.png b/data/enderio/items/remote_awareness_upgrade/icon.png
new file mode 100644
index 00000000..d7876e1a
Binary files /dev/null and b/data/enderio/items/remote_awareness_upgrade/icon.png differ
diff --git a/data/enderio/items/reservoir/icon.png b/data/enderio/items/reservoir/icon.png
index 3b757a95..21ac8d16 100644
Binary files a/data/enderio/items/reservoir/icon.png and b/data/enderio/items/reservoir/icon.png differ
diff --git a/data/enderio/items/rocket_fuel/icon.png b/data/enderio/items/rocket_fuel/icon.png
index 16739a9d..78a30387 100644
Binary files a/data/enderio/items/rocket_fuel/icon.png and b/data/enderio/items/rocket_fuel/icon.png differ
diff --git a/data/enderio/items/rocket_fuel_bucket/icon.png b/data/enderio/items/rocket_fuel_bucket/icon.png
index 6d265312..bc7da7e3 100644
Binary files a/data/enderio/items/rocket_fuel_bucket/icon.png and b/data/enderio/items/rocket_fuel_bucket/icon.png differ
diff --git a/data/enderio/items/sag_mill/icon.png b/data/enderio/items/sag_mill/icon.png
index ba1ef7b8..4ad46aa9 100644
Binary files a/data/enderio/items/sag_mill/icon.png and b/data/enderio/items/sag_mill/icon.png differ
diff --git a/data/enderio/items/sentient_ender/icon.png b/data/enderio/items/sentient_ender/icon.png
new file mode 100644
index 00000000..3ec79631
Binary files /dev/null and b/data/enderio/items/sentient_ender/icon.png differ
diff --git a/data/enderio/items/sign_updater/icon.png b/data/enderio/items/sign_updater/icon.png
new file mode 100644
index 00000000..a0efd696
Binary files /dev/null and b/data/enderio/items/sign_updater/icon.png differ
diff --git a/data/enderio/items/silicon/icon.png b/data/enderio/items/silicon/icon.png
index c001eb7f..2df064ed 100644
Binary files a/data/enderio/items/silicon/icon.png and b/data/enderio/items/silicon/icon.png differ
diff --git a/data/enderio/items/slice_n_splice/icon.png b/data/enderio/items/slice_n_splice/icon.png
index cd1ca16d..ab278c82 100644
Binary files a/data/enderio/items/slice_n_splice/icon.png and b/data/enderio/items/slice_n_splice/icon.png differ
diff --git a/data/enderio/items/slightly_damaged_dark_steel_anvil/icon.png b/data/enderio/items/slightly_damaged_dark_steel_anvil/icon.png
index b52254ce..322d9dfe 100644
Binary files a/data/enderio/items/slightly_damaged_dark_steel_anvil/icon.png and b/data/enderio/items/slightly_damaged_dark_steel_anvil/icon.png differ
diff --git a/data/enderio/items/soul_binder/icon.png b/data/enderio/items/soul_binder/icon.png
index c7417c33..2ab7f436 100644
Binary files a/data/enderio/items/soul_binder/icon.png and b/data/enderio/items/soul_binder/icon.png differ
diff --git a/data/enderio/items/soul_vial/icon.png b/data/enderio/items/soul_vial/icon.png
index 276fd137..16cefdaa 100644
Binary files a/data/enderio/items/soul_vial/icon.png and b/data/enderio/items/soul_vial/icon.png differ
diff --git a/data/enderio/items/soularium/icon.png b/data/enderio/items/soularium/icon.png
index 03de74b1..f1f62d30 100644
Binary files a/data/enderio/items/soularium/icon.png and b/data/enderio/items/soularium/icon.png differ
diff --git a/data/enderio/items/soularium_block/icon.png b/data/enderio/items/soularium_block/icon.png
index dbc39eba..0e5c9b1b 100644
Binary files a/data/enderio/items/soularium_block/icon.png and b/data/enderio/items/soularium_block/icon.png differ
diff --git a/data/enderio/items/staff_of_traveling/icon.png b/data/enderio/items/staff_of_traveling/icon.png
index 523dc3ec..85340056 100644
Binary files a/data/enderio/items/staff_of_traveling/icon.png and b/data/enderio/items/staff_of_traveling/icon.png differ
diff --git a/data/enderio/items/staff_of_traveling_2/icon.png b/data/enderio/items/staff_of_traveling_2/icon.png
index 777bd701..d044665c 100644
Binary files a/data/enderio/items/staff_of_traveling_2/icon.png and b/data/enderio/items/staff_of_traveling_2/icon.png differ
diff --git a/data/enderio/items/stirling_generator/icon.png b/data/enderio/items/stirling_generator/icon.png
index c2196361..d762dbbf 100644
Binary files a/data/enderio/items/stirling_generator/icon.png and b/data/enderio/items/stirling_generator/icon.png differ
diff --git a/data/enderio/items/telepad_block/icon.png b/data/enderio/items/telepad_block/icon.png
new file mode 100644
index 00000000..682a4ece
Binary files /dev/null and b/data/enderio/items/telepad_block/icon.png differ
diff --git a/data/enderio/items/the_ender/icon.png b/data/enderio/items/the_ender/icon.png
index 408bad28..b0d9d063 100644
Binary files a/data/enderio/items/the_ender/icon.png and b/data/enderio/items/the_ender/icon.png differ
diff --git a/data/enderio/items/the_ender_2/icon.png b/data/enderio/items/the_ender_2/icon.png
index 90d1fdf0..2aed27b7 100644
Binary files a/data/enderio/items/the_ender_2/icon.png and b/data/enderio/items/the_ender_2/icon.png differ
diff --git a/data/enderio/items/the_vat/icon.png b/data/enderio/items/the_vat/icon.png
index a866c312..3ecc9292 100644
Binary files a/data/enderio/items/the_vat/icon.png and b/data/enderio/items/the_vat/icon.png differ
diff --git a/data/enderio/items/tile_blockinhibitorobelisk_name/icon.png b/data/enderio/items/tile_blockinhibitorobelisk_name/icon.png
new file mode 100644
index 00000000..7fa0dbb1
Binary files /dev/null and b/data/enderio/items/tile_blockinhibitorobelisk_name/icon.png differ
diff --git a/data/enderio/items/tin_powder/icon.png b/data/enderio/items/tin_powder/icon.png
new file mode 100644
index 00000000..ad3bd18d
Binary files /dev/null and b/data/enderio/items/tin_powder/icon.png differ
diff --git a/data/enderio/items/tormented_enderman_head/icon.png b/data/enderio/items/tormented_enderman_head/icon.png
index ea23b287..5eb6e84c 100644
Binary files a/data/enderio/items/tormented_enderman_head/icon.png and b/data/enderio/items/tormented_enderman_head/icon.png differ
diff --git a/data/enderio/items/transforming_cable_camouflage/icon.png b/data/enderio/items/transforming_cable_camouflage/icon.png
new file mode 100644
index 00000000..e977b8f7
Binary files /dev/null and b/data/enderio/items/transforming_cable_camouflage/icon.png differ
diff --git a/data/enderio/items/travel_anchor/icon.png b/data/enderio/items/travel_anchor/icon.png
index af858fb9..77e6ee0e 100644
Binary files a/data/enderio/items/travel_anchor/icon.png and b/data/enderio/items/travel_anchor/icon.png differ
diff --git a/data/enderio/items/vacuum_chest/icon.png b/data/enderio/items/vacuum_chest/icon.png
index 86a935c3..81a1d633 100644
Binary files a/data/enderio/items/vacuum_chest/icon.png and b/data/enderio/items/vacuum_chest/icon.png differ
diff --git a/data/enderio/items/very_damaged_dark_steel_anvil/icon.png b/data/enderio/items/very_damaged_dark_steel_anvil/icon.png
index 4a53e3be..eaef78a0 100644
Binary files a/data/enderio/items/very_damaged_dark_steel_anvil/icon.png and b/data/enderio/items/very_damaged_dark_steel_anvil/icon.png differ
diff --git a/data/enderio/items/vibrant_alloy/icon.png b/data/enderio/items/vibrant_alloy/icon.png
index e3d562c9..d4bf3527 100644
Binary files a/data/enderio/items/vibrant_alloy/icon.png and b/data/enderio/items/vibrant_alloy/icon.png differ
diff --git a/data/enderio/items/vibrant_alloy_block/icon.png b/data/enderio/items/vibrant_alloy_block/icon.png
index e83491f1..8f253366 100644
Binary files a/data/enderio/items/vibrant_alloy_block/icon.png and b/data/enderio/items/vibrant_alloy_block/icon.png differ
diff --git a/data/enderio/items/vibrant_alloy_nugget/icon.png b/data/enderio/items/vibrant_alloy_nugget/icon.png
index 5926cabf..8a0ffe9c 100644
Binary files a/data/enderio/items/vibrant_alloy_nugget/icon.png and b/data/enderio/items/vibrant_alloy_nugget/icon.png differ
diff --git a/data/enderio/items/vibrant_capacitor_bank/icon.png b/data/enderio/items/vibrant_capacitor_bank/icon.png
index 90d7504e..d78a825e 100644
Binary files a/data/enderio/items/vibrant_capacitor_bank/icon.png and b/data/enderio/items/vibrant_capacitor_bank/icon.png differ
diff --git a/data/enderio/items/vibrant_capacitor_bank_2/icon.png b/data/enderio/items/vibrant_capacitor_bank_2/icon.png
index e96eda8b..01a3cd4d 100644
Binary files a/data/enderio/items/vibrant_capacitor_bank_2/icon.png and b/data/enderio/items/vibrant_capacitor_bank_2/icon.png differ
diff --git a/data/enderio/items/vibrant_crystal/icon.png b/data/enderio/items/vibrant_crystal/icon.png
index 39309f84..f3c8781c 100644
Binary files a/data/enderio/items/vibrant_crystal/icon.png and b/data/enderio/items/vibrant_crystal/icon.png differ
diff --git a/data/enderio/items/weather_crystal/icon.png b/data/enderio/items/weather_crystal/icon.png
new file mode 100644
index 00000000..2e8106df
Binary files /dev/null and b/data/enderio/items/weather_crystal/icon.png differ
diff --git a/data/enderio/items/weather_obelisk/icon.png b/data/enderio/items/weather_obelisk/icon.png
new file mode 100644
index 00000000..24c5ee69
Binary files /dev/null and b/data/enderio/items/weather_obelisk/icon.png differ
diff --git a/data/enderio/items/wireless_charger/icon.png b/data/enderio/items/wireless_charger/icon.png
index dc1e9214..e370532d 100644
Binary files a/data/enderio/items/wireless_charger/icon.png and b/data/enderio/items/wireless_charger/icon.png differ
diff --git a/data/enderio/items/wireless_powered_light/icon.png b/data/enderio/items/wireless_powered_light/icon.png
index 7f4d8a3c..1743aa22 100644
Binary files a/data/enderio/items/wireless_powered_light/icon.png and b/data/enderio/items/wireless_powered_light/icon.png differ
diff --git a/data/enderio/items/wireless_powered_light_inverted/icon.png b/data/enderio/items/wireless_powered_light_inverted/icon.png
index 7f4d8a3c..1743aa22 100644
Binary files a/data/enderio/items/wireless_powered_light_inverted/icon.png and b/data/enderio/items/wireless_powered_light_inverted/icon.png differ
diff --git a/data/enderio/items/xp_bucket/icon.png b/data/enderio/items/xp_bucket/icon.png
index 00c6cabb..0bd0d037 100644
Binary files a/data/enderio/items/xp_bucket/icon.png and b/data/enderio/items/xp_bucket/icon.png differ
diff --git a/data/enderio/items/yeta_wrench/icon.png b/data/enderio/items/yeta_wrench/icon.png
index f5ccfa0f..8fe1c6c5 100644
Binary files a/data/enderio/items/yeta_wrench/icon.png and b/data/enderio/items/yeta_wrench/icon.png differ
diff --git a/data/enderio/items/z_logic_controller/icon.png b/data/enderio/items/z_logic_controller/icon.png
index 0b98bcf5..0056253f 100644
Binary files a/data/enderio/items/z_logic_controller/icon.png and b/data/enderio/items/z_logic_controller/icon.png differ
diff --git a/data/enderio/items/zombie_electrode/icon.png b/data/enderio/items/zombie_electrode/icon.png
index 6814e08b..c3f0beec 100644
Binary files a/data/enderio/items/zombie_electrode/icon.png and b/data/enderio/items/zombie_electrode/icon.png differ
diff --git a/data/enderio/items/zombie_generator/icon.png b/data/enderio/items/zombie_generator/icon.png
index 7a29d1a9..f46287e7 100644
Binary files a/data/enderio/items/zombie_generator/icon.png and b/data/enderio/items/zombie_generator/icon.png differ
diff --git a/data/enderio/mod.cg b/data/enderio/mod.cg
index 7af6f263..8d843da4 100644
--- a/data/enderio/mod.cg
+++ b/data/enderio/mod.cg
@@ -7,4 +7,4 @@ homePageUrl:      http://enderio.com/
 documentationUrl: http://wiki.enderio.com/Main_Page
 downloadUrl:      http://minecraft.curseforge.com/mc-mods/64578-ender-io/files
 
-version: 2.2.7.325
+version: 2.3.0.424_beta
diff --git a/data/enderio/versions/2.2.7.325/mod-version.cg b/data/enderio/versions/2.3.0.424_beta/mod-version.cg
similarity index 100%
rename from data/enderio/versions/2.2.7.325/mod-version.cg
rename to data/enderio/versions/2.3.0.424_beta/mod-version.cg