diff --git a/coretk/coretk/icons/docker.png b/coretk/coretk/icons/docker.png
new file mode 100644
index 00000000..6727a58b
Binary files /dev/null and b/coretk/coretk/icons/docker.png differ
diff --git a/coretk/coretk/icons/edit-node.png b/coretk/coretk/icons/edit-node.png
new file mode 100644
index 00000000..28490eff
Binary files /dev/null and b/coretk/coretk/icons/edit-node.png differ
diff --git a/coretk/coretk/icons/emane.png b/coretk/coretk/icons/emane.png
new file mode 100644
index 00000000..1baa933d
Binary files /dev/null and b/coretk/coretk/icons/emane.png differ
diff --git a/coretk/coretk/icons/hub.png b/coretk/coretk/icons/hub.png
index 26b7eba5..c9a2523b 100644
Binary files a/coretk/coretk/icons/hub.png and b/coretk/coretk/icons/hub.png differ
diff --git a/coretk/coretk/icons/lanswitch.png b/coretk/coretk/icons/lanswitch.png
index 6f7ac92f..eb9ba593 100644
Binary files a/coretk/coretk/icons/lanswitch.png and b/coretk/coretk/icons/lanswitch.png differ
diff --git a/coretk/coretk/icons/link.png b/coretk/coretk/icons/link.png
new file mode 100644
index 00000000..d6b6745b
Binary files /dev/null and b/coretk/coretk/icons/link.png differ
diff --git a/coretk/coretk/icons/lxc.png b/coretk/coretk/icons/lxc.png
new file mode 100644
index 00000000..7b515142
Binary files /dev/null and b/coretk/coretk/icons/lxc.png differ
diff --git a/coretk/coretk/icons/marker.png b/coretk/coretk/icons/marker.png
index 9a41ccbe..8c60bacb 100644
Binary files a/coretk/coretk/icons/marker.png and b/coretk/coretk/icons/marker.png differ
diff --git a/coretk/coretk/icons/mdr.png b/coretk/coretk/icons/mdr.png
new file mode 100644
index 00000000..b0678ee7
Binary files /dev/null and b/coretk/coretk/icons/mdr.png differ
diff --git a/coretk/coretk/icons/oval.png b/coretk/coretk/icons/oval.png
index 06f492d4..1babf1b7 100644
Binary files a/coretk/coretk/icons/oval.png and b/coretk/coretk/icons/oval.png differ
diff --git a/coretk/coretk/icons/pc.png b/coretk/coretk/icons/pc.png
index a0577da3..3f587e70 100644
Binary files a/coretk/coretk/icons/pc.png and b/coretk/coretk/icons/pc.png differ
diff --git a/coretk/coretk/icons/prouter.png b/coretk/coretk/icons/prouter.png
new file mode 100644
index 00000000..b0ccf664
Binary files /dev/null and b/coretk/coretk/icons/prouter.png differ
diff --git a/coretk/coretk/icons/rectangle.png b/coretk/coretk/icons/rectangle.png
index f8a9581e..ca6c8c06 100644
Binary files a/coretk/coretk/icons/rectangle.png and b/coretk/coretk/icons/rectangle.png differ
diff --git a/coretk/coretk/icons/rj45.png b/coretk/coretk/icons/rj45.png
index baf4f9e8..c9d87cfd 100644
Binary files a/coretk/coretk/icons/rj45.png and b/coretk/coretk/icons/rj45.png differ
diff --git a/coretk/coretk/icons/router.png b/coretk/coretk/icons/router.png
index a42623a4..1de5014a 100644
Binary files a/coretk/coretk/icons/router.png and b/coretk/coretk/icons/router.png differ
diff --git a/coretk/coretk/icons/run.png b/coretk/coretk/icons/run.png
new file mode 100644
index 00000000..a39a997f
Binary files /dev/null and b/coretk/coretk/icons/run.png differ
diff --git a/coretk/coretk/icons/select.png b/coretk/coretk/icons/select.png
index 9063d308..04e18891 100644
Binary files a/coretk/coretk/icons/select.png and b/coretk/coretk/icons/select.png differ
diff --git a/coretk/coretk/icons/start.png b/coretk/coretk/icons/start.png
index 191d6636..719f4cd9 100644
Binary files a/coretk/coretk/icons/start.png and b/coretk/coretk/icons/start.png differ
diff --git a/coretk/coretk/icons/stop.png b/coretk/coretk/icons/stop.png
index 1db886c8..1e87c929 100644
Binary files a/coretk/coretk/icons/stop.png and b/coretk/coretk/icons/stop.png differ
diff --git a/coretk/coretk/icons/text.png b/coretk/coretk/icons/text.png
index 4933dabb..14a85dc0 100644
Binary files a/coretk/coretk/icons/text.png and b/coretk/coretk/icons/text.png differ
diff --git a/coretk/coretk/icons/twonode.png b/coretk/coretk/icons/twonode.png
new file mode 100644
index 00000000..6828db8e
Binary files /dev/null and b/coretk/coretk/icons/twonode.png differ
diff --git a/coretk/coretk/icons/wlan.png b/coretk/coretk/icons/wlan.png
new file mode 100644
index 00000000..db979a09
Binary files /dev/null and b/coretk/coretk/icons/wlan.png differ
diff --git a/coretk/coretk/images.py b/coretk/coretk/images.py
index 8f13c593..3763f2d2 100644
--- a/coretk/coretk/images.py
+++ b/coretk/coretk/images.py
@@ -53,9 +53,9 @@ class ImageEnum(Enum):
     HOST = "host"
     PC = "pc"
     MDR = "mdr"
-    PROUTER = "router_green"
+    PROUTER = "prouter"
     OVS = "OVS"
-    EDITNODE = "document-properties"
+    EDITNODE = "edit-node"
     PLOT = "plot"
     TWONODE = "twonode"
     STOP = "stop"
diff --git a/coretk/coretk/icons/docker.gif b/coretk/coretk/oldicons/docker.gif
similarity index 100%
rename from coretk/coretk/icons/docker.gif
rename to coretk/coretk/oldicons/docker.gif
diff --git a/coretk/coretk/icons/emane.gif b/coretk/coretk/oldicons/emane.gif
similarity index 100%
rename from coretk/coretk/icons/emane.gif
rename to coretk/coretk/oldicons/emane.gif
diff --git a/coretk/coretk/icons/link.gif b/coretk/coretk/oldicons/link.gif
similarity index 100%
rename from coretk/coretk/icons/link.gif
rename to coretk/coretk/oldicons/link.gif
diff --git a/coretk/coretk/icons/lxc.gif b/coretk/coretk/oldicons/lxc.gif
similarity index 100%
rename from coretk/coretk/icons/lxc.gif
rename to coretk/coretk/oldicons/lxc.gif
diff --git a/coretk/coretk/icons/marker.gif b/coretk/coretk/oldicons/marker.gif
similarity index 100%
rename from coretk/coretk/icons/marker.gif
rename to coretk/coretk/oldicons/marker.gif
diff --git a/coretk/coretk/icons/mdr.gif b/coretk/coretk/oldicons/mdr.gif
similarity index 100%
rename from coretk/coretk/icons/mdr.gif
rename to coretk/coretk/oldicons/mdr.gif
diff --git a/coretk/coretk/icons/router_green.gif b/coretk/coretk/oldicons/router_green.gif
similarity index 100%
rename from coretk/coretk/icons/router_green.gif
rename to coretk/coretk/oldicons/router_green.gif
diff --git a/coretk/coretk/icons/run.gif b/coretk/coretk/oldicons/run.gif
similarity index 100%
rename from coretk/coretk/icons/run.gif
rename to coretk/coretk/oldicons/run.gif
diff --git a/coretk/coretk/icons/twonode.gif b/coretk/coretk/oldicons/twonode.gif
similarity index 100%
rename from coretk/coretk/icons/twonode.gif
rename to coretk/coretk/oldicons/twonode.gif
diff --git a/coretk/coretk/icons/wlan.gif b/coretk/coretk/oldicons/wlan.gif
similarity index 100%
rename from coretk/coretk/icons/wlan.gif
rename to coretk/coretk/oldicons/wlan.gif