diff --git a/workflows/base/static/base/icons/treeview/1688041475.png b/workflows/base/static/base/icons/treeview/1688041475.png
new file mode 100755
index 0000000000000000000000000000000000000000..ed741aa172a0ccd6cfc6185326a81a0b6ce1eeb4
Binary files /dev/null and b/workflows/base/static/base/icons/treeview/1688041475.png differ
diff --git a/workflows/base/static/base/icons/treeview/417px-Latex_integers.svg.png b/workflows/base/static/base/icons/treeview/417px-Latex_integers.svg.png
new file mode 100755
index 0000000000000000000000000000000000000000..1d71ca62c6a508f7ab99257183769816334e0226
Binary files /dev/null and b/workflows/base/static/base/icons/treeview/417px-Latex_integers.svg.png differ
diff --git a/workflows/base/static/base/icons/treeview/482063585452602669.png b/workflows/base/static/base/icons/treeview/482063585452602669.png
new file mode 100755
index 0000000000000000000000000000000000000000..b1ceebb421b1d4b14a935dd80ad4a85db13688d4
Binary files /dev/null and b/workflows/base/static/base/icons/treeview/482063585452602669.png differ
diff --git a/workflows/base/static/base/icons/treeview/Create-Range_1.png b/workflows/base/static/base/icons/treeview/Create-Range_1.png
new file mode 100755
index 0000000000000000000000000000000000000000..881314a0803ee43764540bd7513dd6d551727924
Binary files /dev/null and b/workflows/base/static/base/icons/treeview/Create-Range_1.png differ
diff --git a/workflows/base/static/base/icons/treeview/File.png b/workflows/base/static/base/icons/treeview/File.png
new file mode 100755
index 0000000000000000000000000000000000000000..5413fffc407d78dae40bab2c92728c73740870d3
Binary files /dev/null and b/workflows/base/static/base/icons/treeview/File.png differ
diff --git a/workflows/base/static/base/icons/treeview/Task-List-icon.png b/workflows/base/static/base/icons/treeview/Task-List-icon.png
new file mode 100755
index 0000000000000000000000000000000000000000..614dc12f7ab4bbf5a24187513c27edc77f04c320
Binary files /dev/null and b/workflows/base/static/base/icons/treeview/Task-List-icon.png differ
diff --git a/workflows/base/static/base/icons/treeview/Upload-icon.png b/workflows/base/static/base/icons/treeview/Upload-icon.png
new file mode 100755
index 0000000000000000000000000000000000000000..fd965d686e13b2df2f1058c6dd1f7a3e00049e32
Binary files /dev/null and b/workflows/base/static/base/icons/treeview/Upload-icon.png differ
diff --git a/workflows/base/static/base/icons/treeview/Upload-icon_1.png b/workflows/base/static/base/icons/treeview/Upload-icon_1.png
new file mode 100755
index 0000000000000000000000000000000000000000..0dafe5c7f405f130a89d8e7925b534bd54f205ff
Binary files /dev/null and b/workflows/base/static/base/icons/treeview/Upload-icon_1.png differ
diff --git a/workflows/base/static/base/icons/treeview/concatenate_string.png b/workflows/base/static/base/icons/treeview/concatenate_string.png
new file mode 100755
index 0000000000000000000000000000000000000000..da319e9866128aabb51f06ddc23db4049f72981c
Binary files /dev/null and b/workflows/base/static/base/icons/treeview/concatenate_string.png differ
diff --git a/workflows/base/static/base/icons/treeview/d914a910_1.png b/workflows/base/static/base/icons/treeview/d914a910_1.png
new file mode 100755
index 0000000000000000000000000000000000000000..2a502e2f2d9f2c1361bf7536f32e24c9844ddd3c
Binary files /dev/null and b/workflows/base/static/base/icons/treeview/d914a910_1.png differ
diff --git a/workflows/base/static/base/icons/treeview/d914a910_2.png b/workflows/base/static/base/icons/treeview/d914a910_2.png
new file mode 100755
index 0000000000000000000000000000000000000000..2a502e2f2d9f2c1361bf7536f32e24c9844ddd3c
Binary files /dev/null and b/workflows/base/static/base/icons/treeview/d914a910_2.png differ
diff --git a/workflows/base/static/base/icons/treeview/display_string.png b/workflows/base/static/base/icons/treeview/display_string.png
new file mode 100755
index 0000000000000000000000000000000000000000..203d7ae4e0a25c1d237f354ec84766ae0b6f4ad1
Binary files /dev/null and b/workflows/base/static/base/icons/treeview/display_string.png differ
diff --git a/workflows/base/static/base/icons/treeview/ensemble-small.png b/workflows/base/static/base/icons/treeview/ensemble-small.png
new file mode 100755
index 0000000000000000000000000000000000000000..cc0e6e086d673a1fc02c9f67897d468ccb13448f
Binary files /dev/null and b/workflows/base/static/base/icons/treeview/ensemble-small.png differ
diff --git a/workflows/base/static/base/icons/treeview/glass_3.png b/workflows/base/static/base/icons/treeview/glass_3.png
new file mode 100755
index 0000000000000000000000000000000000000000..b52798e7133f46462c3ba205302b96406c175c87
Binary files /dev/null and b/workflows/base/static/base/icons/treeview/glass_3.png differ
diff --git a/workflows/base/static/base/icons/treeview/pickle.png b/workflows/base/static/base/icons/treeview/pickle.png
new file mode 100755
index 0000000000000000000000000000000000000000..56b3529d45f1dcc997cedb9ee7f439fd8814884f
Binary files /dev/null and b/workflows/base/static/base/icons/treeview/pickle.png differ
diff --git a/workflows/base/static/base/icons/treeview/pickle_1.png b/workflows/base/static/base/icons/treeview/pickle_1.png
new file mode 100755
index 0000000000000000000000000000000000000000..56b3529d45f1dcc997cedb9ee7f439fd8814884f
Binary files /dev/null and b/workflows/base/static/base/icons/treeview/pickle_1.png differ
diff --git a/workflows/base/static/base/icons/treeview/string.png b/workflows/base/static/base/icons/treeview/string.png
new file mode 100755
index 0000000000000000000000000000000000000000..dcc4071ff9005df9aa9ff481c170f8c5b82a05a6
Binary files /dev/null and b/workflows/base/static/base/icons/treeview/string.png differ
diff --git a/workflows/base/static/base/icons/widget/1688041475.png b/workflows/base/static/base/icons/widget/1688041475.png
new file mode 100755
index 0000000000000000000000000000000000000000..40b1e998163e19f4d35e48a584fa758d01cf8fca
Binary files /dev/null and b/workflows/base/static/base/icons/widget/1688041475.png differ
diff --git a/workflows/base/static/base/icons/widget/417px-Latex_integers.svg.png b/workflows/base/static/base/icons/widget/417px-Latex_integers.svg.png
new file mode 100755
index 0000000000000000000000000000000000000000..0d6ec3066631c20e4f35a338ad18752dc3cb06ab
Binary files /dev/null and b/workflows/base/static/base/icons/widget/417px-Latex_integers.svg.png differ
diff --git a/workflows/base/static/base/icons/widget/482063585452602669.png b/workflows/base/static/base/icons/widget/482063585452602669.png
new file mode 100755
index 0000000000000000000000000000000000000000..85d53e09afae795e801e0644bea2a7f963ef804a
Binary files /dev/null and b/workflows/base/static/base/icons/widget/482063585452602669.png differ
diff --git a/workflows/base/static/base/icons/widget/Create-Range_1.png b/workflows/base/static/base/icons/widget/Create-Range_1.png
new file mode 100755
index 0000000000000000000000000000000000000000..114fba0f29f72fa528e058c15956ffb0af87277c
Binary files /dev/null and b/workflows/base/static/base/icons/widget/Create-Range_1.png differ
diff --git a/workflows/base/static/base/icons/widget/File.png b/workflows/base/static/base/icons/widget/File.png
new file mode 100755
index 0000000000000000000000000000000000000000..da8a63df99c7dc939c9cc7be92c840d50ec9fc70
Binary files /dev/null and b/workflows/base/static/base/icons/widget/File.png differ
diff --git a/workflows/base/static/base/icons/widget/Task-List-icon.png b/workflows/base/static/base/icons/widget/Task-List-icon.png
new file mode 100755
index 0000000000000000000000000000000000000000..003b2122f7e0ada9c2f69386e438a4f81a25509f
Binary files /dev/null and b/workflows/base/static/base/icons/widget/Task-List-icon.png differ
diff --git a/workflows/base/static/base/icons/widget/Upload-icon.png b/workflows/base/static/base/icons/widget/Upload-icon.png
new file mode 100755
index 0000000000000000000000000000000000000000..8d269098035830a1283c550ec5d3383011a8390a
Binary files /dev/null and b/workflows/base/static/base/icons/widget/Upload-icon.png differ
diff --git a/workflows/base/static/base/icons/widget/Upload-icon_1.png b/workflows/base/static/base/icons/widget/Upload-icon_1.png
new file mode 100755
index 0000000000000000000000000000000000000000..8d269098035830a1283c550ec5d3383011a8390a
Binary files /dev/null and b/workflows/base/static/base/icons/widget/Upload-icon_1.png differ
diff --git a/workflows/base/static/base/icons/widget/concatenate_string.png b/workflows/base/static/base/icons/widget/concatenate_string.png
new file mode 100755
index 0000000000000000000000000000000000000000..716852f422b7b4fb0d42aaac058f72b48daba7d0
Binary files /dev/null and b/workflows/base/static/base/icons/widget/concatenate_string.png differ
diff --git a/workflows/base/static/base/icons/widget/d914a910.png b/workflows/base/static/base/icons/widget/d914a910.png
new file mode 100755
index 0000000000000000000000000000000000000000..84700ee087b87c9ad880813afcc07a96eab358b5
Binary files /dev/null and b/workflows/base/static/base/icons/widget/d914a910.png differ
diff --git a/workflows/base/static/base/icons/widget/d914a910_1.png b/workflows/base/static/base/icons/widget/d914a910_1.png
new file mode 100755
index 0000000000000000000000000000000000000000..84700ee087b87c9ad880813afcc07a96eab358b5
Binary files /dev/null and b/workflows/base/static/base/icons/widget/d914a910_1.png differ
diff --git a/workflows/base/static/base/icons/widget/d914a910_2.png b/workflows/base/static/base/icons/widget/d914a910_2.png
new file mode 100755
index 0000000000000000000000000000000000000000..84700ee087b87c9ad880813afcc07a96eab358b5
Binary files /dev/null and b/workflows/base/static/base/icons/widget/d914a910_2.png differ
diff --git a/workflows/base/static/base/icons/widget/display_string.png b/workflows/base/static/base/icons/widget/display_string.png
new file mode 100755
index 0000000000000000000000000000000000000000..f4b68a2ee806628d2ee3a521e33ef17cc9a12259
Binary files /dev/null and b/workflows/base/static/base/icons/widget/display_string.png differ
diff --git a/workflows/base/static/base/icons/widget/ensemble-small.png b/workflows/base/static/base/icons/widget/ensemble-small.png
new file mode 100755
index 0000000000000000000000000000000000000000..00465dd1768acdbd656d07ac79219cc2a12ad036
Binary files /dev/null and b/workflows/base/static/base/icons/widget/ensemble-small.png differ
diff --git a/workflows/base/static/base/icons/widget/glass_3.png b/workflows/base/static/base/icons/widget/glass_3.png
new file mode 100755
index 0000000000000000000000000000000000000000..d1783be9e1be3c9c0be852e2192a024c3e069413
Binary files /dev/null and b/workflows/base/static/base/icons/widget/glass_3.png differ
diff --git a/workflows/base/static/base/icons/widget/pickle.png b/workflows/base/static/base/icons/widget/pickle.png
new file mode 100755
index 0000000000000000000000000000000000000000..40b2070057ff9007ef4adc337af7dab06a2f8e20
Binary files /dev/null and b/workflows/base/static/base/icons/widget/pickle.png differ
diff --git a/workflows/base/static/base/icons/widget/pickle_1.png b/workflows/base/static/base/icons/widget/pickle_1.png
new file mode 100755
index 0000000000000000000000000000000000000000..40b2070057ff9007ef4adc337af7dab06a2f8e20
Binary files /dev/null and b/workflows/base/static/base/icons/widget/pickle_1.png differ
diff --git a/workflows/base/static/base/icons/widget/string.png b/workflows/base/static/base/icons/widget/string.png
new file mode 100755
index 0000000000000000000000000000000000000000..4f94105673f4074211d401984a8c42a02cb039fd
Binary files /dev/null and b/workflows/base/static/base/icons/widget/string.png differ
diff --git a/workflows/templates/treeview_widget.html b/workflows/templates/treeview_widget.html
index 2ff7b2e61eeb2d1a2a37f2296ab413a3e8dcbc02..7cb2aa89a86c8cb7e5a6f027e63acb3391fcfc62 100755
--- a/workflows/templates/treeview_widget.html
+++ b/workflows/templates/treeview_widget.html
@@ -1 +1 @@
-<li><a class="widget wid" rel="{{ widget.id }}" relType="abstractwidget"><span class="image" style="background-size:16px;background-image:url('{% if widget.static_image %}{{STATIC_URL}}icons/treeview/{{widget.static_image}}{% else %}{% if widget.treeview_image %}{{MEDIA_URL}}{{widget.treeview_image}}{% else %}{% if widget.wsdl %}{{STATIC_URL}}widget-icons/ws_1.png{% else %}{{STATIC_URL}}widget-icons/question-mark.png{% endif %}{% endif %}{% endif %}');">{{ widget.name }}</span></a></li>
\ No newline at end of file
+<li><a class="widget wid" rel="{{ widget.id }}" relType="abstractwidget"><span class="image" style="background-size:16px;background-image:url('{% if widget.static_image %}{{STATIC_URL}}{{widget.package}}/icons/treeview/{{widget.static_image}}{% else %}{% if widget.treeview_image %}{{MEDIA_URL}}{{widget.treeview_image}}{% else %}{% if widget.wsdl %}{{STATIC_URL}}widget-icons/ws_1.png{% else %}{{STATIC_URL}}widget-icons/question-mark.png{% endif %}{% endif %}{% endif %}');">{{ widget.name }}</span></a></li>
\ No newline at end of file
diff --git a/workflows/templates/widgets.html b/workflows/templates/widgets.html
index 00fedb2b03a05d00aea089658c6ac6aa644459ef..b008f0fe7b80345b712ba95f0dc9135e00a479c6 100755
--- a/workflows/templates/widgets.html
+++ b/workflows/templates/widgets.html
@@ -8,7 +8,7 @@
             {% endfor %}
         </div>
         <div class="ui-widget-content {% ifequal widget.type 'for_input' %}ui-state-green{% endifequal %} {% ifequal widget.type 'for_output' %}ui-state-green{% endifequal %} ui-corner-all widgetcenter" style="padding-left:10px;padding-right:10px;">
-        <div style="width:34px;height:34px;background-size:100%;background-repeat:no-repeat;background-position:center center;background-image:url('{% if widget.abstract_widget.static_image %}{{STATIC_URL}}icons/widget/{{widget.abstract_widget.static_image}}{% else %}{% if widget.abstract_widget.image %}{{MEDIA_URL}}{{widget.abstract_widget.image}}{% else %}{% if widget.abstract_widget.wsdl %}{{STATIC_URL}}widget-icons/ws.png{% else %}{% if widget.workflow_link %}{{MEDIA_URL}}images/120px-Gears_icon.png{% else %}{% ifequal widget.type 'input' %}{{MEDIA_URL}}images/forward-arrow.png{% else %}{% ifequal widget.type 'output' %}{{MEDIA_URL}}images/forward-arrow.png{% else %}{% ifequal widget.type 'for_output' %}{{MEDIA_URL}}images/Toolbar_-_Loop.png{% else %}{% ifequal widget.type 'for_input' %}{{MEDIA_URL}}images/Toolbar_-_Loop.png{% else %}{{STATIC_URL}}widget-icons/question-mark.png{% endifequal %}{% endifequal %}{% endifequal %}{% endifequal %}{% endif %}{% endif %}{% endif %}{% endif %}')">
+        <div style="width:34px;height:34px;background-size:100%;background-repeat:no-repeat;background-position:center center;background-image:url('{% if widget.abstract_widget.static_image %}{{STATIC_URL}}{{widget.abstract_widget.package}}/icons/widget/{{widget.abstract_widget.static_image}}{% else %}{% if widget.abstract_widget.image %}{{MEDIA_URL}}{{widget.abstract_widget.image}}{% else %}{% if widget.abstract_widget.wsdl %}{{STATIC_URL}}widget-icons/ws.png{% else %}{% if widget.workflow_link %}{{MEDIA_URL}}images/120px-Gears_icon.png{% else %}{% ifequal widget.type 'input' %}{{MEDIA_URL}}images/forward-arrow.png{% else %}{% ifequal widget.type 'output' %}{{MEDIA_URL}}images/forward-arrow.png{% else %}{% ifequal widget.type 'for_output' %}{{MEDIA_URL}}images/Toolbar_-_Loop.png{% else %}{% ifequal widget.type 'for_input' %}{{MEDIA_URL}}images/Toolbar_-_Loop.png{% else %}{{STATIC_URL}}widget-icons/question-mark.png{% endifequal %}{% endifequal %}{% endifequal %}{% endifequal %}{% endif %}{% endif %}{% endif %}{% endif %}')">
         </div></div>
         <div class="outputs">
             {% for output in widget.outputs.all %}