diff --git a/wise-webapp/src/main/webapp/css/css/skin.less b/wise-webapp/src/main/webapp/css/css/skin.less
deleted file mode 100644
index ff43407e..00000000
--- a/wise-webapp/src/main/webapp/css/css/skin.less
+++ /dev/null
@@ -1,3 +0,0 @@
-@header-height: 75px;
-@header-toolbar-height: 35px;
-@header-info-height: @header-height - @header-toolbar-height;
\ No newline at end of file
diff --git a/wise-webapp/src/main/webapp/css/css/embedded.less b/wise-webapp/src/main/webapp/css/embedded.less
similarity index 92%
rename from wise-webapp/src/main/webapp/css/css/embedded.less
rename to wise-webapp/src/main/webapp/css/embedded.less
index 7a363e46..9be38b93 100644
--- a/wise-webapp/src/main/webapp/css/css/embedded.less
+++ b/wise-webapp/src/main/webapp/css/embedded.less
@@ -38,13 +38,13 @@ div#footerLogo {
 }
 
 div#zoomIn {
-    background: url(../images/zoom-in.png) no-repeat left top;
+    background: url(../../images/zoom-in.png) no-repeat left top;
     margin-top: 10px;
     margin-left: 10px;
 }
 
 #zoomOut {
-    background: url(../images/zoom-out.png) no-repeat left top;
+    background: url(../../images/zoom-out.png) no-repeat left top;
     margin-top: 10px;
     margin-left: 5px;
 }
diff --git a/wise-webapp/src/main/webapp/css/css/pageHeaders.css b/wise-webapp/src/main/webapp/css/pageHeaders.css
similarity index 100%
rename from wise-webapp/src/main/webapp/css/css/pageHeaders.css
rename to wise-webapp/src/main/webapp/css/pageHeaders.css
diff --git a/wise-webapp/src/main/webapp/css/css/pageTemplate.css b/wise-webapp/src/main/webapp/css/pageTemplate.css
similarity index 100%
rename from wise-webapp/src/main/webapp/css/css/pageTemplate.css
rename to wise-webapp/src/main/webapp/css/pageTemplate.css
diff --git a/wise-webapp/src/main/webapp/icons/arrow_down.gif b/wise-webapp/src/main/webapp/icons/arrow_down.gif
deleted file mode 100644
index 552f123e..00000000
Binary files a/wise-webapp/src/main/webapp/icons/arrow_down.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/arrow_down.png b/wise-webapp/src/main/webapp/icons/arrow_down.png
deleted file mode 100755
index 2c4e2793..00000000
Binary files a/wise-webapp/src/main/webapp/icons/arrow_down.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/arrow_left.png b/wise-webapp/src/main/webapp/icons/arrow_left.png
deleted file mode 100755
index 5dc69678..00000000
Binary files a/wise-webapp/src/main/webapp/icons/arrow_left.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/arrow_merge.png b/wise-webapp/src/main/webapp/icons/arrow_merge.png
deleted file mode 100755
index 7502dbb3..00000000
Binary files a/wise-webapp/src/main/webapp/icons/arrow_merge.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/arrow_right.png b/wise-webapp/src/main/webapp/icons/arrow_right.png
deleted file mode 100755
index 4bfba64a..00000000
Binary files a/wise-webapp/src/main/webapp/icons/arrow_right.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/arrow_up.png b/wise-webapp/src/main/webapp/icons/arrow_up.png
deleted file mode 100755
index 1ebb1932..00000000
Binary files a/wise-webapp/src/main/webapp/icons/arrow_up.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/arrowc_rotate_anticlockwise.png b/wise-webapp/src/main/webapp/icons/arrowc_rotate_anticlockwise.png
deleted file mode 100755
index 46c75aa8..00000000
Binary files a/wise-webapp/src/main/webapp/icons/arrowc_rotate_anticlockwise.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/arrowc_rotate_clockwise.png b/wise-webapp/src/main/webapp/icons/arrowc_rotate_clockwise.png
deleted file mode 100755
index aa65210e..00000000
Binary files a/wise-webapp/src/main/webapp/icons/arrowc_rotate_clockwise.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/arrowc_turn_left.png b/wise-webapp/src/main/webapp/icons/arrowc_turn_left.png
deleted file mode 100755
index a3d6c9e3..00000000
Binary files a/wise-webapp/src/main/webapp/icons/arrowc_turn_left.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/arrowc_turn_right.png b/wise-webapp/src/main/webapp/icons/arrowc_turn_right.png
deleted file mode 100755
index 629f20d6..00000000
Binary files a/wise-webapp/src/main/webapp/icons/arrowc_turn_right.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/bomb.png b/wise-webapp/src/main/webapp/icons/bomb.png
deleted file mode 100755
index 1be37974..00000000
Binary files a/wise-webapp/src/main/webapp/icons/bomb.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/bulb_light_off.png b/wise-webapp/src/main/webapp/icons/bulb_light_off.png
deleted file mode 100644
index e95b8c5b..00000000
Binary files a/wise-webapp/src/main/webapp/icons/bulb_light_off.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/bulb_light_on.png b/wise-webapp/src/main/webapp/icons/bulb_light_on.png
deleted file mode 100644
index d22fde8b..00000000
Binary files a/wise-webapp/src/main/webapp/icons/bulb_light_on.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/bullet_black.png b/wise-webapp/src/main/webapp/icons/bullet_black.png
deleted file mode 100644
index 57619706..00000000
Binary files a/wise-webapp/src/main/webapp/icons/bullet_black.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/bullet_blue.png b/wise-webapp/src/main/webapp/icons/bullet_blue.png
deleted file mode 100644
index a7651ec8..00000000
Binary files a/wise-webapp/src/main/webapp/icons/bullet_blue.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/bullet_green.png b/wise-webapp/src/main/webapp/icons/bullet_green.png
deleted file mode 100644
index 058ad261..00000000
Binary files a/wise-webapp/src/main/webapp/icons/bullet_green.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/bullet_orange.png b/wise-webapp/src/main/webapp/icons/bullet_orange.png
deleted file mode 100644
index fa63024e..00000000
Binary files a/wise-webapp/src/main/webapp/icons/bullet_orange.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/bullet_pink.png b/wise-webapp/src/main/webapp/icons/bullet_pink.png
deleted file mode 100644
index 0c9f73e3..00000000
Binary files a/wise-webapp/src/main/webapp/icons/bullet_pink.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/bullet_purple.png b/wise-webapp/src/main/webapp/icons/bullet_purple.png
deleted file mode 100644
index 52ba5036..00000000
Binary files a/wise-webapp/src/main/webapp/icons/bullet_purple.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/bullet_red.png b/wise-webapp/src/main/webapp/icons/bullet_red.png
deleted file mode 100644
index 0cd80311..00000000
Binary files a/wise-webapp/src/main/webapp/icons/bullet_red.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/chart_bar.png b/wise-webapp/src/main/webapp/icons/chart_bar.png
deleted file mode 100755
index 9051fbc6..00000000
Binary files a/wise-webapp/src/main/webapp/icons/chart_bar.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/chart_curve.png b/wise-webapp/src/main/webapp/icons/chart_curve.png
deleted file mode 100755
index 01e933a6..00000000
Binary files a/wise-webapp/src/main/webapp/icons/chart_curve.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/chart_line.png b/wise-webapp/src/main/webapp/icons/chart_line.png
deleted file mode 100755
index 85020f32..00000000
Binary files a/wise-webapp/src/main/webapp/icons/chart_line.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/chart_organisation.png b/wise-webapp/src/main/webapp/icons/chart_organisation.png
deleted file mode 100755
index c32d25c1..00000000
Binary files a/wise-webapp/src/main/webapp/icons/chart_organisation.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/chart_pie.png b/wise-webapp/src/main/webapp/icons/chart_pie.png
deleted file mode 100755
index fe00fa05..00000000
Binary files a/wise-webapp/src/main/webapp/icons/chart_pie.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/close.png b/wise-webapp/src/main/webapp/icons/close.png
deleted file mode 100644
index 4de1c381..00000000
Binary files a/wise-webapp/src/main/webapp/icons/close.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/conn_connect.png b/wise-webapp/src/main/webapp/icons/conn_connect.png
deleted file mode 100644
index 024138eb..00000000
Binary files a/wise-webapp/src/main/webapp/icons/conn_connect.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/conn_disconnect.png b/wise-webapp/src/main/webapp/icons/conn_disconnect.png
deleted file mode 100644
index b335cb11..00000000
Binary files a/wise-webapp/src/main/webapp/icons/conn_disconnect.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/face_crying.png b/wise-webapp/src/main/webapp/icons/face_crying.png
deleted file mode 100644
index a7e3f49f..00000000
Binary files a/wise-webapp/src/main/webapp/icons/face_crying.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/face_plain.png b/wise-webapp/src/main/webapp/icons/face_plain.png
deleted file mode 100644
index a6761bd1..00000000
Binary files a/wise-webapp/src/main/webapp/icons/face_plain.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/face_sad.png b/wise-webapp/src/main/webapp/icons/face_sad.png
deleted file mode 100644
index fa258956..00000000
Binary files a/wise-webapp/src/main/webapp/icons/face_sad.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/face_smile-big.png b/wise-webapp/src/main/webapp/icons/face_smile-big.png
deleted file mode 100644
index 4cebcff6..00000000
Binary files a/wise-webapp/src/main/webapp/icons/face_smile-big.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/face_smile.png b/wise-webapp/src/main/webapp/icons/face_smile.png
deleted file mode 100644
index 01e01170..00000000
Binary files a/wise-webapp/src/main/webapp/icons/face_smile.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/face_surprise.png b/wise-webapp/src/main/webapp/icons/face_surprise.png
deleted file mode 100644
index 863f3048..00000000
Binary files a/wise-webapp/src/main/webapp/icons/face_surprise.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/face_wink.png b/wise-webapp/src/main/webapp/icons/face_wink.png
deleted file mode 100644
index 46be6855..00000000
Binary files a/wise-webapp/src/main/webapp/icons/face_wink.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/flag_blue.png b/wise-webapp/src/main/webapp/icons/flag_blue.png
deleted file mode 100755
index 003924f5..00000000
Binary files a/wise-webapp/src/main/webapp/icons/flag_blue.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/flag_green.png b/wise-webapp/src/main/webapp/icons/flag_green.png
deleted file mode 100755
index e4bc611f..00000000
Binary files a/wise-webapp/src/main/webapp/icons/flag_green.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/flag_orange.png b/wise-webapp/src/main/webapp/icons/flag_orange.png
deleted file mode 100755
index e6320242..00000000
Binary files a/wise-webapp/src/main/webapp/icons/flag_orange.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/flag_pink.png b/wise-webapp/src/main/webapp/icons/flag_pink.png
deleted file mode 100755
index 5f15e526..00000000
Binary files a/wise-webapp/src/main/webapp/icons/flag_pink.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/flag_purple.png b/wise-webapp/src/main/webapp/icons/flag_purple.png
deleted file mode 100755
index d0698664..00000000
Binary files a/wise-webapp/src/main/webapp/icons/flag_purple.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/flag_yellow.png b/wise-webapp/src/main/webapp/icons/flag_yellow.png
deleted file mode 100755
index 14c89a54..00000000
Binary files a/wise-webapp/src/main/webapp/icons/flag_yellow.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/funy_angel.png b/wise-webapp/src/main/webapp/icons/funy_angel.png
deleted file mode 100644
index d2c5e940..00000000
Binary files a/wise-webapp/src/main/webapp/icons/funy_angel.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/funy_devilish.png b/wise-webapp/src/main/webapp/icons/funy_devilish.png
deleted file mode 100644
index 8e2cd458..00000000
Binary files a/wise-webapp/src/main/webapp/icons/funy_devilish.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/funy_glasses.png b/wise-webapp/src/main/webapp/icons/funy_glasses.png
deleted file mode 100644
index d13f2c8c..00000000
Binary files a/wise-webapp/src/main/webapp/icons/funy_glasses.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/funy_grin.png b/wise-webapp/src/main/webapp/icons/funy_grin.png
deleted file mode 100644
index d15cf2d4..00000000
Binary files a/wise-webapp/src/main/webapp/icons/funy_grin.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/funy_kiss.png b/wise-webapp/src/main/webapp/icons/funy_kiss.png
deleted file mode 100644
index 809c1cf7..00000000
Binary files a/wise-webapp/src/main/webapp/icons/funy_kiss.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/funy_monkey.png b/wise-webapp/src/main/webapp/icons/funy_monkey.png
deleted file mode 100644
index 69db8fa5..00000000
Binary files a/wise-webapp/src/main/webapp/icons/funy_monkey.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/gener_female.png b/wise-webapp/src/main/webapp/icons/gener_female.png
deleted file mode 100755
index f92958e6..00000000
Binary files a/wise-webapp/src/main/webapp/icons/gener_female.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/gener_male.png b/wise-webapp/src/main/webapp/icons/gener_male.png
deleted file mode 100755
index 25d6ea91..00000000
Binary files a/wise-webapp/src/main/webapp/icons/gener_male.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/hard_cd.png b/wise-webapp/src/main/webapp/icons/hard_cd.png
deleted file mode 100755
index ef432235..00000000
Binary files a/wise-webapp/src/main/webapp/icons/hard_cd.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/hard_computer.png b/wise-webapp/src/main/webapp/icons/hard_computer.png
deleted file mode 100755
index 9bc37dce..00000000
Binary files a/wise-webapp/src/main/webapp/icons/hard_computer.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/hard_controller.png b/wise-webapp/src/main/webapp/icons/hard_controller.png
deleted file mode 100755
index 5cf76ed0..00000000
Binary files a/wise-webapp/src/main/webapp/icons/hard_controller.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/hard_drive_cd.png b/wise-webapp/src/main/webapp/icons/hard_drive_cd.png
deleted file mode 100755
index 1850b701..00000000
Binary files a/wise-webapp/src/main/webapp/icons/hard_drive_cd.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/hard_driver_disk.png b/wise-webapp/src/main/webapp/icons/hard_driver_disk.png
deleted file mode 100755
index 99d532e8..00000000
Binary files a/wise-webapp/src/main/webapp/icons/hard_driver_disk.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/hard_ipod.png b/wise-webapp/src/main/webapp/icons/hard_ipod.png
deleted file mode 100755
index 3f768da5..00000000
Binary files a/wise-webapp/src/main/webapp/icons/hard_ipod.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/hard_keyboard.png b/wise-webapp/src/main/webapp/icons/hard_keyboard.png
deleted file mode 100755
index 898d402d..00000000
Binary files a/wise-webapp/src/main/webapp/icons/hard_keyboard.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/hard_mouse.png b/wise-webapp/src/main/webapp/icons/hard_mouse.png
deleted file mode 100755
index 63a92fa9..00000000
Binary files a/wise-webapp/src/main/webapp/icons/hard_mouse.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/hard_printer.png b/wise-webapp/src/main/webapp/icons/hard_printer.png
deleted file mode 100755
index a350d187..00000000
Binary files a/wise-webapp/src/main/webapp/icons/hard_printer.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/lock_close.png b/wise-webapp/src/main/webapp/icons/lock_close.png
deleted file mode 100755
index 2ebc4f6f..00000000
Binary files a/wise-webapp/src/main/webapp/icons/lock_close.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/lock_open.png b/wise-webapp/src/main/webapp/icons/lock_open.png
deleted file mode 100755
index a471765f..00000000
Binary files a/wise-webapp/src/main/webapp/icons/lock_open.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/mail_edit.png b/wise-webapp/src/main/webapp/icons/mail_edit.png
deleted file mode 100755
index b4d31ce2..00000000
Binary files a/wise-webapp/src/main/webapp/icons/mail_edit.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/mail_envelop.png b/wise-webapp/src/main/webapp/icons/mail_envelop.png
deleted file mode 100755
index 7348aed7..00000000
Binary files a/wise-webapp/src/main/webapp/icons/mail_envelop.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/mail_list.png b/wise-webapp/src/main/webapp/icons/mail_list.png
deleted file mode 100755
index abcd9368..00000000
Binary files a/wise-webapp/src/main/webapp/icons/mail_list.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/mail_mailbox.png b/wise-webapp/src/main/webapp/icons/mail_mailbox.png
deleted file mode 100755
index 8443c23e..00000000
Binary files a/wise-webapp/src/main/webapp/icons/mail_mailbox.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/money_coins.png b/wise-webapp/src/main/webapp/icons/money_coins.png
deleted file mode 100644
index 0ca9074d..00000000
Binary files a/wise-webapp/src/main/webapp/icons/money_coins.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/money_dollar.png b/wise-webapp/src/main/webapp/icons/money_dollar.png
deleted file mode 100755
index 59af1638..00000000
Binary files a/wise-webapp/src/main/webapp/icons/money_dollar.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/money_euro.png b/wise-webapp/src/main/webapp/icons/money_euro.png
deleted file mode 100755
index b322ba92..00000000
Binary files a/wise-webapp/src/main/webapp/icons/money_euro.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/money_money.png b/wise-webapp/src/main/webapp/icons/money_money.png
deleted file mode 100755
index 42c52d05..00000000
Binary files a/wise-webapp/src/main/webapp/icons/money_money.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/money_pound.png b/wise-webapp/src/main/webapp/icons/money_pound.png
deleted file mode 100755
index b7113646..00000000
Binary files a/wise-webapp/src/main/webapp/icons/money_pound.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/money_ruby.png b/wise-webapp/src/main/webapp/icons/money_ruby.png
deleted file mode 100644
index f763a168..00000000
Binary files a/wise-webapp/src/main/webapp/icons/money_ruby.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/money_yen.png b/wise-webapp/src/main/webapp/icons/money_yen.png
deleted file mode 100755
index 228a6778..00000000
Binary files a/wise-webapp/src/main/webapp/icons/money_yen.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/number_1.png b/wise-webapp/src/main/webapp/icons/number_1.png
deleted file mode 100755
index 7e84b55a..00000000
Binary files a/wise-webapp/src/main/webapp/icons/number_1.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/number_2.png b/wise-webapp/src/main/webapp/icons/number_2.png
deleted file mode 100755
index c1f38f54..00000000
Binary files a/wise-webapp/src/main/webapp/icons/number_2.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/number_3.png b/wise-webapp/src/main/webapp/icons/number_3.png
deleted file mode 100755
index 4c7aec83..00000000
Binary files a/wise-webapp/src/main/webapp/icons/number_3.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/number_4.png b/wise-webapp/src/main/webapp/icons/number_4.png
deleted file mode 100755
index 5195f575..00000000
Binary files a/wise-webapp/src/main/webapp/icons/number_4.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/number_5.png b/wise-webapp/src/main/webapp/icons/number_5.png
deleted file mode 100755
index 7ffcb61b..00000000
Binary files a/wise-webapp/src/main/webapp/icons/number_5.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/number_6.png b/wise-webapp/src/main/webapp/icons/number_6.png
deleted file mode 100755
index 14fe947a..00000000
Binary files a/wise-webapp/src/main/webapp/icons/number_6.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/number_7.png b/wise-webapp/src/main/webapp/icons/number_7.png
deleted file mode 100755
index 07edafa0..00000000
Binary files a/wise-webapp/src/main/webapp/icons/number_7.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/number_8.png b/wise-webapp/src/main/webapp/icons/number_8.png
deleted file mode 100755
index cd26e35c..00000000
Binary files a/wise-webapp/src/main/webapp/icons/number_8.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/number_9.png b/wise-webapp/src/main/webapp/icons/number_9.png
deleted file mode 100755
index a3e908ee..00000000
Binary files a/wise-webapp/src/main/webapp/icons/number_9.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/object_bell.png b/wise-webapp/src/main/webapp/icons/object_bell.png
deleted file mode 100755
index 6e0015df..00000000
Binary files a/wise-webapp/src/main/webapp/icons/object_bell.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/object_cake.png b/wise-webapp/src/main/webapp/icons/object_cake.png
deleted file mode 100755
index 4ef151ae..00000000
Binary files a/wise-webapp/src/main/webapp/icons/object_cake.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/object_camera.png b/wise-webapp/src/main/webapp/icons/object_camera.png
deleted file mode 100755
index 8536d1a7..00000000
Binary files a/wise-webapp/src/main/webapp/icons/object_camera.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/object_clanbomber.png b/wise-webapp/src/main/webapp/icons/object_clanbomber.png
deleted file mode 100755
index 1be37974..00000000
Binary files a/wise-webapp/src/main/webapp/icons/object_clanbomber.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/object_clip.png b/wise-webapp/src/main/webapp/icons/object_clip.png
deleted file mode 100755
index ea897cc9..00000000
Binary files a/wise-webapp/src/main/webapp/icons/object_clip.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/object_house.png b/wise-webapp/src/main/webapp/icons/object_house.png
deleted file mode 100755
index fed62219..00000000
Binary files a/wise-webapp/src/main/webapp/icons/object_house.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/object_key.png b/wise-webapp/src/main/webapp/icons/object_key.png
deleted file mode 100755
index 4ec1a928..00000000
Binary files a/wise-webapp/src/main/webapp/icons/object_key.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/object_magnifier.png b/wise-webapp/src/main/webapp/icons/object_magnifier.png
deleted file mode 100755
index cf3d97f7..00000000
Binary files a/wise-webapp/src/main/webapp/icons/object_magnifier.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/object_music.png b/wise-webapp/src/main/webapp/icons/object_music.png
deleted file mode 100755
index a8b3ede3..00000000
Binary files a/wise-webapp/src/main/webapp/icons/object_music.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/object_palette.png b/wise-webapp/src/main/webapp/icons/object_palette.png
deleted file mode 100755
index 73c5b3f2..00000000
Binary files a/wise-webapp/src/main/webapp/icons/object_palette.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/object_pencil.png b/wise-webapp/src/main/webapp/icons/object_pencil.png
deleted file mode 100755
index 0bfecd50..00000000
Binary files a/wise-webapp/src/main/webapp/icons/object_pencil.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/object_phone.png b/wise-webapp/src/main/webapp/icons/object_phone.png
deleted file mode 100755
index c39f162f..00000000
Binary files a/wise-webapp/src/main/webapp/icons/object_phone.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/object_rainbow.png b/wise-webapp/src/main/webapp/icons/object_rainbow.png
deleted file mode 100755
index 5ede989a..00000000
Binary files a/wise-webapp/src/main/webapp/icons/object_rainbow.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/object_star.png b/wise-webapp/src/main/webapp/icons/object_star.png
deleted file mode 100755
index b88c8578..00000000
Binary files a/wise-webapp/src/main/webapp/icons/object_star.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/object_wizard.png b/wise-webapp/src/main/webapp/icons/object_wizard.png
deleted file mode 100755
index 44ccbf81..00000000
Binary files a/wise-webapp/src/main/webapp/icons/object_wizard.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/onoff_add.png b/wise-webapp/src/main/webapp/icons/onoff_add.png
deleted file mode 100644
index 6332fefe..00000000
Binary files a/wise-webapp/src/main/webapp/icons/onoff_add.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/onoff_clock.png b/wise-webapp/src/main/webapp/icons/onoff_clock.png
deleted file mode 100644
index e2672c20..00000000
Binary files a/wise-webapp/src/main/webapp/icons/onoff_clock.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/onoff_clock_red.png b/wise-webapp/src/main/webapp/icons/onoff_clock_red.png
deleted file mode 100644
index 2842cc33..00000000
Binary files a/wise-webapp/src/main/webapp/icons/onoff_clock_red.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/onoff_delete.png b/wise-webapp/src/main/webapp/icons/onoff_delete.png
deleted file mode 100644
index 08f24936..00000000
Binary files a/wise-webapp/src/main/webapp/icons/onoff_delete.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/onoff_status_offline.png b/wise-webapp/src/main/webapp/icons/onoff_status_offline.png
deleted file mode 100755
index a88261a6..00000000
Binary files a/wise-webapp/src/main/webapp/icons/onoff_status_offline.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/onoff_status_online.png b/wise-webapp/src/main/webapp/icons/onoff_status_online.png
deleted file mode 100755
index 947bd4b6..00000000
Binary files a/wise-webapp/src/main/webapp/icons/onoff_status_online.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/people_female1.png b/wise-webapp/src/main/webapp/icons/people_female1.png
deleted file mode 100755
index 7c71de03..00000000
Binary files a/wise-webapp/src/main/webapp/icons/people_female1.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/people_female2.png b/wise-webapp/src/main/webapp/icons/people_female2.png
deleted file mode 100755
index 30383c2d..00000000
Binary files a/wise-webapp/src/main/webapp/icons/people_female2.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/people_group.png b/wise-webapp/src/main/webapp/icons/people_group.png
deleted file mode 100755
index 7fb4e1f1..00000000
Binary files a/wise-webapp/src/main/webapp/icons/people_group.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/people_male1.png b/wise-webapp/src/main/webapp/icons/people_male1.png
deleted file mode 100755
index b3454e15..00000000
Binary files a/wise-webapp/src/main/webapp/icons/people_male1.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/people_male2.png b/wise-webapp/src/main/webapp/icons/people_male2.png
deleted file mode 100755
index 79f35ccb..00000000
Binary files a/wise-webapp/src/main/webapp/icons/people_male2.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/sign_cancel.png b/wise-webapp/src/main/webapp/icons/sign_cancel.png
deleted file mode 100755
index c149c2bc..00000000
Binary files a/wise-webapp/src/main/webapp/icons/sign_cancel.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/sign_closed.png b/wise-webapp/src/main/webapp/icons/sign_closed.png
deleted file mode 100755
index 08f24936..00000000
Binary files a/wise-webapp/src/main/webapp/icons/sign_closed.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/sign_exclamation.png b/wise-webapp/src/main/webapp/icons/sign_exclamation.png
deleted file mode 100755
index c37bd062..00000000
Binary files a/wise-webapp/src/main/webapp/icons/sign_exclamation.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/sign_help.png b/wise-webapp/src/main/webapp/icons/sign_help.png
deleted file mode 100755
index 5c870176..00000000
Binary files a/wise-webapp/src/main/webapp/icons/sign_help.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/sign_info.png b/wise-webapp/src/main/webapp/icons/sign_info.png
deleted file mode 100755
index 12cd1aef..00000000
Binary files a/wise-webapp/src/main/webapp/icons/sign_info.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/sign_stop.png b/wise-webapp/src/main/webapp/icons/sign_stop.png
deleted file mode 100755
index 0cfd5859..00000000
Binary files a/wise-webapp/src/main/webapp/icons/sign_stop.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/sign_warning.png b/wise-webapp/src/main/webapp/icons/sign_warning.png
deleted file mode 100755
index 628cf2da..00000000
Binary files a/wise-webapp/src/main/webapp/icons/sign_warning.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/soft_bug.png b/wise-webapp/src/main/webapp/icons/soft_bug.png
deleted file mode 100755
index 2d5fb90e..00000000
Binary files a/wise-webapp/src/main/webapp/icons/soft_bug.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/soft_cursor.png b/wise-webapp/src/main/webapp/icons/soft_cursor.png
deleted file mode 100755
index 532f532d..00000000
Binary files a/wise-webapp/src/main/webapp/icons/soft_cursor.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/soft_database.png b/wise-webapp/src/main/webapp/icons/soft_database.png
deleted file mode 100755
index 3d09261a..00000000
Binary files a/wise-webapp/src/main/webapp/icons/soft_database.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/soft_database_table.png b/wise-webapp/src/main/webapp/icons/soft_database_table.png
deleted file mode 100755
index 693709cb..00000000
Binary files a/wise-webapp/src/main/webapp/icons/soft_database_table.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/soft_feed.png b/wise-webapp/src/main/webapp/icons/soft_feed.png
deleted file mode 100755
index 315c4f4f..00000000
Binary files a/wise-webapp/src/main/webapp/icons/soft_feed.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/soft_folder_explore.png b/wise-webapp/src/main/webapp/icons/soft_folder_explore.png
deleted file mode 100755
index 0ba93918..00000000
Binary files a/wise-webapp/src/main/webapp/icons/soft_folder_explore.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/soft_penguin.png b/wise-webapp/src/main/webapp/icons/soft_penguin.png
deleted file mode 100755
index bbefe2ec..00000000
Binary files a/wise-webapp/src/main/webapp/icons/soft_penguin.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/soft_rss.png b/wise-webapp/src/main/webapp/icons/soft_rss.png
deleted file mode 100755
index 1dc6ff30..00000000
Binary files a/wise-webapp/src/main/webapp/icons/soft_rss.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/soft_stuff_folder.png b/wise-webapp/src/main/webapp/icons/soft_stuff_folder.png
deleted file mode 100755
index 784e8fa4..00000000
Binary files a/wise-webapp/src/main/webapp/icons/soft_stuff_folder.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/sport_basketball.png b/wise-webapp/src/main/webapp/icons/sport_basketball.png
deleted file mode 100644
index f7a000b9..00000000
Binary files a/wise-webapp/src/main/webapp/icons/sport_basketball.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/sport_football.png b/wise-webapp/src/main/webapp/icons/sport_football.png
deleted file mode 100644
index 199f0f7f..00000000
Binary files a/wise-webapp/src/main/webapp/icons/sport_football.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/sport_golf.png b/wise-webapp/src/main/webapp/icons/sport_golf.png
deleted file mode 100644
index e21fa44c..00000000
Binary files a/wise-webapp/src/main/webapp/icons/sport_golf.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/sport_raquet.png b/wise-webapp/src/main/webapp/icons/sport_raquet.png
deleted file mode 100644
index f5e0f0c2..00000000
Binary files a/wise-webapp/src/main/webapp/icons/sport_raquet.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/sport_shuttlecock.png b/wise-webapp/src/main/webapp/icons/sport_shuttlecock.png
deleted file mode 100644
index 917287fa..00000000
Binary files a/wise-webapp/src/main/webapp/icons/sport_shuttlecock.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/sport_soccer.png b/wise-webapp/src/main/webapp/icons/sport_soccer.png
deleted file mode 100644
index 3eb1828b..00000000
Binary files a/wise-webapp/src/main/webapp/icons/sport_soccer.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/sport_tennis.png b/wise-webapp/src/main/webapp/icons/sport_tennis.png
deleted file mode 100644
index e88a6efa..00000000
Binary files a/wise-webapp/src/main/webapp/icons/sport_tennis.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/tag_blue.png b/wise-webapp/src/main/webapp/icons/tag_blue.png
deleted file mode 100755
index 9757fc6e..00000000
Binary files a/wise-webapp/src/main/webapp/icons/tag_blue.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/tag_blue_add.png b/wise-webapp/src/main/webapp/icons/tag_blue_add.png
deleted file mode 100755
index 887972eb..00000000
Binary files a/wise-webapp/src/main/webapp/icons/tag_blue_add.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/tag_blue_add2.png b/wise-webapp/src/main/webapp/icons/tag_blue_add2.png
deleted file mode 100755
index 997c191a..00000000
Binary files a/wise-webapp/src/main/webapp/icons/tag_blue_add2.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/tag_green.png b/wise-webapp/src/main/webapp/icons/tag_green.png
deleted file mode 100755
index 83ec984b..00000000
Binary files a/wise-webapp/src/main/webapp/icons/tag_green.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/tag_orange.png b/wise-webapp/src/main/webapp/icons/tag_orange.png
deleted file mode 100755
index 454a59f3..00000000
Binary files a/wise-webapp/src/main/webapp/icons/tag_orange.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/tag_pink.png b/wise-webapp/src/main/webapp/icons/tag_pink.png
deleted file mode 100755
index 76e2296c..00000000
Binary files a/wise-webapp/src/main/webapp/icons/tag_pink.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/tag_purple.png b/wise-webapp/src/main/webapp/icons/tag_purple.png
deleted file mode 100755
index ebaf0e87..00000000
Binary files a/wise-webapp/src/main/webapp/icons/tag_purple.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/tag_red.png b/wise-webapp/src/main/webapp/icons/tag_red.png
deleted file mode 100755
index 6ebb37d2..00000000
Binary files a/wise-webapp/src/main/webapp/icons/tag_red.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/tag_yellow.png b/wise-webapp/src/main/webapp/icons/tag_yellow.png
deleted file mode 100755
index 83d12924..00000000
Binary files a/wise-webapp/src/main/webapp/icons/tag_yellow.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/task_0.png b/wise-webapp/src/main/webapp/icons/task_0.png
deleted file mode 100755
index f2bc1a43..00000000
Binary files a/wise-webapp/src/main/webapp/icons/task_0.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/task_100.png b/wise-webapp/src/main/webapp/icons/task_100.png
deleted file mode 100755
index d9e7a29d..00000000
Binary files a/wise-webapp/src/main/webapp/icons/task_100.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/task_25.png b/wise-webapp/src/main/webapp/icons/task_25.png
deleted file mode 100755
index a029e29d..00000000
Binary files a/wise-webapp/src/main/webapp/icons/task_25.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/task_50.png b/wise-webapp/src/main/webapp/icons/task_50.png
deleted file mode 100755
index 5471a2d2..00000000
Binary files a/wise-webapp/src/main/webapp/icons/task_50.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/task_75.png b/wise-webapp/src/main/webapp/icons/task_75.png
deleted file mode 100755
index 55fcb1af..00000000
Binary files a/wise-webapp/src/main/webapp/icons/task_75.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/thumb_thumb_down.png b/wise-webapp/src/main/webapp/icons/thumb_thumb_down.png
deleted file mode 100755
index 3c832d4c..00000000
Binary files a/wise-webapp/src/main/webapp/icons/thumb_thumb_down.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/thumb_thumb_up.png b/wise-webapp/src/main/webapp/icons/thumb_thumb_up.png
deleted file mode 100755
index 2bd16ccf..00000000
Binary files a/wise-webapp/src/main/webapp/icons/thumb_thumb_up.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/tick_cross.png b/wise-webapp/src/main/webapp/icons/tick_cross.png
deleted file mode 100644
index 1514d51a..00000000
Binary files a/wise-webapp/src/main/webapp/icons/tick_cross.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/tick_tick.png b/wise-webapp/src/main/webapp/icons/tick_tick.png
deleted file mode 100644
index a9925a06..00000000
Binary files a/wise-webapp/src/main/webapp/icons/tick_tick.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/time_calendar.png b/wise-webapp/src/main/webapp/icons/time_calendar.png
deleted file mode 100755
index 9740f76e..00000000
Binary files a/wise-webapp/src/main/webapp/icons/time_calendar.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/time_clock.png b/wise-webapp/src/main/webapp/icons/time_clock.png
deleted file mode 100755
index 911da3f1..00000000
Binary files a/wise-webapp/src/main/webapp/icons/time_clock.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/time_hourglass.png b/wise-webapp/src/main/webapp/icons/time_hourglass.png
deleted file mode 100755
index 57b03ce7..00000000
Binary files a/wise-webapp/src/main/webapp/icons/time_hourglass.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/weather_clear-night.png b/wise-webapp/src/main/webapp/icons/weather_clear-night.png
deleted file mode 100644
index 43457526..00000000
Binary files a/wise-webapp/src/main/webapp/icons/weather_clear-night.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/weather_clear.png b/wise-webapp/src/main/webapp/icons/weather_clear.png
deleted file mode 100644
index 7dc15ea9..00000000
Binary files a/wise-webapp/src/main/webapp/icons/weather_clear.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/weather_few-clouds-night.png b/wise-webapp/src/main/webapp/icons/weather_few-clouds-night.png
deleted file mode 100644
index d69efec9..00000000
Binary files a/wise-webapp/src/main/webapp/icons/weather_few-clouds-night.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/weather_few-clouds.png b/wise-webapp/src/main/webapp/icons/weather_few-clouds.png
deleted file mode 100644
index 0e633a38..00000000
Binary files a/wise-webapp/src/main/webapp/icons/weather_few-clouds.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/weather_overcast.png b/wise-webapp/src/main/webapp/icons/weather_overcast.png
deleted file mode 100644
index 0045129b..00000000
Binary files a/wise-webapp/src/main/webapp/icons/weather_overcast.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/weather_severe-alert.png b/wise-webapp/src/main/webapp/icons/weather_severe-alert.png
deleted file mode 100644
index 98e9f6c1..00000000
Binary files a/wise-webapp/src/main/webapp/icons/weather_severe-alert.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/weather_showers-scattered.png b/wise-webapp/src/main/webapp/icons/weather_showers-scattered.png
deleted file mode 100644
index 8d10d844..00000000
Binary files a/wise-webapp/src/main/webapp/icons/weather_showers-scattered.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/weather_showers.png b/wise-webapp/src/main/webapp/icons/weather_showers.png
deleted file mode 100644
index d9685d24..00000000
Binary files a/wise-webapp/src/main/webapp/icons/weather_showers.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/weather_snow.png b/wise-webapp/src/main/webapp/icons/weather_snow.png
deleted file mode 100644
index a83d8559..00000000
Binary files a/wise-webapp/src/main/webapp/icons/weather_snow.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/icons/weather_storm.png b/wise-webapp/src/main/webapp/icons/weather_storm.png
deleted file mode 100644
index feebe1d4..00000000
Binary files a/wise-webapp/src/main/webapp/icons/weather_storm.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/zoom-in.png b/wise-webapp/src/main/webapp/images/zoom-in.png
new file mode 100644
index 00000000..008cfc49
Binary files /dev/null and b/wise-webapp/src/main/webapp/images/zoom-in.png differ
diff --git a/wise-webapp/src/main/webapp/images/zoom-out.png b/wise-webapp/src/main/webapp/images/zoom-out.png
new file mode 100644
index 00000000..158563a2
Binary files /dev/null and b/wise-webapp/src/main/webapp/images/zoom-out.png differ
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
index 84b0b07e..245ea9a2 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
@@ -29,7 +29,7 @@
         var mindmapLocked = ${mindmapLocked};
         var mindmapLockedMsg = '<spring:message code="MINDMAP_LOCKED" arguments="${lockInfo.user.fullName},${lockInfo.user.email}"/>';
         var userOptions = ${mindmap.properties};
-
+        var isAuth = ${principal != null};
     </script>
     <%@ include file="/jsp/googleAnalytics.jsf" %>
 </head>
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp b/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp
index f80a8f13..61940b44 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp
@@ -9,89 +9,24 @@
 
 <html>
 <head>
-    <base href="${requestScope['site.baseurl']}/">
+    <base href="${requestScope['site.baseurl']}/static/mindplot/">
     <title><spring:message code="SITE.TITLE"/> - ${mindmap.title} </title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title><spring:message code="SITE.TITLE"/> - <c:out value="${mindmap.title}"/></title>
+    <link rel="stylesheet/less" type="text/css" href="../../css/embedded.less"/>
+    <script type='text/javascript' src="../../js/less.js"/></script>
+    <link rel="icon" href="../../images/favicon.ico" type="image/x-icon"/>
+    <link rel="shortcut icon" href="../../images/favicon.ico" type="image/x-icon"/>
 
-    <!--[if lt IE 9]>
-    <meta http-equiv="X-UA-Compatible" content="chrome=1">
-    <![endif]-->
-
-    <link rel="stylesheet/less" type="text/css" href="css/embedded.less"/>
-
-    <style type="text/css" media="print">
-        @page {
-            size: A4 landscape;
-        }
-
-        body {
-            overflow: visible
-        }
-
-        #embFooter {
-            display: none;
-        }
-
-        #footerLogo {
-            display: block;
-        }
-
-        div#printLogo {
-            width: 114px;
-            height: 56px;
-            position: absolute;
-            display: list-item;
-            list-style-image: url(../images/logo-xsmall.png);
-            list-style-position: inside;
-            right: 10px;
-            bottom: -30px;
-        }
-
-    </style>
-
-    <script type='text/javascript' src='js/jquery.js'></script>
-    <script type='text/javascript' src='js/jquery-mousewheel.js'></script>
-    <script type='text/javascript' src='js/hotkeys.js'></script>
-    <script type='text/javascript' src='js/underscorejs.js'></script>
-    <script type='text/javascript' src='bootstrap/js/bootstrap.min.js'></script>
-    <script type='text/javascript' src='js/mootools-core.js'></script>
-    <script type='text/javascript' src='js/core.js'></script>
-    <script type='text/javascript' src='js/less.js'></script>
-
-
-    <link rel="icon" href="images/favicon.ico" type="image/x-icon">
-    <link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon">
-
-    <script type="text/javascript">
-        var mapId = '${mindmap.id}';
-
-        $(document).on('loadcomplete', function (resource) {
-
-            // Configure designer options ...
-            var options = loadDesignerOptions();
-            options.locale = '${locale}';
-            options.size.height = options.size.height + 50;
-
-            var userOptions = ${mindmap.properties};
-            options.zoom = userOptions.zoom;
-
-            // Set map id ...
-            options.mapId = mapId;
-
-            // Print is read only ...
-            options.readOnly = true;
-
-            // Configure loader ...
-            options.persistenceManager = new mindplot.LocalStorageManager("c/restful/maps/{id}/document/xml${principal!=null?'':'-pub'}",true);
-
-            // Build designer ...
-            var designer = buildDesigner(options);
-
-            // Load map ...
-            var persistence = mindplot.PersistenceManager.getInstance();
-            var mindmap = mindmap = persistence.load(mapId);
-            designer.loadMap(mindmap);
-        });
-    </script>
+   <script type="text/javascript">
+          var mapId = '${mindmap.id}';
+          var memoryPersistence = true;
+          var readOnly = true;
+          var userOptions = ${mindmap.properties};
+          var locale = '${locale}';
+          var isAuth = ${principal != null};
+     </script>
+     <%@ include file="/jsp/googleAnalytics.jsf" %>
 </head>
 <body>
 
@@ -113,7 +48,6 @@
         </div>
     </div>
 </div>
-<script type="text/javascript" src="js/editor.js"></script>
-<%@ include file="/jsp/googleAnalytics.jsf" %>
+<script src="loader.js"></script>
 </body>
 </html>