diff --git a/api/js/etemplate/et2_widget_favorites.js b/api/js/etemplate/et2_widget_favorites.js
index 243f88ca90..43b051b9da 100644
--- a/api/js/etemplate/et2_widget_favorites.js
+++ b/api/js/etemplate/et2_widget_favorites.js
@@ -71,7 +71,7 @@ var et2_favorites = (function(){ "use strict"; return et2_dropdown_button.extend
 		id: {"default": "favorite"},
 		label: {"default": ""},
 		label_updates: { "default": false},
-		image: {"default": "etemplate/fav_filter"},
+		image: {"default": "api/fav_filter"},
 		statustext: {"default": "Favorite queries", "type": "string"}
 	},
 
diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index 8c717eebc8..e640d63871 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -622,7 +622,7 @@ div.et2_file {
 span.et2_file_span{
 	display: block;
 	background-position: 2px;
-	background-image: url(../../../phpgwapi/templates/default/images/upload.png);
+	background-image: url(images/upload.png);
 	background-repeat: no-repeat;
 	background-size: 16px;
 	cursor: pointer;
diff --git a/etemplate/templates/default/images/ajax-loader.gif b/api/templates/default/images/ajax-loader.gif
similarity index 100%
rename from etemplate/templates/default/images/ajax-loader.gif
rename to api/templates/default/images/ajax-loader.gif
diff --git a/api/templates/default/images/bullet.png b/api/templates/default/images/bullet.png
new file mode 100644
index 0000000000..e7e6518ff4
Binary files /dev/null and b/api/templates/default/images/bullet.png differ
diff --git a/etemplate/templates/default/images/close.png b/api/templates/default/images/close.png
similarity index 100%
rename from etemplate/templates/default/images/close.png
rename to api/templates/default/images/close.png
diff --git a/etemplate/templates/default/images/down.png b/api/templates/default/images/down.png
similarity index 100%
rename from etemplate/templates/default/images/down.png
rename to api/templates/default/images/down.png
diff --git a/etemplate/templates/default/images/download.png b/api/templates/default/images/download.png
similarity index 100%
rename from etemplate/templates/default/images/download.png
rename to api/templates/default/images/download.png
diff --git a/etemplate/templates/default/images/email.png b/api/templates/default/images/email.png
similarity index 100%
rename from etemplate/templates/default/images/email.png
rename to api/templates/default/images/email.png
diff --git a/etemplate/templates/default/images/error.png b/api/templates/default/images/error.png
similarity index 100%
rename from etemplate/templates/default/images/error.png
rename to api/templates/default/images/error.png
diff --git a/etemplate/templates/pixelegg/images/fav_filter.png b/api/templates/default/images/fav_filter.png
similarity index 100%
rename from etemplate/templates/pixelegg/images/fav_filter.png
rename to api/templates/default/images/fav_filter.png
diff --git a/etemplate/templates/default/images/gradient01.png b/api/templates/default/images/gradient01.png
similarity index 100%
rename from etemplate/templates/default/images/gradient01.png
rename to api/templates/default/images/gradient01.png
diff --git a/etemplate/templates/default/images/gradient02.png b/api/templates/default/images/gradient02.png
similarity index 100%
rename from etemplate/templates/default/images/gradient02.png
rename to api/templates/default/images/gradient02.png
diff --git a/etemplate/templates/default/images/hint.png b/api/templates/default/images/hint.png
similarity index 100%
rename from etemplate/templates/default/images/hint.png
rename to api/templates/default/images/hint.png
diff --git a/etemplate/templates/default/images/phone.png b/api/templates/default/images/phone.png
similarity index 100%
rename from etemplate/templates/default/images/phone.png
rename to api/templates/default/images/phone.png
diff --git a/api/templates/default/images/photo.png b/api/templates/default/images/photo.png
new file mode 100755
index 0000000000..394b0d0498
Binary files /dev/null and b/api/templates/default/images/photo.png differ
diff --git a/etemplate/templates/default/images/selectcols.png b/api/templates/default/images/selectcols.png
similarity index 100%
rename from etemplate/templates/default/images/selectcols.png
rename to api/templates/default/images/selectcols.png
diff --git a/etemplate/templates/default/images/tab_header_bg.png b/api/templates/default/images/tab_header_bg.png
similarity index 100%
rename from etemplate/templates/default/images/tab_header_bg.png
rename to api/templates/default/images/tab_header_bg.png
diff --git a/etemplate/templates/default/images/tick.png b/api/templates/default/images/tick.png
similarity index 100%
rename from etemplate/templates/default/images/tick.png
rename to api/templates/default/images/tick.png
diff --git a/etemplate/templates/default/images/today.png b/api/templates/default/images/today.png
similarity index 100%
rename from etemplate/templates/default/images/today.png
rename to api/templates/default/images/today.png
diff --git a/etemplate/templates/default/images/up.png b/api/templates/default/images/up.png
similarity index 100%
rename from etemplate/templates/default/images/up.png
rename to api/templates/default/images/up.png
diff --git a/api/templates/default/images/upload.png b/api/templates/default/images/upload.png
new file mode 100644
index 0000000000..3412e8e0d3
Binary files /dev/null and b/api/templates/default/images/upload.png differ
diff --git a/etemplate/templates/default/images/url.png b/api/templates/default/images/url.png
similarity index 100%
rename from etemplate/templates/default/images/url.png
rename to api/templates/default/images/url.png
diff --git a/etemplate/templates/default/images/fav_filter.png b/etemplate/templates/default/images/fav_filter.png
deleted file mode 100644
index 397e078992..0000000000
Binary files a/etemplate/templates/default/images/fav_filter.png and /dev/null differ