diff --git a/addressbook/templates/default/images/accounts.png b/addressbook/templates/default/images/accounts.png
index 55ec69750d..49e0b69bc2 100755
Binary files a/addressbook/templates/default/images/accounts.png and b/addressbook/templates/default/images/accounts.png differ
diff --git a/addressbook/templates/default/images/advanced-search.png b/addressbook/templates/default/images/advanced-search.png
deleted file mode 100644
index cf3d97f75e..0000000000
Binary files a/addressbook/templates/default/images/advanced-search.png and /dev/null differ
diff --git a/addressbook/templates/pixelegg/images/advanced-search.svg b/addressbook/templates/default/images/advanced-search.svg
similarity index 98%
rename from addressbook/templates/pixelegg/images/advanced-search.svg
rename to addressbook/templates/default/images/advanced-search.svg
index c9a1d98d85..436c08809c 100644
--- a/addressbook/templates/pixelegg/images/advanced-search.svg
+++ b/addressbook/templates/default/images/advanced-search.svg
@@ -1,16 +1,16 @@
-
-
-
-
+
+
+
+
diff --git a/addressbook/templates/pixelegg/images/avatar.png b/addressbook/templates/default/images/avatar.png
similarity index 100%
rename from addressbook/templates/pixelegg/images/avatar.png
rename to addressbook/templates/default/images/avatar.png
diff --git a/addressbook/templates/pixelegg/images/cellphone.png b/addressbook/templates/default/images/cellphone.png
similarity index 100%
rename from addressbook/templates/pixelegg/images/cellphone.png
rename to addressbook/templates/default/images/cellphone.png
diff --git a/addressbook/templates/default/images/deleted.png b/addressbook/templates/default/images/deleted.png
old mode 100644
new mode 100755
index 69d558ba6e..21291304b1
Binary files a/addressbook/templates/default/images/deleted.png and b/addressbook/templates/default/images/deleted.png differ
diff --git a/addressbook/templates/default/images/email.png b/addressbook/templates/default/images/email.png
index 45f313f075..bbc8503605 100755
Binary files a/addressbook/templates/default/images/email.png and b/addressbook/templates/default/images/email.png differ
diff --git a/addressbook/templates/default/images/folder.png b/addressbook/templates/default/images/folder.png
index 0472d19c0f..830d6237ea 100755
Binary files a/addressbook/templates/default/images/folder.png and b/addressbook/templates/default/images/folder.png differ
diff --git a/addressbook/templates/default/images/gear.png b/addressbook/templates/default/images/gear.png
index 4ed606c1a4..a1eb313fcf 100755
Binary files a/addressbook/templates/default/images/gear.png and b/addressbook/templates/default/images/gear.png differ
diff --git a/addressbook/templates/default/images/group.png b/addressbook/templates/default/images/group.png
old mode 100644
new mode 100755
index 8f69e2b998..58bb08845c
Binary files a/addressbook/templates/default/images/group.png and b/addressbook/templates/default/images/group.png differ
diff --git a/addressbook/templates/default/images/home.png b/addressbook/templates/default/images/home.png
index af211a553a..52f34bd6fe 100755
Binary files a/addressbook/templates/default/images/home.png and b/addressbook/templates/default/images/home.png differ
diff --git a/addressbook/templates/default/images/infolog.png b/addressbook/templates/default/images/infolog.png
old mode 100644
new mode 100755
index f66d388dc9..85b60d926a
Binary files a/addressbook/templates/default/images/infolog.png and b/addressbook/templates/default/images/infolog.png differ
diff --git a/addressbook/templates/default/images/internet.png b/addressbook/templates/default/images/internet.png
index b4f686787d..e1ea132e13 100755
Binary files a/addressbook/templates/default/images/internet.png and b/addressbook/templates/default/images/internet.png differ
diff --git a/addressbook/templates/default/images/navbar.png b/addressbook/templates/default/images/navbar.png
deleted file mode 100644
index a5cbf22d3e..0000000000
Binary files a/addressbook/templates/default/images/navbar.png and /dev/null differ
diff --git a/addressbook/templates/pixelegg/images/navbar.svg b/addressbook/templates/default/images/navbar.svg
similarity index 98%
rename from addressbook/templates/pixelegg/images/navbar.svg
rename to addressbook/templates/default/images/navbar.svg
index 216af48bb3..ad9ac5eae5 100644
--- a/addressbook/templates/pixelegg/images/navbar.svg
+++ b/addressbook/templates/default/images/navbar.svg
@@ -1,26 +1,26 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/addressbook/templates/default/images/personal.png b/addressbook/templates/default/images/personal.png
index 83e5b318b8..2b74144cf1 100755
Binary files a/addressbook/templates/default/images/personal.png and b/addressbook/templates/default/images/personal.png differ
diff --git a/addressbook/templates/default/images/phone.png b/addressbook/templates/default/images/phone.png
index 58ded805da..addde1668f 100755
Binary files a/addressbook/templates/default/images/phone.png and b/addressbook/templates/default/images/phone.png differ
diff --git a/addressbook/templates/default/images/photo.png b/addressbook/templates/default/images/photo.png
old mode 100644
new mode 100755
index 8879d44b55..394b0d0498
Binary files a/addressbook/templates/default/images/photo.png and b/addressbook/templates/default/images/photo.png differ
diff --git a/addressbook/templates/default/images/private.png b/addressbook/templates/default/images/private.png
index ef8532fd83..375150a65a 100755
Binary files a/addressbook/templates/default/images/private.png and b/addressbook/templates/default/images/private.png differ
diff --git a/addressbook/templates/pixelegg/images/url.png b/addressbook/templates/default/images/url.png
similarity index 100%
rename from addressbook/templates/pixelegg/images/url.png
rename to addressbook/templates/default/images/url.png
diff --git a/addressbook/templates/jerryr/images/navbar-over.png b/addressbook/templates/jerryr/images/navbar-over.png
deleted file mode 100644
index a5cbf22d3e..0000000000
Binary files a/addressbook/templates/jerryr/images/navbar-over.png and /dev/null differ
diff --git a/addressbook/templates/jerryr/images/navbar.png b/addressbook/templates/jerryr/images/navbar.png
deleted file mode 100644
index 3caf26716e..0000000000
Binary files a/addressbook/templates/jerryr/images/navbar.png and /dev/null differ
diff --git a/addressbook/templates/pixelegg/images b/addressbook/templates/pixelegg/images
new file mode 120000
index 0000000000..670e2a1672
--- /dev/null
+++ b/addressbook/templates/pixelegg/images
@@ -0,0 +1 @@
+../default/images
\ No newline at end of file
diff --git a/addressbook/templates/pixelegg/images/accounts.png b/addressbook/templates/pixelegg/images/accounts.png
deleted file mode 100755
index 49e0b69bc2..0000000000
Binary files a/addressbook/templates/pixelegg/images/accounts.png and /dev/null differ
diff --git a/addressbook/templates/pixelegg/images/advanced-search.png b/addressbook/templates/pixelegg/images/advanced-search.png
deleted file mode 100644
index f7e3f68b11..0000000000
Binary files a/addressbook/templates/pixelegg/images/advanced-search.png and /dev/null differ
diff --git a/addressbook/templates/pixelegg/images/deleted.png b/addressbook/templates/pixelegg/images/deleted.png
deleted file mode 100755
index 21291304b1..0000000000
Binary files a/addressbook/templates/pixelegg/images/deleted.png and /dev/null differ
diff --git a/addressbook/templates/pixelegg/images/email.png b/addressbook/templates/pixelegg/images/email.png
deleted file mode 100755
index bbc8503605..0000000000
Binary files a/addressbook/templates/pixelegg/images/email.png and /dev/null differ
diff --git a/addressbook/templates/pixelegg/images/folder.png b/addressbook/templates/pixelegg/images/folder.png
deleted file mode 100755
index 830d6237ea..0000000000
Binary files a/addressbook/templates/pixelegg/images/folder.png and /dev/null differ
diff --git a/addressbook/templates/pixelegg/images/gear.png b/addressbook/templates/pixelegg/images/gear.png
deleted file mode 100755
index a1eb313fcf..0000000000
Binary files a/addressbook/templates/pixelegg/images/gear.png and /dev/null differ
diff --git a/addressbook/templates/pixelegg/images/group.png b/addressbook/templates/pixelegg/images/group.png
deleted file mode 100755
index 58bb08845c..0000000000
Binary files a/addressbook/templates/pixelegg/images/group.png and /dev/null differ
diff --git a/addressbook/templates/pixelegg/images/home.png b/addressbook/templates/pixelegg/images/home.png
deleted file mode 100755
index 52f34bd6fe..0000000000
Binary files a/addressbook/templates/pixelegg/images/home.png and /dev/null differ
diff --git a/addressbook/templates/pixelegg/images/infolog.png b/addressbook/templates/pixelegg/images/infolog.png
deleted file mode 100755
index 85b60d926a..0000000000
Binary files a/addressbook/templates/pixelegg/images/infolog.png and /dev/null differ
diff --git a/addressbook/templates/pixelegg/images/internet.png b/addressbook/templates/pixelegg/images/internet.png
deleted file mode 100755
index e1ea132e13..0000000000
Binary files a/addressbook/templates/pixelegg/images/internet.png and /dev/null differ
diff --git a/addressbook/templates/pixelegg/images/navbar.png b/addressbook/templates/pixelegg/images/navbar.png
deleted file mode 100644
index 00d04e6d58..0000000000
Binary files a/addressbook/templates/pixelegg/images/navbar.png and /dev/null differ
diff --git a/addressbook/templates/pixelegg/images/personal.png b/addressbook/templates/pixelegg/images/personal.png
deleted file mode 100755
index 2b74144cf1..0000000000
Binary files a/addressbook/templates/pixelegg/images/personal.png and /dev/null differ
diff --git a/addressbook/templates/pixelegg/images/phone.png b/addressbook/templates/pixelegg/images/phone.png
deleted file mode 100755
index addde1668f..0000000000
Binary files a/addressbook/templates/pixelegg/images/phone.png and /dev/null differ
diff --git a/addressbook/templates/pixelegg/images/photo.png b/addressbook/templates/pixelegg/images/photo.png
deleted file mode 100755
index 394b0d0498..0000000000
Binary files a/addressbook/templates/pixelegg/images/photo.png and /dev/null differ
diff --git a/addressbook/templates/pixelegg/images/private.png b/addressbook/templates/pixelegg/images/private.png
deleted file mode 100755
index 375150a65a..0000000000
Binary files a/addressbook/templates/pixelegg/images/private.png and /dev/null differ
diff --git a/admin/templates/default/images/navbar.png b/admin/templates/default/images/navbar.png
deleted file mode 100644
index db96734be9..0000000000
Binary files a/admin/templates/default/images/navbar.png and /dev/null differ
diff --git a/admin/templates/pixelegg/images/navbar.svg b/admin/templates/default/images/navbar.svg
similarity index 98%
rename from admin/templates/pixelegg/images/navbar.svg
rename to admin/templates/default/images/navbar.svg
index b6143726a1..280244adfd 100644
--- a/admin/templates/pixelegg/images/navbar.svg
+++ b/admin/templates/default/images/navbar.svg
@@ -1,32 +1,32 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/admin/templates/jerryr/images/navbar-over.png b/admin/templates/jerryr/images/navbar-over.png
deleted file mode 100644
index db96734be9..0000000000
Binary files a/admin/templates/jerryr/images/navbar-over.png and /dev/null differ
diff --git a/admin/templates/jerryr/images/navbar.png b/admin/templates/jerryr/images/navbar.png
deleted file mode 100644
index 8a768d496a..0000000000
Binary files a/admin/templates/jerryr/images/navbar.png and /dev/null differ
diff --git a/admin/templates/pixelegg/images b/admin/templates/pixelegg/images
new file mode 120000
index 0000000000..670e2a1672
--- /dev/null
+++ b/admin/templates/pixelegg/images
@@ -0,0 +1 @@
+../default/images
\ No newline at end of file
diff --git a/admin/templates/pixelegg/images/navbar.png b/admin/templates/pixelegg/images/navbar.png
deleted file mode 100644
index 5f0e21e733..0000000000
Binary files a/admin/templates/pixelegg/images/navbar.png and /dev/null differ
diff --git a/api/templates/default/images/download.png b/api/templates/default/images/download.png
deleted file mode 100644
index de7ebf9a1d..0000000000
Binary files a/api/templates/default/images/download.png and /dev/null differ
diff --git a/api/templates/default/images/login_logo.png b/api/templates/default/images/login_logo.png
deleted file mode 100644
index b6c0fff473..0000000000
Binary files a/api/templates/default/images/login_logo.png and /dev/null differ
diff --git a/api/templates/default/images/logo.png b/api/templates/default/images/logo.png
deleted file mode 100644
index b24a09e366..0000000000
Binary files a/api/templates/default/images/logo.png and /dev/null differ
diff --git a/api/templates/default/images/logo164x164.png b/api/templates/default/images/logo164x164.png
deleted file mode 100644
index bf779480a7..0000000000
Binary files a/api/templates/default/images/logo164x164.png and /dev/null differ
diff --git a/api/templates/default/images/navbar.png b/api/templates/default/images/navbar.png
deleted file mode 100644
index c2613cbff7..0000000000
Binary files a/api/templates/default/images/navbar.png and /dev/null differ
diff --git a/api/templates/default/images/share.png b/api/templates/default/images/share.png
deleted file mode 100644
index 92337a0501..0000000000
Binary files a/api/templates/default/images/share.png and /dev/null differ
diff --git a/calendar/templates/default/images/1_day_view.png b/calendar/templates/default/images/1_day_view.png
deleted file mode 100755
index 8b016df6d6..0000000000
Binary files a/calendar/templates/default/images/1_day_view.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/1_day_view.svg b/calendar/templates/default/images/1_day_view.svg
similarity index 98%
rename from calendar/templates/pixelegg/images/1_day_view.svg
rename to calendar/templates/default/images/1_day_view.svg
index 439e63b404..19a9ab6d1c 100644
--- a/calendar/templates/pixelegg/images/1_day_view.svg
+++ b/calendar/templates/default/images/1_day_view.svg
@@ -1,15 +1,15 @@
-
-
-
-
+
+
+
+
diff --git a/calendar/templates/pixelegg/images/4_day_view.svg b/calendar/templates/default/images/4_day_view.svg
similarity index 98%
rename from calendar/templates/pixelegg/images/4_day_view.svg
rename to calendar/templates/default/images/4_day_view.svg
index 5ae11afbca..acd74f8335 100644
--- a/calendar/templates/pixelegg/images/4_day_view.svg
+++ b/calendar/templates/default/images/4_day_view.svg
@@ -1,16 +1,16 @@
-
-
-
-
+
+
+
+
diff --git a/calendar/templates/default/images/accepted.png b/calendar/templates/default/images/accepted.png
index 5ec2aba581..a570914c64 100755
Binary files a/calendar/templates/default/images/accepted.png and b/calendar/templates/default/images/accepted.png differ
diff --git a/calendar/templates/default/images/alarm.png b/calendar/templates/default/images/alarm.png
old mode 100644
new mode 100755
index 7a3fcae59a..6e0f354a7d
Binary files a/calendar/templates/default/images/alarm.png and b/calendar/templates/default/images/alarm.png differ
diff --git a/calendar/templates/default/images/cake.png b/calendar/templates/default/images/cake.png
deleted file mode 100755
index 24539123d1..0000000000
Binary files a/calendar/templates/default/images/cake.png and /dev/null differ
diff --git a/calendar/templates/default/images/date.png b/calendar/templates/default/images/date.png
index 8b016df6d6..47396d1cd0 100755
Binary files a/calendar/templates/default/images/date.png and b/calendar/templates/default/images/date.png differ
diff --git a/calendar/templates/pixelegg/images/day.svg b/calendar/templates/default/images/day.svg
similarity index 98%
rename from calendar/templates/pixelegg/images/day.svg
rename to calendar/templates/default/images/day.svg
index 86b8f4bd67..3e2b008ff3 100644
--- a/calendar/templates/pixelegg/images/day.svg
+++ b/calendar/templates/default/images/day.svg
@@ -1,22 +1,22 @@
-
-
-
-
+
+
+
+
diff --git a/calendar/templates/default/images/forward.png b/calendar/templates/default/images/forward.png
old mode 100644
new mode 100755
index 7986c31f45..d93aba38ff
Binary files a/calendar/templates/default/images/forward.png and b/calendar/templates/default/images/forward.png differ
diff --git a/calendar/templates/default/images/high.png b/calendar/templates/default/images/high.png
old mode 100644
new mode 100755
index 429ee98186..647d46d87e
Binary files a/calendar/templates/default/images/high.png and b/calendar/templates/default/images/high.png differ
diff --git a/calendar/templates/default/images/list_view.png b/calendar/templates/default/images/list_view.png
deleted file mode 100644
index ecaa54be38..0000000000
Binary files a/calendar/templates/default/images/list_view.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/list_view.svg b/calendar/templates/default/images/list_view.svg
similarity index 98%
rename from calendar/templates/pixelegg/images/list_view.svg
rename to calendar/templates/default/images/list_view.svg
index e80283f7bd..d6261fefc1 100644
--- a/calendar/templates/pixelegg/images/list_view.svg
+++ b/calendar/templates/default/images/list_view.svg
@@ -1,13 +1,13 @@
-
-
-
+
+
+
-
+
diff --git a/calendar/templates/default/images/month_view.png b/calendar/templates/default/images/month_view.png
deleted file mode 100644
index 20b66c2393..0000000000
Binary files a/calendar/templates/default/images/month_view.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/month_view.svg b/calendar/templates/default/images/month_view.svg
similarity index 98%
rename from calendar/templates/pixelegg/images/month_view.svg
rename to calendar/templates/default/images/month_view.svg
index 6b54710bd7..6a6788d126 100644
--- a/calendar/templates/pixelegg/images/month_view.svg
+++ b/calendar/templates/default/images/month_view.svg
@@ -1,20 +1,20 @@
-
-
-
-
+
+
+
+
diff --git a/calendar/templates/default/images/multiweek_view.png b/calendar/templates/default/images/multiweek_view.png
deleted file mode 100644
index 774eccfa0a..0000000000
Binary files a/calendar/templates/default/images/multiweek_view.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/multiweek_view.svg b/calendar/templates/default/images/multiweek_view.svg
similarity index 98%
rename from calendar/templates/pixelegg/images/multiweek_view.svg
rename to calendar/templates/default/images/multiweek_view.svg
index 00c7233642..2aef0663a1 100644
--- a/calendar/templates/pixelegg/images/multiweek_view.svg
+++ b/calendar/templates/default/images/multiweek_view.svg
@@ -1,14 +1,14 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/calendar/templates/default/images/navbar.png b/calendar/templates/default/images/navbar.png
deleted file mode 100644
index 7b9c92e33c..0000000000
Binary files a/calendar/templates/default/images/navbar.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/navbar.svg b/calendar/templates/default/images/navbar.svg
similarity index 98%
rename from calendar/templates/pixelegg/images/navbar.svg
rename to calendar/templates/default/images/navbar.svg
index 99bb7e1d88..d6172e3456 100644
--- a/calendar/templates/pixelegg/images/navbar.svg
+++ b/calendar/templates/default/images/navbar.svg
@@ -1,23 +1,23 @@
-
-
-
-
+
+
+
+
diff --git a/calendar/templates/default/images/needs-action.png b/calendar/templates/default/images/needs-action.png
index dffe0115e3..ae59b01b40 100755
Binary files a/calendar/templates/default/images/needs-action.png and b/calendar/templates/default/images/needs-action.png differ
diff --git a/calendar/templates/pixelegg/images/new.png b/calendar/templates/default/images/new.png
similarity index 100%
rename from calendar/templates/pixelegg/images/new.png
rename to calendar/templates/default/images/new.png
diff --git a/calendar/templates/default/images/next.png b/calendar/templates/default/images/next.png
deleted file mode 100644
index 3d1b6d52cd..0000000000
Binary files a/calendar/templates/default/images/next.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/next.svg b/calendar/templates/default/images/next.svg
similarity index 98%
rename from calendar/templates/pixelegg/images/next.svg
rename to calendar/templates/default/images/next.svg
index cf69823dd9..530f503fc1 100755
--- a/calendar/templates/pixelegg/images/next.svg
+++ b/calendar/templates/default/images/next.svg
@@ -1,14 +1,14 @@
-
-
-
+
+
+
-
+
diff --git a/calendar/templates/default/images/nonblocking.png b/calendar/templates/default/images/nonblocking.png
old mode 100644
new mode 100755
index c3ff243b85..dd7f074f48
Binary files a/calendar/templates/default/images/nonblocking.png and b/calendar/templates/default/images/nonblocking.png differ
diff --git a/calendar/templates/pixelegg/images/planner_category_view.svg b/calendar/templates/default/images/planner_category_view.svg
similarity index 97%
rename from calendar/templates/pixelegg/images/planner_category_view.svg
rename to calendar/templates/default/images/planner_category_view.svg
index 4411b869d2..31539e60bb 100644
--- a/calendar/templates/pixelegg/images/planner_category_view.svg
+++ b/calendar/templates/default/images/planner_category_view.svg
@@ -1,22 +1,22 @@
-
-
-
-
+
+
+
+
diff --git a/calendar/templates/default/images/planner_view.png b/calendar/templates/default/images/planner_view.png
deleted file mode 100644
index 32729ad90a..0000000000
Binary files a/calendar/templates/default/images/planner_view.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/planner_view.svg b/calendar/templates/default/images/planner_view.svg
similarity index 98%
rename from calendar/templates/pixelegg/images/planner_view.svg
rename to calendar/templates/default/images/planner_view.svg
index 9afcbf350f..97eea6bc53 100644
--- a/calendar/templates/pixelegg/images/planner_view.svg
+++ b/calendar/templates/default/images/planner_view.svg
@@ -1,23 +1,23 @@
-
-
-
-
+
+
+
+
diff --git a/calendar/templates/default/images/previous.png b/calendar/templates/default/images/previous.png
deleted file mode 100644
index 8db1953895..0000000000
Binary files a/calendar/templates/default/images/previous.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/previous.svg b/calendar/templates/default/images/previous.svg
similarity index 98%
rename from calendar/templates/pixelegg/images/previous.svg
rename to calendar/templates/default/images/previous.svg
index 566b9747c3..3e35bf7253 100755
--- a/calendar/templates/pixelegg/images/previous.svg
+++ b/calendar/templates/default/images/previous.svg
@@ -1,14 +1,14 @@
-
-
-
+
+
+
-
+
diff --git a/calendar/templates/default/images/private.png b/calendar/templates/default/images/private.png
old mode 100644
new mode 100755
index 242ef0d552..4227a227eb
Binary files a/calendar/templates/default/images/private.png and b/calendar/templates/default/images/private.png differ
diff --git a/calendar/templates/default/images/recur.png b/calendar/templates/default/images/recur.png
old mode 100644
new mode 100755
index eb0388df4c..0355d37f7d
Binary files a/calendar/templates/default/images/recur.png and b/calendar/templates/default/images/recur.png differ
diff --git a/calendar/templates/default/images/rejected.png b/calendar/templates/default/images/rejected.png
index c4ec9c9f99..a11be5a7cd 100755
Binary files a/calendar/templates/default/images/rejected.png and b/calendar/templates/default/images/rejected.png differ
diff --git a/calendar/templates/default/images/single.png b/calendar/templates/default/images/single.png
old mode 100644
new mode 100755
index 20d6aaf18d..fde99f9d76
Binary files a/calendar/templates/default/images/single.png and b/calendar/templates/default/images/single.png differ
diff --git a/calendar/templates/default/images/tentative.png b/calendar/templates/default/images/tentative.png
deleted file mode 100755
index aa9f1a778f..0000000000
Binary files a/calendar/templates/default/images/tentative.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/tentative.svg b/calendar/templates/default/images/tentative.svg
similarity index 98%
rename from calendar/templates/pixelegg/images/tentative.svg
rename to calendar/templates/default/images/tentative.svg
index acd6262692..2fc6f97386 100644
--- a/calendar/templates/pixelegg/images/tentative.svg
+++ b/calendar/templates/default/images/tentative.svg
@@ -1,14 +1,14 @@
-
-
-
-
+
+
+
+
diff --git a/calendar/templates/default/images/today.png b/calendar/templates/default/images/today.png
deleted file mode 100644
index 3c9e085eae..0000000000
Binary files a/calendar/templates/default/images/today.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/today.svg b/calendar/templates/default/images/today.svg
similarity index 98%
rename from calendar/templates/pixelegg/images/today.svg
rename to calendar/templates/default/images/today.svg
index 656cb1b514..a95fc0b0a5 100644
--- a/calendar/templates/pixelegg/images/today.svg
+++ b/calendar/templates/default/images/today.svg
@@ -1,17 +1,17 @@
-
-
-
+
+
+
-
+
diff --git a/calendar/templates/pixelegg/images/videoconference.svg b/calendar/templates/default/images/videoconference.svg
similarity index 100%
rename from calendar/templates/pixelegg/images/videoconference.svg
rename to calendar/templates/default/images/videoconference.svg
diff --git a/calendar/templates/default/images/week_view.png b/calendar/templates/default/images/week_view.png
deleted file mode 100644
index ed59c37e1b..0000000000
Binary files a/calendar/templates/default/images/week_view.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/week_view.svg b/calendar/templates/default/images/week_view.svg
similarity index 98%
rename from calendar/templates/pixelegg/images/week_view.svg
rename to calendar/templates/default/images/week_view.svg
index bf5641bc3d..d02b08e452 100644
--- a/calendar/templates/pixelegg/images/week_view.svg
+++ b/calendar/templates/default/images/week_view.svg
@@ -1,15 +1,15 @@
-
-
-
-
+
+
+
+
diff --git a/calendar/templates/default/images/year_view.png b/calendar/templates/default/images/year_view.png
deleted file mode 100644
index 8888a410e2..0000000000
Binary files a/calendar/templates/default/images/year_view.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/year_view.svg b/calendar/templates/default/images/year_view.svg
similarity index 98%
rename from calendar/templates/pixelegg/images/year_view.svg
rename to calendar/templates/default/images/year_view.svg
index f16e594c9f..b2e08e1e23 100644
--- a/calendar/templates/pixelegg/images/year_view.svg
+++ b/calendar/templates/default/images/year_view.svg
@@ -1,20 +1,20 @@
-
-
-
+
+
+
-
+
diff --git a/calendar/templates/jerryr/images/list.png b/calendar/templates/jerryr/images/list.png
deleted file mode 100644
index ecaa54be38..0000000000
Binary files a/calendar/templates/jerryr/images/list.png and /dev/null differ
diff --git a/calendar/templates/jerryr/images/month.png b/calendar/templates/jerryr/images/month.png
deleted file mode 100644
index 20b66c2393..0000000000
Binary files a/calendar/templates/jerryr/images/month.png and /dev/null differ
diff --git a/calendar/templates/jerryr/images/navbar-over.png b/calendar/templates/jerryr/images/navbar-over.png
deleted file mode 100644
index 7b9c92e33c..0000000000
Binary files a/calendar/templates/jerryr/images/navbar-over.png and /dev/null differ
diff --git a/calendar/templates/jerryr/images/navbar.png b/calendar/templates/jerryr/images/navbar.png
deleted file mode 100644
index 7f5f208b7d..0000000000
Binary files a/calendar/templates/jerryr/images/navbar.png and /dev/null differ
diff --git a/calendar/templates/jerryr/images/planner.png b/calendar/templates/jerryr/images/planner.png
deleted file mode 100644
index 32729ad90a..0000000000
Binary files a/calendar/templates/jerryr/images/planner.png and /dev/null differ
diff --git a/calendar/templates/jerryr/images/today.png b/calendar/templates/jerryr/images/today.png
deleted file mode 100644
index 3c9e085eae..0000000000
Binary files a/calendar/templates/jerryr/images/today.png and /dev/null differ
diff --git a/calendar/templates/jerryr/images/week.png b/calendar/templates/jerryr/images/week.png
deleted file mode 100644
index 8d9de14858..0000000000
Binary files a/calendar/templates/jerryr/images/week.png and /dev/null differ
diff --git a/calendar/templates/jerryr/images/year.png b/calendar/templates/jerryr/images/year.png
deleted file mode 100644
index 8888a410e2..0000000000
Binary files a/calendar/templates/jerryr/images/year.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images b/calendar/templates/pixelegg/images
new file mode 120000
index 0000000000..670e2a1672
--- /dev/null
+++ b/calendar/templates/pixelegg/images
@@ -0,0 +1 @@
+../default/images
\ No newline at end of file
diff --git a/calendar/templates/pixelegg/images/4_day_view.png b/calendar/templates/pixelegg/images/4_day_view.png
deleted file mode 100644
index e719503860..0000000000
Binary files a/calendar/templates/pixelegg/images/4_day_view.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/accepted.png b/calendar/templates/pixelegg/images/accepted.png
deleted file mode 100755
index a570914c64..0000000000
Binary files a/calendar/templates/pixelegg/images/accepted.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/alarm.png b/calendar/templates/pixelegg/images/alarm.png
deleted file mode 100755
index 6e0f354a7d..0000000000
Binary files a/calendar/templates/pixelegg/images/alarm.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/cake.png b/calendar/templates/pixelegg/images/cake.png
deleted file mode 100755
index f29e315154..0000000000
Binary files a/calendar/templates/pixelegg/images/cake.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/date.png b/calendar/templates/pixelegg/images/date.png
deleted file mode 100755
index 47396d1cd0..0000000000
Binary files a/calendar/templates/pixelegg/images/date.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/day.png b/calendar/templates/pixelegg/images/day.png
deleted file mode 100755
index 20a9b762ca..0000000000
Binary files a/calendar/templates/pixelegg/images/day.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/forward.png b/calendar/templates/pixelegg/images/forward.png
deleted file mode 100755
index d93aba38ff..0000000000
Binary files a/calendar/templates/pixelegg/images/forward.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/high.png b/calendar/templates/pixelegg/images/high.png
deleted file mode 100755
index 647d46d87e..0000000000
Binary files a/calendar/templates/pixelegg/images/high.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/list_view.png b/calendar/templates/pixelegg/images/list_view.png
deleted file mode 100755
index 15c40c84b1..0000000000
Binary files a/calendar/templates/pixelegg/images/list_view.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/month_view.png b/calendar/templates/pixelegg/images/month_view.png
deleted file mode 100755
index 470faaaaba..0000000000
Binary files a/calendar/templates/pixelegg/images/month_view.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/multiweek_view.png b/calendar/templates/pixelegg/images/multiweek_view.png
deleted file mode 100755
index 14a0dbaab8..0000000000
Binary files a/calendar/templates/pixelegg/images/multiweek_view.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/navbar.png b/calendar/templates/pixelegg/images/navbar.png
deleted file mode 100644
index 3de1973cc7..0000000000
Binary files a/calendar/templates/pixelegg/images/navbar.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/needs-action.png b/calendar/templates/pixelegg/images/needs-action.png
deleted file mode 100755
index ae59b01b40..0000000000
Binary files a/calendar/templates/pixelegg/images/needs-action.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/next.png b/calendar/templates/pixelegg/images/next.png
deleted file mode 100755
index 0934c41d0f..0000000000
Binary files a/calendar/templates/pixelegg/images/next.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/nonblocking.png b/calendar/templates/pixelegg/images/nonblocking.png
deleted file mode 100755
index dd7f074f48..0000000000
Binary files a/calendar/templates/pixelegg/images/nonblocking.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/planner_category_view.png b/calendar/templates/pixelegg/images/planner_category_view.png
deleted file mode 100644
index a92653086b..0000000000
Binary files a/calendar/templates/pixelegg/images/planner_category_view.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/planner_view.png b/calendar/templates/pixelegg/images/planner_view.png
deleted file mode 100755
index 35a103d674..0000000000
Binary files a/calendar/templates/pixelegg/images/planner_view.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/previous.png b/calendar/templates/pixelegg/images/previous.png
deleted file mode 100755
index 39dd691b60..0000000000
Binary files a/calendar/templates/pixelegg/images/previous.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/private.png b/calendar/templates/pixelegg/images/private.png
deleted file mode 100755
index 4227a227eb..0000000000
Binary files a/calendar/templates/pixelegg/images/private.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/recur.png b/calendar/templates/pixelegg/images/recur.png
deleted file mode 100755
index 0355d37f7d..0000000000
Binary files a/calendar/templates/pixelegg/images/recur.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/rejected.png b/calendar/templates/pixelegg/images/rejected.png
deleted file mode 100755
index a11be5a7cd..0000000000
Binary files a/calendar/templates/pixelegg/images/rejected.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/single.png b/calendar/templates/pixelegg/images/single.png
deleted file mode 100755
index fde99f9d76..0000000000
Binary files a/calendar/templates/pixelegg/images/single.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/tentative.png b/calendar/templates/pixelegg/images/tentative.png
deleted file mode 100755
index 60a4a2d242..0000000000
Binary files a/calendar/templates/pixelegg/images/tentative.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/today.png b/calendar/templates/pixelegg/images/today.png
deleted file mode 100755
index 47396d1cd0..0000000000
Binary files a/calendar/templates/pixelegg/images/today.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/week_view.png b/calendar/templates/pixelegg/images/week_view.png
deleted file mode 100755
index 46523d05df..0000000000
Binary files a/calendar/templates/pixelegg/images/week_view.png and /dev/null differ
diff --git a/calendar/templates/pixelegg/images/year_view.png b/calendar/templates/pixelegg/images/year_view.png
deleted file mode 100755
index 12c31201dd..0000000000
Binary files a/calendar/templates/pixelegg/images/year_view.png and /dev/null differ
diff --git a/filemanager/templates/default/images/button_createdir.png b/filemanager/templates/default/images/button_createdir.png
deleted file mode 100644
index 1277281fcc..0000000000
Binary files a/filemanager/templates/default/images/button_createdir.png and /dev/null differ
diff --git a/filemanager/templates/pixelegg/images/button_createdir.svg b/filemanager/templates/default/images/button_createdir.svg
similarity index 98%
rename from filemanager/templates/pixelegg/images/button_createdir.svg
rename to filemanager/templates/default/images/button_createdir.svg
index e85a739c93..26739ca32d 100644
--- a/filemanager/templates/pixelegg/images/button_createdir.svg
+++ b/filemanager/templates/default/images/button_createdir.svg
@@ -1,25 +1,25 @@
-
-
-
-
+
+
+
+
diff --git a/filemanager/templates/pixelegg/images/buttonseparator.png b/filemanager/templates/default/images/buttonseparator.png
similarity index 100%
rename from filemanager/templates/pixelegg/images/buttonseparator.png
rename to filemanager/templates/default/images/buttonseparator.png
diff --git a/filemanager/templates/pixelegg/images/cancel.png b/filemanager/templates/default/images/cancel.png
similarity index 100%
rename from filemanager/templates/pixelegg/images/cancel.png
rename to filemanager/templates/default/images/cancel.png
diff --git a/filemanager/templates/default/images/createdir_disabled.png b/filemanager/templates/default/images/createdir_disabled.png
old mode 100644
new mode 100755
index 6a23ed913e..f9cb0cde11
Binary files a/filemanager/templates/default/images/createdir_disabled.png and b/filemanager/templates/default/images/createdir_disabled.png differ
diff --git a/filemanager/templates/default/images/editcopy.png b/filemanager/templates/default/images/editcopy.png
old mode 100644
new mode 100755
index eac4d8c93b..78647ae4dc
Binary files a/filemanager/templates/default/images/editcopy.png and b/filemanager/templates/default/images/editcopy.png differ
diff --git a/filemanager/templates/default/images/editcut.png b/filemanager/templates/default/images/editcut.png
old mode 100644
new mode 100755
index 192b5757a7..d9c59b5bf0
Binary files a/filemanager/templates/default/images/editcut.png and b/filemanager/templates/default/images/editcut.png differ
diff --git a/filemanager/templates/default/images/editpaste.png b/filemanager/templates/default/images/editpaste.png
deleted file mode 100644
index b8454f91da..0000000000
Binary files a/filemanager/templates/default/images/editpaste.png and /dev/null differ
diff --git a/filemanager/templates/pixelegg/images/editpaste.svg b/filemanager/templates/default/images/editpaste.svg
similarity index 98%
rename from filemanager/templates/pixelegg/images/editpaste.svg
rename to filemanager/templates/default/images/editpaste.svg
index 88f56fec35..904e8d09d4 100644
--- a/filemanager/templates/pixelegg/images/editpaste.svg
+++ b/filemanager/templates/default/images/editpaste.svg
@@ -1,19 +1,19 @@
-
-
-
-
+
+
+
+
diff --git a/filemanager/templates/default/images/editpaste_disabled.png b/filemanager/templates/default/images/editpaste_disabled.png
old mode 100644
new mode 100755
index 0e741c31fb..746e8fbd6c
Binary files a/filemanager/templates/default/images/editpaste_disabled.png and b/filemanager/templates/default/images/editpaste_disabled.png differ
diff --git a/filemanager/templates/default/images/favorites.png b/filemanager/templates/default/images/favorites.png
old mode 100644
new mode 100755
index 028869cbe3..ba38e4b6c5
Binary files a/filemanager/templates/default/images/favorites.png and b/filemanager/templates/default/images/favorites.png differ
diff --git a/filemanager/templates/default/images/gohome.png b/filemanager/templates/default/images/gohome.png
deleted file mode 100644
index 37a5231bac..0000000000
Binary files a/filemanager/templates/default/images/gohome.png and /dev/null differ
diff --git a/filemanager/templates/pixelegg/images/gohome.svg b/filemanager/templates/default/images/gohome.svg
similarity index 98%
rename from filemanager/templates/pixelegg/images/gohome.svg
rename to filemanager/templates/default/images/gohome.svg
index dd2a6c90da..c3528b86a9 100644
--- a/filemanager/templates/pixelegg/images/gohome.svg
+++ b/filemanager/templates/default/images/gohome.svg
@@ -1,14 +1,14 @@
-
-
-
+
+
+
-
+
diff --git a/filemanager/templates/default/images/goup.png b/filemanager/templates/default/images/goup.png
deleted file mode 100644
index 2db1ce62fa..0000000000
Binary files a/filemanager/templates/default/images/goup.png and /dev/null differ
diff --git a/filemanager/templates/pixelegg/images/goup.svg b/filemanager/templates/default/images/goup.svg
similarity index 98%
rename from filemanager/templates/pixelegg/images/goup.svg
rename to filemanager/templates/default/images/goup.svg
index 789bd85d51..254b8a9267 100644
--- a/filemanager/templates/pixelegg/images/goup.svg
+++ b/filemanager/templates/default/images/goup.svg
@@ -1,12 +1,12 @@
-
-
-
-
+
+
+
+
diff --git a/filemanager/templates/pixelegg/images/gradient01.png b/filemanager/templates/default/images/gradient01.png
similarity index 100%
rename from filemanager/templates/pixelegg/images/gradient01.png
rename to filemanager/templates/default/images/gradient01.png
diff --git a/filemanager/templates/default/images/key_enter.png b/filemanager/templates/default/images/key_enter.png
old mode 100644
new mode 100755
index 98488014af..4d0690bc39
Binary files a/filemanager/templates/default/images/key_enter.png and b/filemanager/templates/default/images/key_enter.png differ
diff --git a/filemanager/templates/default/images/link.png b/filemanager/templates/default/images/link.png
deleted file mode 100644
index fbe6247ab7..0000000000
Binary files a/filemanager/templates/default/images/link.png and /dev/null differ
diff --git a/filemanager/templates/pixelegg/images/link.svg b/filemanager/templates/default/images/link.svg
similarity index 98%
rename from filemanager/templates/pixelegg/images/link.svg
rename to filemanager/templates/default/images/link.svg
index f8723b9b91..c92133ed8d 100644
--- a/filemanager/templates/pixelegg/images/link.svg
+++ b/filemanager/templates/default/images/link.svg
@@ -1,16 +1,16 @@
-
-
-
-
+
+
+
+
diff --git a/filemanager/templates/default/images/link_disabled.png b/filemanager/templates/default/images/link_disabled.png
old mode 100644
new mode 100755
index facfd456dc..a542231938
Binary files a/filemanager/templates/default/images/link_disabled.png and b/filemanager/templates/default/images/link_disabled.png differ
diff --git a/filemanager/templates/default/images/linkpaste.png b/filemanager/templates/default/images/linkpaste.png
deleted file mode 100644
index f3988f63e4..0000000000
Binary files a/filemanager/templates/default/images/linkpaste.png and /dev/null differ
diff --git a/filemanager/templates/pixelegg/images/linkpaste.svg b/filemanager/templates/default/images/linkpaste.svg
similarity index 98%
rename from filemanager/templates/pixelegg/images/linkpaste.svg
rename to filemanager/templates/default/images/linkpaste.svg
index 6e86b1ded9..0627ab4d86 100644
--- a/filemanager/templates/pixelegg/images/linkpaste.svg
+++ b/filemanager/templates/default/images/linkpaste.svg
@@ -1,25 +1,25 @@
-
-
-
-
+
+
+
+
diff --git a/filemanager/templates/default/images/linkpaste_disabled.png b/filemanager/templates/default/images/linkpaste_disabled.png
old mode 100644
new mode 100755
index 4a1f58962c..3f22c669b2
Binary files a/filemanager/templates/default/images/linkpaste_disabled.png and b/filemanager/templates/default/images/linkpaste_disabled.png differ
diff --git a/filemanager/templates/default/images/list_row.png b/filemanager/templates/default/images/list_row.png
deleted file mode 100644
index 189c68cae3..0000000000
Binary files a/filemanager/templates/default/images/list_row.png and /dev/null differ
diff --git a/filemanager/templates/pixelegg/images/list_row.svg b/filemanager/templates/default/images/list_row.svg
similarity index 98%
rename from filemanager/templates/pixelegg/images/list_row.svg
rename to filemanager/templates/default/images/list_row.svg
index e80283f7bd..d6261fefc1 100644
--- a/filemanager/templates/pixelegg/images/list_row.svg
+++ b/filemanager/templates/default/images/list_row.svg
@@ -1,13 +1,13 @@
-
-
-
+
+
+
-
+
diff --git a/filemanager/templates/default/images/list_tile.png b/filemanager/templates/default/images/list_tile.png
deleted file mode 100644
index d3963f5e91..0000000000
Binary files a/filemanager/templates/default/images/list_tile.png and /dev/null differ
diff --git a/filemanager/templates/pixelegg/images/list_tile.svg b/filemanager/templates/default/images/list_tile.svg
similarity index 98%
rename from filemanager/templates/pixelegg/images/list_tile.svg
rename to filemanager/templates/default/images/list_tile.svg
index 7568c3b615..f347bef919 100644
--- a/filemanager/templates/pixelegg/images/list_tile.svg
+++ b/filemanager/templates/default/images/list_tile.svg
@@ -1,19 +1,19 @@
-
-
-
-
+
+
+
+
diff --git a/filemanager/templates/default/images/mail_post_to.png b/filemanager/templates/default/images/mail_post_to.png
old mode 100644
new mode 100755
index f847716055..32c058badf
Binary files a/filemanager/templates/default/images/mail_post_to.png and b/filemanager/templates/default/images/mail_post_to.png differ
diff --git a/filemanager/templates/default/images/mailpaste.png b/filemanager/templates/default/images/mailpaste.png
deleted file mode 100644
index fdf2cfc04b..0000000000
Binary files a/filemanager/templates/default/images/mailpaste.png and /dev/null differ
diff --git a/filemanager/templates/pixelegg/images/mailpaste.svg b/filemanager/templates/default/images/mailpaste.svg
similarity index 98%
rename from filemanager/templates/pixelegg/images/mailpaste.svg
rename to filemanager/templates/default/images/mailpaste.svg
index 27e09747da..64f28372b9 100644
--- a/filemanager/templates/pixelegg/images/mailpaste.svg
+++ b/filemanager/templates/default/images/mailpaste.svg
@@ -1,18 +1,18 @@
-
-
-
-
+
+
+
+
diff --git a/filemanager/templates/default/images/mailpaste_disabled.png b/filemanager/templates/default/images/mailpaste_disabled.png
old mode 100644
new mode 100755
index 462a25107d..e6962a4b18
Binary files a/filemanager/templates/default/images/mailpaste_disabled.png and b/filemanager/templates/default/images/mailpaste_disabled.png differ
diff --git a/filemanager/templates/default/images/navbar.png b/filemanager/templates/default/images/navbar.png
deleted file mode 100644
index 0644f13170..0000000000
Binary files a/filemanager/templates/default/images/navbar.png and /dev/null differ
diff --git a/filemanager/templates/pixelegg/images/navbar.svg b/filemanager/templates/default/images/navbar.svg
similarity index 98%
rename from filemanager/templates/pixelegg/images/navbar.svg
rename to filemanager/templates/default/images/navbar.svg
index fae7755ddc..a6738ece2f 100644
--- a/filemanager/templates/pixelegg/images/navbar.svg
+++ b/filemanager/templates/default/images/navbar.svg
@@ -1,11 +1,11 @@
-
-
-
-
+
+
+
+
diff --git a/filemanager/templates/pixelegg/images/upload.svg b/filemanager/templates/default/images/upload.svg
similarity index 100%
rename from filemanager/templates/pixelegg/images/upload.svg
rename to filemanager/templates/default/images/upload.svg
diff --git a/filemanager/templates/jerryr/images/button_bookmark.png b/filemanager/templates/jerryr/images/button_bookmark.png
deleted file mode 100644
index ced954c97f..0000000000
Binary files a/filemanager/templates/jerryr/images/button_bookmark.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/button_bookmark_add.png b/filemanager/templates/jerryr/images/button_bookmark_add.png
deleted file mode 100644
index ce4fea6004..0000000000
Binary files a/filemanager/templates/jerryr/images/button_bookmark_add.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/button_cancel.png b/filemanager/templates/jerryr/images/button_cancel.png
deleted file mode 100644
index 96919575af..0000000000
Binary files a/filemanager/templates/jerryr/images/button_cancel.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/button_copy_to.png b/filemanager/templates/jerryr/images/button_copy_to.png
deleted file mode 100644
index eac4d8c93b..0000000000
Binary files a/filemanager/templates/jerryr/images/button_copy_to.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/button_createdir.png b/filemanager/templates/jerryr/images/button_createdir.png
deleted file mode 100644
index 1277281fcc..0000000000
Binary files a/filemanager/templates/jerryr/images/button_createdir.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/button_createfile.png b/filemanager/templates/jerryr/images/button_createfile.png
deleted file mode 100644
index cfc3615fec..0000000000
Binary files a/filemanager/templates/jerryr/images/button_createfile.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/button_cut.png b/filemanager/templates/jerryr/images/button_cut.png
deleted file mode 100644
index 192b5757a7..0000000000
Binary files a/filemanager/templates/jerryr/images/button_cut.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/button_delete.png b/filemanager/templates/jerryr/images/button_delete.png
deleted file mode 100644
index 8a7b73f84c..0000000000
Binary files a/filemanager/templates/jerryr/images/button_delete.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/button_download.png b/filemanager/templates/jerryr/images/button_download.png
deleted file mode 100644
index 4cfd6dd661..0000000000
Binary files a/filemanager/templates/jerryr/images/button_download.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/button_edit.png b/filemanager/templates/jerryr/images/button_edit.png
deleted file mode 100644
index ce8b226710..0000000000
Binary files a/filemanager/templates/jerryr/images/button_edit.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/button_edit_comments.png b/filemanager/templates/jerryr/images/button_edit_comments.png
deleted file mode 100644
index 92a7fd9da1..0000000000
Binary files a/filemanager/templates/jerryr/images/button_edit_comments.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/button_edit_preview.png b/filemanager/templates/jerryr/images/button_edit_preview.png
deleted file mode 100644
index 54db9af36b..0000000000
Binary files a/filemanager/templates/jerryr/images/button_edit_preview.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/button_goto.png b/filemanager/templates/jerryr/images/button_goto.png
deleted file mode 100644
index b29eec1611..0000000000
Binary files a/filemanager/templates/jerryr/images/button_goto.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/button_home.png b/filemanager/templates/jerryr/images/button_home.png
deleted file mode 100644
index 3afa803379..0000000000
Binary files a/filemanager/templates/jerryr/images/button_home.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/button_info.png b/filemanager/templates/jerryr/images/button_info.png
deleted file mode 100644
index 3626ba7ee6..0000000000
Binary files a/filemanager/templates/jerryr/images/button_info.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/button_mail.png b/filemanager/templates/jerryr/images/button_mail.png
deleted file mode 100644
index 384cbf34e9..0000000000
Binary files a/filemanager/templates/jerryr/images/button_mail.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/button_move_to.png b/filemanager/templates/jerryr/images/button_move_to.png
deleted file mode 100644
index b2daa04291..0000000000
Binary files a/filemanager/templates/jerryr/images/button_move_to.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/button_ok.png b/filemanager/templates/jerryr/images/button_ok.png
deleted file mode 100644
index 31c064ba92..0000000000
Binary files a/filemanager/templates/jerryr/images/button_ok.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/button_paste.png b/filemanager/templates/jerryr/images/button_paste.png
deleted file mode 100644
index b8454f91da..0000000000
Binary files a/filemanager/templates/jerryr/images/button_paste.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/button_reload.png b/filemanager/templates/jerryr/images/button_reload.png
deleted file mode 100644
index 9b80d879c7..0000000000
Binary files a/filemanager/templates/jerryr/images/button_reload.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/button_rename.png b/filemanager/templates/jerryr/images/button_rename.png
deleted file mode 100644
index 4d2a11e04c..0000000000
Binary files a/filemanager/templates/jerryr/images/button_rename.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/button_save.png b/filemanager/templates/jerryr/images/button_save.png
deleted file mode 100644
index 943719aef4..0000000000
Binary files a/filemanager/templates/jerryr/images/button_save.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/button_search.png b/filemanager/templates/jerryr/images/button_search.png
deleted file mode 100644
index da3da6d625..0000000000
Binary files a/filemanager/templates/jerryr/images/button_search.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/button_search2.png b/filemanager/templates/jerryr/images/button_search2.png
deleted file mode 100644
index 40762a0250..0000000000
Binary files a/filemanager/templates/jerryr/images/button_search2.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/button_trash.png b/filemanager/templates/jerryr/images/button_trash.png
deleted file mode 100644
index 7b7b610e2e..0000000000
Binary files a/filemanager/templates/jerryr/images/button_trash.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/button_tree.png b/filemanager/templates/jerryr/images/button_tree.png
deleted file mode 100644
index ddf73f5f6e..0000000000
Binary files a/filemanager/templates/jerryr/images/button_tree.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/button_up.png b/filemanager/templates/jerryr/images/button_up.png
deleted file mode 100644
index 8ec228df6b..0000000000
Binary files a/filemanager/templates/jerryr/images/button_up.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/button_upload.png b/filemanager/templates/jerryr/images/button_upload.png
deleted file mode 100644
index 9727c1029b..0000000000
Binary files a/filemanager/templates/jerryr/images/button_upload.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/button_zip.png b/filemanager/templates/jerryr/images/button_zip.png
deleted file mode 100644
index 741b05ffd7..0000000000
Binary files a/filemanager/templates/jerryr/images/button_zip.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/editcopy.png b/filemanager/templates/jerryr/images/editcopy.png
deleted file mode 100644
index eac4d8c93b..0000000000
Binary files a/filemanager/templates/jerryr/images/editcopy.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/editcut.png b/filemanager/templates/jerryr/images/editcut.png
deleted file mode 100644
index 192b5757a7..0000000000
Binary files a/filemanager/templates/jerryr/images/editcut.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/editpaste.png b/filemanager/templates/jerryr/images/editpaste.png
deleted file mode 100644
index b8454f91da..0000000000
Binary files a/filemanager/templates/jerryr/images/editpaste.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/folder-home.png b/filemanager/templates/jerryr/images/folder-home.png
deleted file mode 100644
index 3afa803379..0000000000
Binary files a/filemanager/templates/jerryr/images/folder-home.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/folder-open.png b/filemanager/templates/jerryr/images/folder-open.png
deleted file mode 100644
index 33cc0bb90e..0000000000
Binary files a/filemanager/templates/jerryr/images/folder-open.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/folder-up.png b/filemanager/templates/jerryr/images/folder-up.png
deleted file mode 100644
index 8ec228df6b..0000000000
Binary files a/filemanager/templates/jerryr/images/folder-up.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/folder.png b/filemanager/templates/jerryr/images/folder.png
deleted file mode 100644
index dfd6894289..0000000000
Binary files a/filemanager/templates/jerryr/images/folder.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/folder_home.png b/filemanager/templates/jerryr/images/folder_home.png
deleted file mode 100644
index 3afa803379..0000000000
Binary files a/filemanager/templates/jerryr/images/folder_home.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/folder_open.png b/filemanager/templates/jerryr/images/folder_open.png
deleted file mode 100644
index 33cc0bb90e..0000000000
Binary files a/filemanager/templates/jerryr/images/folder_open.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/folder_up.png b/filemanager/templates/jerryr/images/folder_up.png
deleted file mode 100644
index 8ec228df6b..0000000000
Binary files a/filemanager/templates/jerryr/images/folder_up.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/locked.png b/filemanager/templates/jerryr/images/locked.png
deleted file mode 100644
index 669dc8d4d4..0000000000
Binary files a/filemanager/templates/jerryr/images/locked.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/mime16_directory.png b/filemanager/templates/jerryr/images/mime16_directory.png
deleted file mode 100644
index 4b545f3e34..0000000000
Binary files a/filemanager/templates/jerryr/images/mime16_directory.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/mime16_text_plain.png b/filemanager/templates/jerryr/images/mime16_text_plain.png
deleted file mode 100644
index 91772c15e9..0000000000
Binary files a/filemanager/templates/jerryr/images/mime16_text_plain.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/mime16_unknown.png b/filemanager/templates/jerryr/images/mime16_unknown.png
deleted file mode 100644
index f68776b977..0000000000
Binary files a/filemanager/templates/jerryr/images/mime16_unknown.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/mime16up.png b/filemanager/templates/jerryr/images/mime16up.png
deleted file mode 100644
index 500baa6589..0000000000
Binary files a/filemanager/templates/jerryr/images/mime16up.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/navbar-over.png b/filemanager/templates/jerryr/images/navbar-over.png
deleted file mode 100644
index 0644f13170..0000000000
Binary files a/filemanager/templates/jerryr/images/navbar-over.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/navbar.png b/filemanager/templates/jerryr/images/navbar.png
deleted file mode 100644
index ff698f43bb..0000000000
Binary files a/filemanager/templates/jerryr/images/navbar.png and /dev/null differ
diff --git a/filemanager/templates/jerryr/images/spacer.gif b/filemanager/templates/jerryr/images/spacer.gif
deleted file mode 100755
index 5bfd67a2d6..0000000000
Binary files a/filemanager/templates/jerryr/images/spacer.gif and /dev/null differ
diff --git a/filemanager/templates/pixelegg/images b/filemanager/templates/pixelegg/images
new file mode 120000
index 0000000000..670e2a1672
--- /dev/null
+++ b/filemanager/templates/pixelegg/images
@@ -0,0 +1 @@
+../default/images
\ No newline at end of file
diff --git a/filemanager/templates/pixelegg/images/button_createdir.png b/filemanager/templates/pixelegg/images/button_createdir.png
deleted file mode 100755
index 7be08cf249..0000000000
Binary files a/filemanager/templates/pixelegg/images/button_createdir.png and /dev/null differ
diff --git a/filemanager/templates/pixelegg/images/createdir_disabled.png b/filemanager/templates/pixelegg/images/createdir_disabled.png
deleted file mode 100755
index f9cb0cde11..0000000000
Binary files a/filemanager/templates/pixelegg/images/createdir_disabled.png and /dev/null differ
diff --git a/filemanager/templates/pixelegg/images/editcopy.png b/filemanager/templates/pixelegg/images/editcopy.png
deleted file mode 100755
index 78647ae4dc..0000000000
Binary files a/filemanager/templates/pixelegg/images/editcopy.png and /dev/null differ
diff --git a/filemanager/templates/pixelegg/images/editcut.png b/filemanager/templates/pixelegg/images/editcut.png
deleted file mode 100755
index d9c59b5bf0..0000000000
Binary files a/filemanager/templates/pixelegg/images/editcut.png and /dev/null differ
diff --git a/filemanager/templates/pixelegg/images/editpaste.png b/filemanager/templates/pixelegg/images/editpaste.png
deleted file mode 100755
index 7b0a88257b..0000000000
Binary files a/filemanager/templates/pixelegg/images/editpaste.png and /dev/null differ
diff --git a/filemanager/templates/pixelegg/images/editpaste_disabled.png b/filemanager/templates/pixelegg/images/editpaste_disabled.png
deleted file mode 100755
index 746e8fbd6c..0000000000
Binary files a/filemanager/templates/pixelegg/images/editpaste_disabled.png and /dev/null differ
diff --git a/filemanager/templates/pixelegg/images/favorites.png b/filemanager/templates/pixelegg/images/favorites.png
deleted file mode 100755
index ba38e4b6c5..0000000000
Binary files a/filemanager/templates/pixelegg/images/favorites.png and /dev/null differ
diff --git a/filemanager/templates/pixelegg/images/gohome.png b/filemanager/templates/pixelegg/images/gohome.png
deleted file mode 100755
index 31f7c7bc3b..0000000000
Binary files a/filemanager/templates/pixelegg/images/gohome.png and /dev/null differ
diff --git a/filemanager/templates/pixelegg/images/goup.png b/filemanager/templates/pixelegg/images/goup.png
deleted file mode 100755
index 0b6065c2bd..0000000000
Binary files a/filemanager/templates/pixelegg/images/goup.png and /dev/null differ
diff --git a/filemanager/templates/pixelegg/images/key_enter.png b/filemanager/templates/pixelegg/images/key_enter.png
deleted file mode 100755
index 4d0690bc39..0000000000
Binary files a/filemanager/templates/pixelegg/images/key_enter.png and /dev/null differ
diff --git a/filemanager/templates/pixelegg/images/link.png b/filemanager/templates/pixelegg/images/link.png
deleted file mode 100755
index b88ed9797e..0000000000
Binary files a/filemanager/templates/pixelegg/images/link.png and /dev/null differ
diff --git a/filemanager/templates/pixelegg/images/link_disabled.png b/filemanager/templates/pixelegg/images/link_disabled.png
deleted file mode 100755
index a542231938..0000000000
Binary files a/filemanager/templates/pixelegg/images/link_disabled.png and /dev/null differ
diff --git a/filemanager/templates/pixelegg/images/linkpaste.png b/filemanager/templates/pixelegg/images/linkpaste.png
deleted file mode 100755
index 041f0b52c1..0000000000
Binary files a/filemanager/templates/pixelegg/images/linkpaste.png and /dev/null differ
diff --git a/filemanager/templates/pixelegg/images/linkpaste_disabled.png b/filemanager/templates/pixelegg/images/linkpaste_disabled.png
deleted file mode 100755
index 3f22c669b2..0000000000
Binary files a/filemanager/templates/pixelegg/images/linkpaste_disabled.png and /dev/null differ
diff --git a/filemanager/templates/pixelegg/images/list_row.png b/filemanager/templates/pixelegg/images/list_row.png
deleted file mode 100644
index 333f56c66c..0000000000
Binary files a/filemanager/templates/pixelegg/images/list_row.png and /dev/null differ
diff --git a/filemanager/templates/pixelegg/images/list_tile.png b/filemanager/templates/pixelegg/images/list_tile.png
deleted file mode 100644
index 8ac4c9133e..0000000000
Binary files a/filemanager/templates/pixelegg/images/list_tile.png and /dev/null differ
diff --git a/filemanager/templates/pixelegg/images/navbar.png b/filemanager/templates/pixelegg/images/navbar.png
deleted file mode 100644
index 025ea7c3d5..0000000000
Binary files a/filemanager/templates/pixelegg/images/navbar.png and /dev/null differ
diff --git a/filemanager/templates/pixelegg/images/upload.png b/filemanager/templates/pixelegg/images/upload.png
deleted file mode 100755
index eef9a67e3c..0000000000
Binary files a/filemanager/templates/pixelegg/images/upload.png and /dev/null differ
diff --git a/home/templates/default/images/navbar.png b/home/templates/default/images/navbar.png
deleted file mode 100755
index 5205539fbe..0000000000
Binary files a/home/templates/default/images/navbar.png and /dev/null differ
diff --git a/home/templates/pixelegg/images/navbar.svg b/home/templates/default/images/navbar.svg
similarity index 98%
rename from home/templates/pixelegg/images/navbar.svg
rename to home/templates/default/images/navbar.svg
index dd2a6c90da..c3528b86a9 100644
--- a/home/templates/pixelegg/images/navbar.svg
+++ b/home/templates/default/images/navbar.svg
@@ -1,14 +1,14 @@
-
-
-
+
+
+
-
+
diff --git a/home/templates/jerryr/images/navbar-over.png b/home/templates/jerryr/images/navbar-over.png
deleted file mode 100644
index 5205539fbe..0000000000
Binary files a/home/templates/jerryr/images/navbar-over.png and /dev/null differ
diff --git a/home/templates/jerryr/images/navbar.png b/home/templates/jerryr/images/navbar.png
deleted file mode 100644
index f1725add7f..0000000000
Binary files a/home/templates/jerryr/images/navbar.png and /dev/null differ
diff --git a/home/templates/pixelegg/images b/home/templates/pixelegg/images
new file mode 120000
index 0000000000..670e2a1672
--- /dev/null
+++ b/home/templates/pixelegg/images
@@ -0,0 +1 @@
+../default/images
\ No newline at end of file
diff --git a/home/templates/pixelegg/images/navbar.png b/home/templates/pixelegg/images/navbar.png
deleted file mode 100644
index 852df5676d..0000000000
Binary files a/home/templates/pixelegg/images/navbar.png and /dev/null differ
diff --git a/importexport/templates/default/images/export.png b/importexport/templates/default/images/export.png
index d3b500a83b..249d12c0ad 100755
Binary files a/importexport/templates/default/images/export.png and b/importexport/templates/default/images/export.png differ
diff --git a/importexport/templates/default/images/fileexport.png b/importexport/templates/default/images/fileexport.png
old mode 100644
new mode 100755
index 381bfc0539..4387eaf4b1
Binary files a/importexport/templates/default/images/fileexport.png and b/importexport/templates/default/images/fileexport.png differ
diff --git a/importexport/templates/default/images/fileimport.png b/importexport/templates/default/images/fileimport.png
old mode 100644
new mode 100755
index 32baf9c549..fabdd2f403
Binary files a/importexport/templates/default/images/fileimport.png and b/importexport/templates/default/images/fileimport.png differ
diff --git a/importexport/templates/default/images/import.png b/importexport/templates/default/images/import.png
index 5a7b5140cd..b9867dfc22 100755
Binary files a/importexport/templates/default/images/import.png and b/importexport/templates/default/images/import.png differ
diff --git a/importexport/templates/default/images/navbar.png b/importexport/templates/default/images/navbar.png
deleted file mode 100644
index 21c7750168..0000000000
Binary files a/importexport/templates/default/images/navbar.png and /dev/null differ
diff --git a/importexport/templates/pixelegg/images/navbar.svg b/importexport/templates/default/images/navbar.svg
similarity index 98%
rename from importexport/templates/pixelegg/images/navbar.svg
rename to importexport/templates/default/images/navbar.svg
index 13032e2357..825b57255e 100755
--- a/importexport/templates/pixelegg/images/navbar.svg
+++ b/importexport/templates/default/images/navbar.svg
@@ -1,14 +1,14 @@
-
-
-
+
+
+
-
+
diff --git a/importexport/templates/pixelegg/images b/importexport/templates/pixelegg/images
new file mode 120000
index 0000000000..670e2a1672
--- /dev/null
+++ b/importexport/templates/pixelegg/images
@@ -0,0 +1 @@
+../default/images
\ No newline at end of file
diff --git a/importexport/templates/pixelegg/images/export.png b/importexport/templates/pixelegg/images/export.png
deleted file mode 100755
index 249d12c0ad..0000000000
Binary files a/importexport/templates/pixelegg/images/export.png and /dev/null differ
diff --git a/importexport/templates/pixelegg/images/fileexport.png b/importexport/templates/pixelegg/images/fileexport.png
deleted file mode 100755
index 4387eaf4b1..0000000000
Binary files a/importexport/templates/pixelegg/images/fileexport.png and /dev/null differ
diff --git a/importexport/templates/pixelegg/images/fileimport.png b/importexport/templates/pixelegg/images/fileimport.png
deleted file mode 100755
index fabdd2f403..0000000000
Binary files a/importexport/templates/pixelegg/images/fileimport.png and /dev/null differ
diff --git a/importexport/templates/pixelegg/images/import.png b/importexport/templates/pixelegg/images/import.png
deleted file mode 100755
index b9867dfc22..0000000000
Binary files a/importexport/templates/pixelegg/images/import.png and /dev/null differ
diff --git a/importexport/templates/pixelegg/images/navbar.png b/importexport/templates/pixelegg/images/navbar.png
deleted file mode 100644
index 2b894f8dc6..0000000000
Binary files a/importexport/templates/pixelegg/images/navbar.png and /dev/null differ
diff --git a/infolog/templates/default/images/archive.png b/infolog/templates/default/images/archive.png
old mode 100644
new mode 100755
index 945a6ebc8c..93707820fd
Binary files a/infolog/templates/default/images/archive.png and b/infolog/templates/default/images/archive.png differ
diff --git a/infolog/templates/default/images/billed.png b/infolog/templates/default/images/billed.png
old mode 100644
new mode 100755
index a03c6e7760..643316347a
Binary files a/infolog/templates/default/images/billed.png and b/infolog/templates/default/images/billed.png differ
diff --git a/infolog/templates/default/images/call.png b/infolog/templates/default/images/call.png
old mode 100644
new mode 100755
index d002c42d30..a0af827cd1
Binary files a/infolog/templates/default/images/call.png and b/infolog/templates/default/images/call.png differ
diff --git a/infolog/templates/default/images/cancelled.png b/infolog/templates/default/images/cancelled.png
old mode 100644
new mode 100755
index 2415dfc78b..d79d282360
Binary files a/infolog/templates/default/images/cancelled.png and b/infolog/templates/default/images/cancelled.png differ
diff --git a/infolog/templates/pixelegg/images/close.png b/infolog/templates/default/images/close.png
similarity index 100%
rename from infolog/templates/pixelegg/images/close.png
rename to infolog/templates/default/images/close.png
diff --git a/infolog/templates/default/images/deleted.png b/infolog/templates/default/images/deleted.png
old mode 100644
new mode 100755
index 69d558ba6e..474681afbf
Binary files a/infolog/templates/default/images/deleted.png and b/infolog/templates/default/images/deleted.png differ
diff --git a/infolog/templates/default/images/done.png b/infolog/templates/default/images/done.png
old mode 100644
new mode 100755
index 543710fb7b..7739ccb6cb
Binary files a/infolog/templates/default/images/done.png and b/infolog/templates/default/images/done.png differ
diff --git a/infolog/templates/default/images/done_all.png b/infolog/templates/default/images/done_all.png
old mode 100644
new mode 100755
index 7df66bc11c..5ff8941b9d
Binary files a/infolog/templates/default/images/done_all.png and b/infolog/templates/default/images/done_all.png differ
diff --git a/infolog/templates/default/images/email.png b/infolog/templates/default/images/email.png
old mode 100644
new mode 100755
index cf7160ab42..e798f888f9
Binary files a/infolog/templates/default/images/email.png and b/infolog/templates/default/images/email.png differ
diff --git a/infolog/templates/pixelegg/images/filesave.png b/infolog/templates/default/images/filesave.png
similarity index 100%
rename from infolog/templates/pixelegg/images/filesave.png
rename to infolog/templates/default/images/filesave.png
diff --git a/infolog/templates/default/images/navbar.png b/infolog/templates/default/images/navbar.png
deleted file mode 100644
index 4b32f09441..0000000000
Binary files a/infolog/templates/default/images/navbar.png and /dev/null differ
diff --git a/infolog/templates/pixelegg/images/navbar.svg b/infolog/templates/default/images/navbar.svg
similarity index 98%
rename from infolog/templates/pixelegg/images/navbar.svg
rename to infolog/templates/default/images/navbar.svg
index 7c9916dd9e..172c35c08e 100644
--- a/infolog/templates/pixelegg/images/navbar.svg
+++ b/infolog/templates/default/images/navbar.svg
@@ -1,21 +1,21 @@
-
-
-
+
+
+
diff --git a/infolog/templates/default/images/nonactive.png b/infolog/templates/default/images/nonactive.png
old mode 100644
new mode 100755
index a77152b5b6..dc0de46eb5
Binary files a/infolog/templates/default/images/nonactive.png and b/infolog/templates/default/images/nonactive.png differ
diff --git a/infolog/templates/default/images/not-started.png b/infolog/templates/default/images/not-started.png
old mode 100644
new mode 100755
index 2083104f4e..ebbf4a5cb9
Binary files a/infolog/templates/default/images/not-started.png and b/infolog/templates/default/images/not-started.png differ
diff --git a/infolog/templates/default/images/note.png b/infolog/templates/default/images/note.png
old mode 100644
new mode 100755
index 0355076122..ad9b59d937
Binary files a/infolog/templates/default/images/note.png and b/infolog/templates/default/images/note.png differ
diff --git a/infolog/templates/default/images/ongoing.png b/infolog/templates/default/images/ongoing.png
old mode 100644
new mode 100755
index b80c72091f..48b61a2e89
Binary files a/infolog/templates/default/images/ongoing.png and b/infolog/templates/default/images/ongoing.png differ
diff --git a/infolog/templates/default/images/parent.png b/infolog/templates/default/images/parent.png
old mode 100644
new mode 100755
index 83c8a564df..106b90fa79
Binary files a/infolog/templates/default/images/parent.png and b/infolog/templates/default/images/parent.png differ
diff --git a/infolog/templates/default/images/phone.png b/infolog/templates/default/images/phone.png
old mode 100644
new mode 100755
index 9bd5bebbbe..f4feaab212
Binary files a/infolog/templates/default/images/phone.png and b/infolog/templates/default/images/phone.png differ
diff --git a/infolog/templates/default/images/status.png b/infolog/templates/default/images/status.png
old mode 100644
new mode 100755
index 0d67e8d753..baf61978a6
Binary files a/infolog/templates/default/images/status.png and b/infolog/templates/default/images/status.png differ
diff --git a/infolog/templates/default/images/task.png b/infolog/templates/default/images/task.png
old mode 100644
new mode 100755
index db0dae30c4..ade5c74c95
Binary files a/infolog/templates/default/images/task.png and b/infolog/templates/default/images/task.png differ
diff --git a/infolog/templates/default/images/template.png b/infolog/templates/default/images/template.png
old mode 100644
new mode 100755
index ef0e2e3ed3..7bb259674c
Binary files a/infolog/templates/default/images/template.png and b/infolog/templates/default/images/template.png differ
diff --git a/infolog/templates/default/images/timesheet.png b/infolog/templates/default/images/timesheet.png
old mode 100644
new mode 100755
index dca2c7ef85..07b26e2069
Binary files a/infolog/templates/default/images/timesheet.png and b/infolog/templates/default/images/timesheet.png differ
diff --git a/infolog/templates/default/images/timestamp.png b/infolog/templates/default/images/timestamp.png
old mode 100644
new mode 100755
index 864811b6be..da67e09ae9
Binary files a/infolog/templates/default/images/timestamp.png and b/infolog/templates/default/images/timestamp.png differ
diff --git a/infolog/templates/default/images/will-call.png b/infolog/templates/default/images/will-call.png
old mode 100644
new mode 100755
index 5df13eba09..f63ff86157
Binary files a/infolog/templates/default/images/will-call.png and b/infolog/templates/default/images/will-call.png differ
diff --git a/infolog/templates/jerryr/images/billed.png b/infolog/templates/jerryr/images/billed.png
deleted file mode 100644
index a03c6e7760..0000000000
Binary files a/infolog/templates/jerryr/images/billed.png and /dev/null differ
diff --git a/infolog/templates/jerryr/images/call.png b/infolog/templates/jerryr/images/call.png
deleted file mode 100644
index d002c42d30..0000000000
Binary files a/infolog/templates/jerryr/images/call.png and /dev/null differ
diff --git a/infolog/templates/jerryr/images/done.png b/infolog/templates/jerryr/images/done.png
deleted file mode 100644
index 543710fb7b..0000000000
Binary files a/infolog/templates/jerryr/images/done.png and /dev/null differ
diff --git a/infolog/templates/jerryr/images/email.png b/infolog/templates/jerryr/images/email.png
deleted file mode 100644
index cf7160ab42..0000000000
Binary files a/infolog/templates/jerryr/images/email.png and /dev/null differ
diff --git a/infolog/templates/jerryr/images/navbar-over.png b/infolog/templates/jerryr/images/navbar-over.png
deleted file mode 100644
index 4b32f09441..0000000000
Binary files a/infolog/templates/jerryr/images/navbar-over.png and /dev/null differ
diff --git a/infolog/templates/jerryr/images/navbar.png b/infolog/templates/jerryr/images/navbar.png
deleted file mode 100644
index 3b609101ae..0000000000
Binary files a/infolog/templates/jerryr/images/navbar.png and /dev/null differ
diff --git a/infolog/templates/jerryr/images/note.png b/infolog/templates/jerryr/images/note.png
deleted file mode 100644
index 0355076122..0000000000
Binary files a/infolog/templates/jerryr/images/note.png and /dev/null differ
diff --git a/infolog/templates/jerryr/images/ongoing.png b/infolog/templates/jerryr/images/ongoing.png
deleted file mode 100644
index b80c72091f..0000000000
Binary files a/infolog/templates/jerryr/images/ongoing.png and /dev/null differ
diff --git a/infolog/templates/jerryr/images/parent.png b/infolog/templates/jerryr/images/parent.png
deleted file mode 100644
index 83c8a564df..0000000000
Binary files a/infolog/templates/jerryr/images/parent.png and /dev/null differ
diff --git a/infolog/templates/jerryr/images/phone.png b/infolog/templates/jerryr/images/phone.png
deleted file mode 100644
index 9bd5bebbbe..0000000000
Binary files a/infolog/templates/jerryr/images/phone.png and /dev/null differ
diff --git a/infolog/templates/jerryr/images/status.png b/infolog/templates/jerryr/images/status.png
deleted file mode 100644
index e684a11f32..0000000000
Binary files a/infolog/templates/jerryr/images/status.png and /dev/null differ
diff --git a/infolog/templates/jerryr/images/task.png b/infolog/templates/jerryr/images/task.png
deleted file mode 100644
index db0dae30c4..0000000000
Binary files a/infolog/templates/jerryr/images/task.png and /dev/null differ
diff --git a/infolog/templates/jerryr/images/will-call.png b/infolog/templates/jerryr/images/will-call.png
deleted file mode 100644
index 5df13eba09..0000000000
Binary files a/infolog/templates/jerryr/images/will-call.png and /dev/null differ
diff --git a/infolog/templates/pixelegg/images b/infolog/templates/pixelegg/images
new file mode 120000
index 0000000000..670e2a1672
--- /dev/null
+++ b/infolog/templates/pixelegg/images
@@ -0,0 +1 @@
+../default/images
\ No newline at end of file
diff --git a/infolog/templates/pixelegg/images/archive.png b/infolog/templates/pixelegg/images/archive.png
deleted file mode 100755
index 93707820fd..0000000000
Binary files a/infolog/templates/pixelegg/images/archive.png and /dev/null differ
diff --git a/infolog/templates/pixelegg/images/billed.png b/infolog/templates/pixelegg/images/billed.png
deleted file mode 100755
index 643316347a..0000000000
Binary files a/infolog/templates/pixelegg/images/billed.png and /dev/null differ
diff --git a/infolog/templates/pixelegg/images/call.png b/infolog/templates/pixelegg/images/call.png
deleted file mode 100755
index a0af827cd1..0000000000
Binary files a/infolog/templates/pixelegg/images/call.png and /dev/null differ
diff --git a/infolog/templates/pixelegg/images/cancelled.png b/infolog/templates/pixelegg/images/cancelled.png
deleted file mode 100755
index d79d282360..0000000000
Binary files a/infolog/templates/pixelegg/images/cancelled.png and /dev/null differ
diff --git a/infolog/templates/pixelegg/images/deleted.png b/infolog/templates/pixelegg/images/deleted.png
deleted file mode 100755
index 474681afbf..0000000000
Binary files a/infolog/templates/pixelegg/images/deleted.png and /dev/null differ
diff --git a/infolog/templates/pixelegg/images/done.png b/infolog/templates/pixelegg/images/done.png
deleted file mode 100755
index 7739ccb6cb..0000000000
Binary files a/infolog/templates/pixelegg/images/done.png and /dev/null differ
diff --git a/infolog/templates/pixelegg/images/done_all.png b/infolog/templates/pixelegg/images/done_all.png
deleted file mode 100755
index 5ff8941b9d..0000000000
Binary files a/infolog/templates/pixelegg/images/done_all.png and /dev/null differ
diff --git a/infolog/templates/pixelegg/images/email.png b/infolog/templates/pixelegg/images/email.png
deleted file mode 100755
index e798f888f9..0000000000
Binary files a/infolog/templates/pixelegg/images/email.png and /dev/null differ
diff --git a/infolog/templates/pixelegg/images/navbar.png b/infolog/templates/pixelegg/images/navbar.png
deleted file mode 100644
index 9ff3844f06..0000000000
Binary files a/infolog/templates/pixelegg/images/navbar.png and /dev/null differ
diff --git a/infolog/templates/pixelegg/images/nonactive.png b/infolog/templates/pixelegg/images/nonactive.png
deleted file mode 100755
index dc0de46eb5..0000000000
Binary files a/infolog/templates/pixelegg/images/nonactive.png and /dev/null differ
diff --git a/infolog/templates/pixelegg/images/not-started.png b/infolog/templates/pixelegg/images/not-started.png
deleted file mode 100755
index ebbf4a5cb9..0000000000
Binary files a/infolog/templates/pixelegg/images/not-started.png and /dev/null differ
diff --git a/infolog/templates/pixelegg/images/note.png b/infolog/templates/pixelegg/images/note.png
deleted file mode 100755
index ad9b59d937..0000000000
Binary files a/infolog/templates/pixelegg/images/note.png and /dev/null differ
diff --git a/infolog/templates/pixelegg/images/ongoing.png b/infolog/templates/pixelegg/images/ongoing.png
deleted file mode 100755
index 48b61a2e89..0000000000
Binary files a/infolog/templates/pixelegg/images/ongoing.png and /dev/null differ
diff --git a/infolog/templates/pixelegg/images/parent.png b/infolog/templates/pixelegg/images/parent.png
deleted file mode 100755
index 106b90fa79..0000000000
Binary files a/infolog/templates/pixelegg/images/parent.png and /dev/null differ
diff --git a/infolog/templates/pixelegg/images/phone.png b/infolog/templates/pixelegg/images/phone.png
deleted file mode 100755
index f4feaab212..0000000000
Binary files a/infolog/templates/pixelegg/images/phone.png and /dev/null differ
diff --git a/infolog/templates/pixelegg/images/status.png b/infolog/templates/pixelegg/images/status.png
deleted file mode 100755
index baf61978a6..0000000000
Binary files a/infolog/templates/pixelegg/images/status.png and /dev/null differ
diff --git a/infolog/templates/pixelegg/images/task.png b/infolog/templates/pixelegg/images/task.png
deleted file mode 100755
index ade5c74c95..0000000000
Binary files a/infolog/templates/pixelegg/images/task.png and /dev/null differ
diff --git a/infolog/templates/pixelegg/images/template.png b/infolog/templates/pixelegg/images/template.png
deleted file mode 100755
index 7bb259674c..0000000000
Binary files a/infolog/templates/pixelegg/images/template.png and /dev/null differ
diff --git a/infolog/templates/pixelegg/images/timesheet.png b/infolog/templates/pixelegg/images/timesheet.png
deleted file mode 100755
index 07b26e2069..0000000000
Binary files a/infolog/templates/pixelegg/images/timesheet.png and /dev/null differ
diff --git a/infolog/templates/pixelegg/images/timestamp.png b/infolog/templates/pixelegg/images/timestamp.png
deleted file mode 100755
index da67e09ae9..0000000000
Binary files a/infolog/templates/pixelegg/images/timestamp.png and /dev/null differ
diff --git a/infolog/templates/pixelegg/images/will-call.png b/infolog/templates/pixelegg/images/will-call.png
deleted file mode 100755
index f63ff86157..0000000000
Binary files a/infolog/templates/pixelegg/images/will-call.png and /dev/null differ
diff --git a/mail/templates/default/images/Read.png b/mail/templates/default/images/Read.png
index 8314163b08..0e7ba3c5b9 100755
Binary files a/mail/templates/default/images/Read.png and b/mail/templates/default/images/Read.png differ
diff --git a/mail/templates/default/images/Replied.png b/mail/templates/default/images/Replied.png
index 757f90582c..f3b7ac9fce 100755
Binary files a/mail/templates/default/images/Replied.png and b/mail/templates/default/images/Replied.png differ
diff --git a/mail/templates/default/images/Unread.png b/mail/templates/default/images/Unread.png
index 1364ea5be1..e974f29efa 100755
Binary files a/mail/templates/default/images/Unread.png and b/mail/templates/default/images/Unread.png differ
diff --git a/mail/templates/default/images/attach.png b/mail/templates/default/images/attach.png
deleted file mode 100755
index 97ad911c89..0000000000
Binary files a/mail/templates/default/images/attach.png and /dev/null differ
diff --git a/mail/templates/pixelegg/images/attach.svg b/mail/templates/default/images/attach.svg
similarity index 99%
rename from mail/templates/pixelegg/images/attach.svg
rename to mail/templates/default/images/attach.svg
index 9f4afe0d30..4ef3a09165 100644
--- a/mail/templates/pixelegg/images/attach.svg
+++ b/mail/templates/default/images/attach.svg
@@ -1,17 +1,17 @@
-
-
-
+
+
+
-
+
diff --git a/mail/templates/pixelegg/images/blacklist.png b/mail/templates/default/images/blacklist.png
similarity index 100%
rename from mail/templates/pixelegg/images/blacklist.png
rename to mail/templates/default/images/blacklist.png
diff --git a/mail/templates/default/images/body-background.png b/mail/templates/default/images/body-background.png
old mode 100644
new mode 100755
diff --git a/mail/templates/pixelegg/images/certified_message.svg b/mail/templates/default/images/certified_message.svg
similarity index 98%
rename from mail/templates/pixelegg/images/certified_message.svg
rename to mail/templates/default/images/certified_message.svg
index 927309210a..9335c328b7 100644
--- a/mail/templates/pixelegg/images/certified_message.svg
+++ b/mail/templates/default/images/certified_message.svg
@@ -1,29 +1,29 @@
-
-
-
-
+
+
+
+
diff --git a/mail/templates/default/images/down_pointer.png b/mail/templates/default/images/down_pointer.png
index e98a5b868b..519a5f002a 100755
Binary files a/mail/templates/default/images/down_pointer.png and b/mail/templates/default/images/down_pointer.png differ
diff --git a/mail/templates/default/images/fileexport.png b/mail/templates/default/images/fileexport.png
deleted file mode 100755
index 381bfc0539..0000000000
Binary files a/mail/templates/default/images/fileexport.png and /dev/null differ
diff --git a/mail/templates/pixelegg/images/fileexport.svg b/mail/templates/default/images/fileexport.svg
similarity index 98%
rename from mail/templates/pixelegg/images/fileexport.svg
rename to mail/templates/default/images/fileexport.svg
index 226bf4ac3c..ce0e5df6ca 100755
--- a/mail/templates/pixelegg/images/fileexport.svg
+++ b/mail/templates/default/images/fileexport.svg
@@ -1,17 +1,17 @@
-
-
-
+
+
+
-
+
diff --git a/mail/templates/default/images/filter.png b/mail/templates/default/images/filter.png
deleted file mode 100644
index 397e078992..0000000000
Binary files a/mail/templates/default/images/filter.png and /dev/null differ
diff --git a/mail/templates/pixelegg/images/filter.svg b/mail/templates/default/images/filter.svg
similarity index 98%
rename from mail/templates/pixelegg/images/filter.svg
rename to mail/templates/default/images/filter.svg
index 96af508fc1..a4fa371dff 100644
--- a/mail/templates/pixelegg/images/filter.svg
+++ b/mail/templates/default/images/filter.svg
@@ -1,12 +1,12 @@
-
-
-
-
+
+
+
+
diff --git a/mail/templates/default/images/htmlmode.png b/mail/templates/default/images/htmlmode.png
old mode 100644
new mode 100755
index 9e5bc52cf2..44b12e0587
Binary files a/mail/templates/default/images/htmlmode.png and b/mail/templates/default/images/htmlmode.png differ
diff --git a/mail/templates/default/images/kmmsgdel.png b/mail/templates/default/images/kmmsgdel.png
deleted file mode 100755
index 2de7775412..0000000000
Binary files a/mail/templates/default/images/kmmsgdel.png and /dev/null differ
diff --git a/mail/templates/pixelegg/images/kmmsgdel.svg b/mail/templates/default/images/kmmsgdel.svg
similarity index 98%
rename from mail/templates/pixelegg/images/kmmsgdel.svg
rename to mail/templates/default/images/kmmsgdel.svg
index 03dc1a2e91..9ad8a410c8 100644
--- a/mail/templates/pixelegg/images/kmmsgdel.svg
+++ b/mail/templates/default/images/kmmsgdel.svg
@@ -1,8 +1,8 @@
-
-
-
-
+
+
+
+
diff --git a/mail/templates/default/images/kmmsgforwarded.png b/mail/templates/default/images/kmmsgforwarded.png
index a26af4a2cc..a791fb1da4 100644
Binary files a/mail/templates/default/images/kmmsgforwarded.png and b/mail/templates/default/images/kmmsgforwarded.png differ
diff --git a/mail/templates/default/images/kmmsgnew.png b/mail/templates/default/images/kmmsgnew.png
deleted file mode 100755
index 245d1569bc..0000000000
Binary files a/mail/templates/default/images/kmmsgnew.png and /dev/null differ
diff --git a/mail/templates/pixelegg/images/kmmsgnew.svg b/mail/templates/default/images/kmmsgnew.svg
similarity index 98%
rename from mail/templates/pixelegg/images/kmmsgnew.svg
rename to mail/templates/default/images/kmmsgnew.svg
index 9547dc7461..3e5b3aca97 100644
--- a/mail/templates/pixelegg/images/kmmsgnew.svg
+++ b/mail/templates/default/images/kmmsgnew.svg
@@ -1,17 +1,17 @@
-
-
-
-
+
+
+
+
diff --git a/mail/templates/default/images/kmmsgread.png b/mail/templates/default/images/kmmsgread.png
deleted file mode 100755
index fabb08884e..0000000000
Binary files a/mail/templates/default/images/kmmsgread.png and /dev/null differ
diff --git a/mail/templates/pixelegg/images/kmmsgread.svg b/mail/templates/default/images/kmmsgread.svg
similarity index 98%
rename from mail/templates/pixelegg/images/kmmsgread.svg
rename to mail/templates/default/images/kmmsgread.svg
index 946ab387a5..31cb052545 100755
--- a/mail/templates/pixelegg/images/kmmsgread.svg
+++ b/mail/templates/default/images/kmmsgread.svg
@@ -1,18 +1,18 @@
-
-
-
-
+
+
+
+
diff --git a/mail/templates/default/images/kmmsgreplied.png b/mail/templates/default/images/kmmsgreplied.png
index 685ab7306f..29d2ccf09a 100755
Binary files a/mail/templates/default/images/kmmsgreplied.png and b/mail/templates/default/images/kmmsgreplied.png differ
diff --git a/mail/templates/default/images/kmmsgunseen.png b/mail/templates/default/images/kmmsgunseen.png
deleted file mode 100755
index 8e3de20220..0000000000
Binary files a/mail/templates/default/images/kmmsgunseen.png and /dev/null differ
diff --git a/mail/templates/pixelegg/images/kmmsgunseen.svg b/mail/templates/default/images/kmmsgunseen.svg
similarity index 98%
rename from mail/templates/pixelegg/images/kmmsgunseen.svg
rename to mail/templates/default/images/kmmsgunseen.svg
index 9848af6861..3cb0585e28 100644
--- a/mail/templates/pixelegg/images/kmmsgunseen.svg
+++ b/mail/templates/default/images/kmmsgunseen.svg
@@ -1,16 +1,16 @@
-
-
-
-
+
+
+
+
diff --git a/mail/templates/default/images/mail_find.png b/mail/templates/default/images/mail_find.png
index 156187d6e6..4ba5875f6d 100755
Binary files a/mail/templates/default/images/mail_find.png and b/mail/templates/default/images/mail_find.png differ
diff --git a/mail/templates/default/images/mail_forward.png b/mail/templates/default/images/mail_forward.png
deleted file mode 100755
index 8673653d1a..0000000000
Binary files a/mail/templates/default/images/mail_forward.png and /dev/null differ
diff --git a/mail/templates/pixelegg/images/mail_forward.svg b/mail/templates/default/images/mail_forward.svg
similarity index 98%
rename from mail/templates/pixelegg/images/mail_forward.svg
rename to mail/templates/default/images/mail_forward.svg
index 414cc37e5b..f67d75761e 100755
--- a/mail/templates/pixelegg/images/mail_forward.svg
+++ b/mail/templates/default/images/mail_forward.svg
@@ -1,15 +1,15 @@
-
-
-
-
+
+
+
+
diff --git a/mail/templates/pixelegg/images/mail_forward_attach.svg b/mail/templates/default/images/mail_forward_attach.svg
similarity index 98%
rename from mail/templates/pixelegg/images/mail_forward_attach.svg
rename to mail/templates/default/images/mail_forward_attach.svg
index bd885eadcd..a9760d6c45 100644
--- a/mail/templates/pixelegg/images/mail_forward_attach.svg
+++ b/mail/templates/default/images/mail_forward_attach.svg
@@ -1,21 +1,21 @@
-
-
-
-
+
+
+
+
diff --git a/mail/templates/default/images/mail_label1.png b/mail/templates/default/images/mail_label1.png
deleted file mode 100644
index 67ec9d6866..0000000000
Binary files a/mail/templates/default/images/mail_label1.png and /dev/null differ
diff --git a/mail/templates/pixelegg/images/mail_label1.svg b/mail/templates/default/images/mail_label1.svg
similarity index 98%
rename from mail/templates/pixelegg/images/mail_label1.svg
rename to mail/templates/default/images/mail_label1.svg
index 6ff8b54d56..fb5572eef6 100644
--- a/mail/templates/pixelegg/images/mail_label1.svg
+++ b/mail/templates/default/images/mail_label1.svg
@@ -1,9 +1,9 @@
-
-
-
-
+
+
+
+
diff --git a/mail/templates/default/images/mail_label2.png b/mail/templates/default/images/mail_label2.png
deleted file mode 100644
index 529fce2ccd..0000000000
Binary files a/mail/templates/default/images/mail_label2.png and /dev/null differ
diff --git a/mail/templates/pixelegg/images/mail_label2.svg b/mail/templates/default/images/mail_label2.svg
similarity index 98%
rename from mail/templates/pixelegg/images/mail_label2.svg
rename to mail/templates/default/images/mail_label2.svg
index a7faa52035..57f3be6e75 100644
--- a/mail/templates/pixelegg/images/mail_label2.svg
+++ b/mail/templates/default/images/mail_label2.svg
@@ -1,11 +1,11 @@
-
-
-
-
+
+
+
+
diff --git a/mail/templates/default/images/mail_label3.png b/mail/templates/default/images/mail_label3.png
deleted file mode 100644
index 0ac1ddb086..0000000000
Binary files a/mail/templates/default/images/mail_label3.png and /dev/null differ
diff --git a/mail/templates/pixelegg/images/mail_label3.svg b/mail/templates/default/images/mail_label3.svg
similarity index 98%
rename from mail/templates/pixelegg/images/mail_label3.svg
rename to mail/templates/default/images/mail_label3.svg
index 31513ab7cf..198adf53cb 100644
--- a/mail/templates/pixelegg/images/mail_label3.svg
+++ b/mail/templates/default/images/mail_label3.svg
@@ -1,20 +1,20 @@
-
-
-
-
+
+
+
+
diff --git a/mail/templates/default/images/mail_label4.png b/mail/templates/default/images/mail_label4.png
deleted file mode 100644
index aa65d2f520..0000000000
Binary files a/mail/templates/default/images/mail_label4.png and /dev/null differ
diff --git a/mail/templates/pixelegg/images/mail_label4.svg b/mail/templates/default/images/mail_label4.svg
similarity index 98%
rename from mail/templates/pixelegg/images/mail_label4.svg
rename to mail/templates/default/images/mail_label4.svg
index 3e257813f8..0e557541a1 100644
--- a/mail/templates/pixelegg/images/mail_label4.svg
+++ b/mail/templates/default/images/mail_label4.svg
@@ -1,28 +1,28 @@
-
-
-
-
+
+
+
+
diff --git a/mail/templates/default/images/mail_label5.png b/mail/templates/default/images/mail_label5.png
deleted file mode 100644
index 0d2cab1382..0000000000
Binary files a/mail/templates/default/images/mail_label5.png and /dev/null differ
diff --git a/mail/templates/pixelegg/images/mail_label5.svg b/mail/templates/default/images/mail_label5.svg
similarity index 98%
rename from mail/templates/pixelegg/images/mail_label5.svg
rename to mail/templates/default/images/mail_label5.svg
index eded16722b..0396ed7593 100644
--- a/mail/templates/pixelegg/images/mail_label5.svg
+++ b/mail/templates/default/images/mail_label5.svg
@@ -1,14 +1,14 @@
-
-
-
-
+
+
+
+
diff --git a/filemanager/templates/pixelegg/images/mail_post_to.png b/mail/templates/default/images/mail_post_to.png
similarity index 100%
rename from filemanager/templates/pixelegg/images/mail_post_to.png
rename to mail/templates/default/images/mail_post_to.png
diff --git a/mail/templates/default/images/mail_reply.png b/mail/templates/default/images/mail_reply.png
deleted file mode 100755
index 7bb70b96b1..0000000000
Binary files a/mail/templates/default/images/mail_reply.png and /dev/null differ
diff --git a/mail/templates/pixelegg/images/mail_reply.svg b/mail/templates/default/images/mail_reply.svg
similarity index 98%
rename from mail/templates/pixelegg/images/mail_reply.svg
rename to mail/templates/default/images/mail_reply.svg
index e6d2020fff..7e0dc84fbc 100755
--- a/mail/templates/pixelegg/images/mail_reply.svg
+++ b/mail/templates/default/images/mail_reply.svg
@@ -1,15 +1,15 @@
-
-
-
-
+
+
+
+
diff --git a/mail/templates/default/images/mail_replyall.png b/mail/templates/default/images/mail_replyall.png
deleted file mode 100755
index c839a8acec..0000000000
Binary files a/mail/templates/default/images/mail_replyall.png and /dev/null differ
diff --git a/mail/templates/pixelegg/images/mail_replyall.svg b/mail/templates/default/images/mail_replyall.svg
similarity index 98%
rename from mail/templates/pixelegg/images/mail_replyall.svg
rename to mail/templates/default/images/mail_replyall.svg
index 02e50a3630..b7db58b857 100755
--- a/mail/templates/pixelegg/images/mail_replyall.svg
+++ b/mail/templates/default/images/mail_replyall.svg
@@ -1,17 +1,17 @@
-
-
-
+
+
+
-
+
diff --git a/mail/templates/default/images/mail_send.png b/mail/templates/default/images/mail_send.png
deleted file mode 100755
index 62b0534335..0000000000
Binary files a/mail/templates/default/images/mail_send.png and /dev/null differ
diff --git a/mail/templates/pixelegg/images/mail_send.psd b/mail/templates/default/images/mail_send.psd
similarity index 100%
rename from mail/templates/pixelegg/images/mail_send.psd
rename to mail/templates/default/images/mail_send.psd
diff --git a/mail/templates/pixelegg/images/mail_send.svg b/mail/templates/default/images/mail_send.svg
similarity index 98%
rename from mail/templates/pixelegg/images/mail_send.svg
rename to mail/templates/default/images/mail_send.svg
index 7f84073d5e..78f9971712 100644
--- a/mail/templates/pixelegg/images/mail_send.svg
+++ b/mail/templates/default/images/mail_send.svg
@@ -1,17 +1,17 @@
-
-
-
-