From: the_mgt <themgt@ueberserver.de>
Date: Sat, 2 Jul 2011 23:28:46 +0000 (+0200)
Subject: Renamed the /icons directory to /webcit_icons because of incompatibility with symlink... 
X-Git-Tag: v8.11~638
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=64ef1d438d5ee853b598c4e762498e4bc7f1e22f

Renamed the /icons directory to /webcit_icons because of incompatibility with symlinking to local iconset for mimetypes
Also changed the references to reflect the new positions
---

diff --git a/webcit/addressbook_popup.c b/webcit/addressbook_popup.c
index f8491fed1..09677dcca 100644
--- a/webcit/addressbook_popup.c
+++ b/webcit/addressbook_popup.c
@@ -53,7 +53,7 @@ void display_address_book_middle_div(void) {
 	DefAddrBook = get_room_pref("defaddrbook");
 
 	wc_printf("<table border=0 width=100%%><tr valign=middle>");
-	wc_printf("<td align=left><img src=\"static/icons/essen/32x32/contact.png\"></td>");
+	wc_printf("<td align=left><img src=\"static/webcit_icons/essen/32x32/contact.png\"></td>");
 	wc_printf("<td align=center>");
 
 	wc_printf("<form>"
@@ -99,7 +99,7 @@ void display_address_book_middle_div(void) {
 	wc_printf("</td>");
 	wc_printf("<td align=right "
 		"onclick=\"javascript:$('address_book_popup').style.display='none';\" "
-		"><img src=\"static/icons/closewindow.gif\">");
+		"><img src=\"static/webcit_icons/closewindow.gif\">");
 	wc_printf("</td></tr></table>");
 
 	wc_printf("<script type=\"text/javascript\">PopulateAddressBookInnerDiv($('which_addr_book').value,'%s');</script>",
diff --git a/webcit/buildpackages b/webcit/buildpackages
index 7d2e2a2af..b160264ac 100755
--- a/webcit/buildpackages
+++ b/webcit/buildpackages
@@ -60,7 +60,7 @@ case $1 in
 	;;
     sourcedist)
 	if test "$2" == "dfsg"; then
-	    NONDFSG=-"-exclude static/icons/openid-small.gif"
+	    NONDFSG=-"-exclude static/webcit_icons/openid-small.gif"
 	fi
 	cd ..; tar --exclude .svn --exclude "debian/*" $NONDFSG -cvhzf webcit-${WEBCIT_VERSION}.tar.gz webcit-${WEBCIT_VERSION}/
 	;;
diff --git a/webcit/calendar.c b/webcit/calendar.c
index be32db144..1a6f7fa9b 100644
--- a/webcit/calendar.c
+++ b/webcit/calendar.c
@@ -75,7 +75,7 @@ void cal_process_object(StrBuf *Target,
 		the_method = icalproperty_get_method(method);
 
 		StrBufAppendPrintf(Target, "<div id=\"%s_title\">", divname);
-		StrBufAppendPrintf(Target, "<img src=\"static/icons/essen/32x32/calendar.png\">");
+		StrBufAppendPrintf(Target, "<img src=\"static/webcit_icons/essen/32x32/calendar.png\">");
 		StrBufAppendPrintf(Target, "<span>");
 		switch(the_method) {
 		case ICAL_METHOD_REQUEST:
@@ -329,7 +329,7 @@ void respond_to_request(void)
 	serv_getln(buf, sizeof buf);
 
 	if (buf[0] == '2') {
-		wc_printf("<img src=\"static/icons/essen/32x32/calendar.png\"><span>");
+		wc_printf("<img src=\"static/webcit_icons/essen/32x32/calendar.png\"><span>");
 		if (!strcasecmp(bstr("sc"), "accept")) {
 			wc_printf(_("You have accepted this meeting invitation.  "
 				"It has been entered into your calendar.")
@@ -347,7 +347,7 @@ void respond_to_request(void)
 		wc_printf(_("A reply has been sent to the meeting organizer."));
 		wc_printf("</span>");
 	} else {
-		wc_printf("<img align=\"center\" src=\"static/icons/error.gif\"><span>");
+		wc_printf("<img align=\"center\" src=\"static/webcit_icons/error.gif\"><span>");
 		wc_printf("%s\n", &buf[4]);
 		wc_printf("</span>");
 	}
@@ -374,7 +374,7 @@ void handle_rsvp(void)
 	serv_getln(buf, sizeof buf);
 
 	if (buf[0] == '2') {
-		wc_printf("<img src=\"static/icons/calendar.png\"><span>");
+		wc_printf("<img src=\"static/webcit_icons/calendar.png\"><span>");
 		if (!strcasecmp(bstr("sc"), "update")) {
 			/* Translators: RSVP aka Répondez s'il-vous-plaît Is the term 
 			   that the recipient of an ical-invitation should please 
@@ -387,7 +387,7 @@ void handle_rsvp(void)
 		}
 		wc_printf("</span>");
 	} else {
-		wc_printf("<img src=\"static/icons/error.gif\"><span> %s\n", &buf[4]);
+		wc_printf("<img src=\"static/webcit_icons/error.gif\"><span> %s\n", &buf[4]);
 		wc_printf("</span>");
 	}
 
diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index 1bdcf608e..3319547a6 100644
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -586,7 +586,7 @@ void calendar_month_view(int year, int month, int day) {
 	localtime_r(&previous_month, &tm);
 	wc_printf("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
 		(int)(tm.tm_year)+1900, tm.tm_mon + 1);
-	wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/icons/essen/32x32/back.png\" border=\"0\"></a>\n", _("previous"));
+	wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/webcit_icons/essen/32x32/back.png\" border=\"0\"></a>\n", _("previous"));
 
 	wc_strftime(colheader_label, sizeof colheader_label, "%B", &starting_tm);
 	wc_printf("&nbsp;&nbsp;"
@@ -598,7 +598,7 @@ void calendar_month_view(int year, int month, int day) {
 	localtime_r(&next_month, &tm);
 	wc_printf("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
 		(int)(tm.tm_year)+1900, tm.tm_mon + 1);
-	wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/icons/essen/32x32/forward.png\" border=\"0\"></A>\n", _("next"));
+	wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/webcit_icons/essen/32x32/forward.png\" border=\"0\"></A>\n", _("next"));
 
 	wc_printf("</td></tr></table>\n");
 
@@ -722,7 +722,7 @@ void calendar_brief_month_view(int year, int month, int day) {
 	localtime_r(&previous_month, &tm);
 	wc_printf("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
 		(int)(tm.tm_year)+1900, tm.tm_mon + 1);
-	wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/icons/essen/32x32/back.png\" border=\"0\"></a>\n", _("previous"));
+	wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/webcit_icons/essen/32x32/back.png\" border=\"0\"></a>\n", _("previous"));
 
 	wc_strftime(month_label, sizeof month_label, "%B", &tm);
 	wc_printf("&nbsp;&nbsp;"
@@ -734,7 +734,7 @@ void calendar_brief_month_view(int year, int month, int day) {
 	localtime_r(&next_month, &tm);
 	wc_printf("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
 		(int)(tm.tm_year)+1900, tm.tm_mon + 1);
-	wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/icons/essen/32x32/forward.png\" border=\"0\"></a>\n", _("next"));
+	wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/webcit_icons/essen/32x32/forward.png\" border=\"0\"></a>\n", _("next"));
 
 	wc_printf("</td></tr></table>\n");
 
@@ -1284,7 +1284,7 @@ void calendar_day_view(int year, int month, int day) {
 	wc_printf("<td align=\"center\">");
 	wc_printf("<a href=\"readfwd?calview=day?year=%d?month=%d?day=%d\">",
 		yesterday.year, yesterday.month, yesterday.day);
-	wc_printf("<img alt=\"previous\" align=\"middle\" src=\"static/icons/essen/32x32/back.png\" border=\"0\"></a>");
+	wc_printf("<img alt=\"previous\" align=\"middle\" src=\"static/webcit_icons/essen/32x32/back.png\" border=\"0\"></a>");
 	wc_printf("</td>");
 
 	wc_strftime(d_str, sizeof d_str,
@@ -1302,7 +1302,7 @@ void calendar_day_view(int year, int month, int day) {
 	wc_printf("<td align=\"center\">");
 	wc_printf("<a href=\"readfwd?calview=day?year=%d?month=%d?day=%d\">",
 		tomorrow.year, tomorrow.month, tomorrow.day);
-	wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/icons/essen/32x32/forward.png\""
+	wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/webcit_icons/essen/32x32/forward.png\""
 		" border=\"0\"></a>\n", _("next"));
 	wc_printf("</td>");
 
diff --git a/webcit/debian/citadel-webcit.links b/webcit/debian/citadel-webcit.links
index 2edfc8ca6..a6d42852c 100644
--- a/webcit/debian/citadel-webcit.links
+++ b/webcit/debian/citadel-webcit.links
@@ -1,3 +1,3 @@
-/usr/share/icons/gnome/24x24/mimetypes /usr/share/citadel-webcit/static/icons
+/usr/share/webcit_icons/gnome/24x24/mimetypes /usr/share/citadel-webcit/static/icons
 /usr/share/javascript/prototype/prototype.js /usr/share/citadel-webcit/static/prototype.js
 /usr/share/javascript/scriptaculous/scriptaculous.js /usr/share/citadel-webcit/static/scriptaculous.js
diff --git a/webcit/downloads.c b/webcit/downloads.c
index 2e7489f9e..1a5789c25 100644
--- a/webcit/downloads.c
+++ b/webcit/downloads.c
@@ -246,7 +246,7 @@ void display_mime_icon(void)
 	FileName = GetIconFilename(MimeType, tlen);
 
 	if (FileName == NULL)
-		snprintf (FileBuf, SIZ, "%s%s", static_dirs[0], "/icons/essen/16x16/file.png");
+		snprintf (FileBuf, SIZ, "%s%s", static_dirs[0], "/webcit_icons/essen/16x16/file.png");
 	else
 		snprintf (FileBuf, SIZ, "%s%s", static_dirs[3], FileName);
 	output_static(FileBuf);
@@ -410,7 +410,7 @@ void output_image(void)
 	 * Instead of an ugly 404, send a 1x1 transparent GIF
 	 * when there's no such image on the server.
 	 */
-	StrBufPrintf (Buf, "%s%s", static_dirs[0], "/icons/blank.gif");
+	StrBufPrintf (Buf, "%s%s", static_dirs[0], "/webcit_icons/blank.gif");
 	output_static(ChrPtr(Buf));
 	FreeStrBuf(&Buf);
 }
diff --git a/webcit/event.c b/webcit/event.c
index 40addb0e4..0f6168d1d 100644
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -445,7 +445,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 	wc_printf(
 		"&nbsp;<a href=\"javascript:PopOpenAddressBook('attendees_box|%s');\" "
 		"title=\"%s\">"
-		"<img alt='' align='middle' border='0' width='16' height='16' src=\"static/icons/essen/16x16/contact.png\">"
+		"<img alt='' align='middle' border='0' width='16' height='16' src=\"static/webcit_icons/essen/16x16/contact.png\">"
 		"</a>",
 		_("Attendees"),
 		_("Contacts")
diff --git a/webcit/openid.c b/webcit/openid.c
index 8df6d3c36..987ab0cf5 100644
--- a/webcit/openid.c
+++ b/webcit/openid.c
@@ -43,7 +43,7 @@ void display_openids(void)
 		if (buf[0] == '1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
 			bg = 1 - bg;
 			wc_printf("<tr class=\"%s\">", (bg ? "even" : "odd"));
-			wc_printf("<td><img src=\"static/icons/openid-small.gif\"></td><td>");
+			wc_printf("<td><img src=\"static/webcit_icons/openid-small.gif\"></td><td>");
 			escputs(buf);
 			wc_printf("</td><td>");
 			wc_printf("<a href=\"openid_detach?id_to_detach=");
diff --git a/webcit/roomchat.c b/webcit/roomchat.c
index fae0868a7..97e693c1e 100644
--- a/webcit/roomchat.c
+++ b/webcit/roomchat.c
@@ -132,7 +132,7 @@ void chat_rwho(void) {
 			else {
 				wc_printf("<span class=\"chat_notmyname_class\">");
 			}
-			wc_printf("<img src=\"static/icons/essen/16x16/chat.png\">");
+			wc_printf("<img src=\"static/webcit_icons/essen/16x16/chat.png\">");
 			escputs(buf);
 			wc_printf("</span><br>\n");
 		}
diff --git a/webcit/sieve.c b/webcit/sieve.c
index 80142ebea..c0f2cdde7 100644
--- a/webcit/sieve.c
+++ b/webcit/sieve.c
@@ -21,6 +21,7 @@
 #define MAX_SCRIPTS	100
 #define MAX_RULES	50
 #define RULES_SCRIPT	"__WebCit_Generated_Script__"
+
 #define FOO 1
 
 /*
@@ -699,7 +700,7 @@ void display_add_remove_scripts(char *message)
 
 	output_headers(1, 1, 2, 0, 0, 0);
 	wc_printf("<div id=\"banner\">\n");
-	wc_printf("<img src=\"static/icons/essen/32x32/config.png\">");
+	wc_printf("<img src=\"static/webcit_icons/essen/32x32/config.png\">");
 	wc_printf(_("Add or delete scripts"));
 	wc_printf("</h1>\n");
 	wc_printf("</div>\n");
@@ -986,17 +987,17 @@ void display_rules_editor_inner_div(void) {
 		wc_printf("</div>");
 
 		if (i>0) wc_printf("<a href=\"javascript:SwapRules(%d,%d);UpdateRules();\">"
-			"<img border=\"0\" src=\"static/icons/up_pointer.gif\" "
+			"<img border=\"0\" src=\"static/webcit_icons/up_pointer.gif\" "
 			"title=\"%s\"/></a>",
 			i-1, i, _("Move rule up") );
 
 		wc_printf("<a href=\"javascript:SwapRules(%d,%d);UpdateRules();\">"
-			"<img id=\"movedown%d\" border=\"0\" src=\"static/icons/down_pointer.gif\" "
+			"<img id=\"movedown%d\" border=\"0\" src=\"static/webcit_icons/down_pointer.gif\" "
 			"title=\"%s\"/></a>",
 			i, i+1, i, _("Move rule down") );
 
 		wc_printf("<a href=\"javascript:DeleteRule(%d);UpdateRules();\">"
-			"<img id=\"delete%d\" border=\"0\" src=\"static/icons/delete.gif\" "
+			"<img id=\"delete%d\" border=\"0\" src=\"static/webcit_icons/delete.gif\" "
 			"title=\"%s\"/></a>",
 			i, i, _("Delete rule") );
 
diff --git a/webcit/smtpqueue.c b/webcit/smtpqueue.c
index fd5c02abd..4cb1ce74b 100644
--- a/webcit/smtpqueue.c
+++ b/webcit/smtpqueue.c
@@ -243,7 +243,7 @@ void display_smtpqueue(void)
 		"<tr><td valign=top>\n");
 
 	wc_printf("<div id=\"smtpqueue_inner_div\">"
-		"<div align=\"center\"><img src=\"static/icons/throbber.gif\"></div>"
+		"<div align=\"center\"><img src=\"static/webcit_icons/throbber.gif\"></div>"
 		"</div>"
 		"<div align=\"center\">"
 		"<a href=\"javascript:RefreshSMTPqueueDisplay();\">%s</a>"
diff --git a/webcit/static/icons/8paint16.gif b/webcit/static/icons/8paint16.gif
deleted file mode 100644
index 5c2b48fe0..000000000
Binary files a/webcit/static/icons/8paint16.gif and /dev/null differ
diff --git a/webcit/static/icons/blank.gif b/webcit/static/icons/blank.gif
deleted file mode 100644
index 4bcc753a1..000000000
Binary files a/webcit/static/icons/blank.gif and /dev/null differ
diff --git a/webcit/static/icons/bubble.gif b/webcit/static/icons/bubble.gif
deleted file mode 100644
index 93adba3e2..000000000
Binary files a/webcit/static/icons/bubble.gif and /dev/null differ
diff --git a/webcit/static/icons/bubble_filler.gif b/webcit/static/icons/bubble_filler.gif
deleted file mode 100644
index 49c9a6b6b..000000000
Binary files a/webcit/static/icons/bubble_filler.gif and /dev/null differ
diff --git a/webcit/static/icons/citadel-button-32x32.gif b/webcit/static/icons/citadel-button-32x32.gif
deleted file mode 100644
index f16264f25..000000000
Binary files a/webcit/static/icons/citadel-button-32x32.gif and /dev/null differ
diff --git a/webcit/static/icons/closewindow.gif b/webcit/static/icons/closewindow.gif
deleted file mode 100644
index 0cdac60b0..000000000
Binary files a/webcit/static/icons/closewindow.gif and /dev/null differ
diff --git a/webcit/static/icons/delete.gif b/webcit/static/icons/delete.gif
deleted file mode 100644
index 430986304..000000000
Binary files a/webcit/static/icons/delete.gif and /dev/null differ
diff --git a/webcit/static/icons/down_pointer.gif b/webcit/static/icons/down_pointer.gif
deleted file mode 100644
index 49a3ef500..000000000
Binary files a/webcit/static/icons/down_pointer.gif and /dev/null differ
diff --git a/webcit/static/icons/error.gif b/webcit/static/icons/error.gif
deleted file mode 100644
index 57d398c3d..000000000
Binary files a/webcit/static/icons/error.gif and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/abort.png b/webcit/static/icons/essen/16x16/abort.png
deleted file mode 100644
index f7b62558f..000000000
Binary files a/webcit/static/icons/essen/16x16/abort.png and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/account.png b/webcit/static/icons/essen/16x16/account.png
deleted file mode 100644
index a705ea93e..000000000
Binary files a/webcit/static/icons/essen/16x16/account.png and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/activeuser.png b/webcit/static/icons/essen/16x16/activeuser.png
deleted file mode 100644
index e405a93c3..000000000
Binary files a/webcit/static/icons/essen/16x16/activeuser.png and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/addcontact.png b/webcit/static/icons/essen/16x16/addcontact.png
deleted file mode 100644
index 95a631973..000000000
Binary files a/webcit/static/icons/essen/16x16/addcontact.png and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/attachement.png b/webcit/static/icons/essen/16x16/attachement.png
deleted file mode 100644
index 7b54c84ae..000000000
Binary files a/webcit/static/icons/essen/16x16/attachement.png and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/back.png b/webcit/static/icons/essen/16x16/back.png
deleted file mode 100644
index 44c07d166..000000000
Binary files a/webcit/static/icons/essen/16x16/back.png and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/blog.png b/webcit/static/icons/essen/16x16/blog.png
deleted file mode 100644
index 72fe1d09b..000000000
Binary files a/webcit/static/icons/essen/16x16/blog.png and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/calendar.png b/webcit/static/icons/essen/16x16/calendar.png
deleted file mode 100644
index 224306c16..000000000
Binary files a/webcit/static/icons/essen/16x16/calendar.png and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/chat.png b/webcit/static/icons/essen/16x16/chat.png
deleted file mode 100644
index 6fd9a4898..000000000
Binary files a/webcit/static/icons/essen/16x16/chat.png and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/config.png b/webcit/static/icons/essen/16x16/config.png
deleted file mode 100644
index 6e4f4e716..000000000
Binary files a/webcit/static/icons/essen/16x16/config.png and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/contacts.png b/webcit/static/icons/essen/16x16/contacts.png
deleted file mode 100644
index 8c9472256..000000000
Binary files a/webcit/static/icons/essen/16x16/contacts.png and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/delete.png b/webcit/static/icons/essen/16x16/delete.png
deleted file mode 100644
index 787a6008a..000000000
Binary files a/webcit/static/icons/essen/16x16/delete.png and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/draft.png b/webcit/static/icons/essen/16x16/draft.png
deleted file mode 100644
index 73c3466e8..000000000
Binary files a/webcit/static/icons/essen/16x16/draft.png and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/email.png b/webcit/static/icons/essen/16x16/email.png
deleted file mode 100644
index c72837722..000000000
Binary files a/webcit/static/icons/essen/16x16/email.png and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/file.png b/webcit/static/icons/essen/16x16/file.png
deleted file mode 100644
index aff0a5cb0..000000000
Binary files a/webcit/static/icons/essen/16x16/file.png and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/forward.png b/webcit/static/icons/essen/16x16/forward.png
deleted file mode 100644
index 6c86a9a2e..000000000
Binary files a/webcit/static/icons/essen/16x16/forward.png and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/logout.png b/webcit/static/icons/essen/16x16/logout.png
deleted file mode 100644
index 10632efa0..000000000
Binary files a/webcit/static/icons/essen/16x16/logout.png and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/network.png b/webcit/static/icons/essen/16x16/network.png
deleted file mode 100644
index 68ac98369..000000000
Binary files a/webcit/static/icons/essen/16x16/network.png and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/nextroom.png b/webcit/static/icons/essen/16x16/nextroom.png
deleted file mode 100644
index c6a6ae697..000000000
Binary files a/webcit/static/icons/essen/16x16/nextroom.png and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/note.png b/webcit/static/icons/essen/16x16/note.png
deleted file mode 100644
index b807deb3e..000000000
Binary files a/webcit/static/icons/essen/16x16/note.png and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/pen.png b/webcit/static/icons/essen/16x16/pen.png
deleted file mode 100644
index 4d5bbd9a0..000000000
Binary files a/webcit/static/icons/essen/16x16/pen.png and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/pencil.png b/webcit/static/icons/essen/16x16/pencil.png
deleted file mode 100644
index 66167401a..000000000
Binary files a/webcit/static/icons/essen/16x16/pencil.png and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/readallmsg.png b/webcit/static/icons/essen/16x16/readallmsg.png
deleted file mode 100644
index c7c26ab7c..000000000
Binary files a/webcit/static/icons/essen/16x16/readallmsg.png and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/refresh.png b/webcit/static/icons/essen/16x16/refresh.png
deleted file mode 100644
index b6cb0e16f..000000000
Binary files a/webcit/static/icons/essen/16x16/refresh.png and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/room.png b/webcit/static/icons/essen/16x16/room.png
deleted file mode 100644
index 9951f00ea..000000000
Binary files a/webcit/static/icons/essen/16x16/room.png and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/rss.png b/webcit/static/icons/essen/16x16/rss.png
deleted file mode 100644
index eec61da01..000000000
Binary files a/webcit/static/icons/essen/16x16/rss.png and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/search.png b/webcit/static/icons/essen/16x16/search.png
deleted file mode 100644
index 699f40af1..000000000
Binary files a/webcit/static/icons/essen/16x16/search.png and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/skiproom.png b/webcit/static/icons/essen/16x16/skiproom.png
deleted file mode 100644
index 5cf416c08..000000000
Binary files a/webcit/static/icons/essen/16x16/skiproom.png and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/summary.png b/webcit/static/icons/essen/16x16/summary.png
deleted file mode 100644
index 74cb86bde..000000000
Binary files a/webcit/static/icons/essen/16x16/summary.png and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/task.png b/webcit/static/icons/essen/16x16/task.png
deleted file mode 100644
index 704acc229..000000000
Binary files a/webcit/static/icons/essen/16x16/task.png and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/taskday.png b/webcit/static/icons/essen/16x16/taskday.png
deleted file mode 100644
index c7a8a33e0..000000000
Binary files a/webcit/static/icons/essen/16x16/taskday.png and /dev/null differ
diff --git a/webcit/static/icons/essen/16x16/user.png b/webcit/static/icons/essen/16x16/user.png
deleted file mode 100644
index 2660b9a90..000000000
Binary files a/webcit/static/icons/essen/16x16/user.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/abort.png b/webcit/static/icons/essen/32x32/abort.png
deleted file mode 100644
index 72f9e21df..000000000
Binary files a/webcit/static/icons/essen/32x32/abort.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/account.png b/webcit/static/icons/essen/32x32/account.png
deleted file mode 100644
index b6520f758..000000000
Binary files a/webcit/static/icons/essen/32x32/account.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/activeuser.png b/webcit/static/icons/essen/32x32/activeuser.png
deleted file mode 100644
index 8cc8ba00e..000000000
Binary files a/webcit/static/icons/essen/32x32/activeuser.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/addcontact.png b/webcit/static/icons/essen/32x32/addcontact.png
deleted file mode 100644
index 6843212c6..000000000
Binary files a/webcit/static/icons/essen/32x32/addcontact.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/attachement.png b/webcit/static/icons/essen/32x32/attachement.png
deleted file mode 100644
index 56fcbcfcb..000000000
Binary files a/webcit/static/icons/essen/32x32/attachement.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/back.png b/webcit/static/icons/essen/32x32/back.png
deleted file mode 100644
index a367595c0..000000000
Binary files a/webcit/static/icons/essen/32x32/back.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/blog.png b/webcit/static/icons/essen/32x32/blog.png
deleted file mode 100644
index b0396590b..000000000
Binary files a/webcit/static/icons/essen/32x32/blog.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/calendar.png b/webcit/static/icons/essen/32x32/calendar.png
deleted file mode 100644
index 8e5ca0665..000000000
Binary files a/webcit/static/icons/essen/32x32/calendar.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/chat.png b/webcit/static/icons/essen/32x32/chat.png
deleted file mode 100644
index 7c4154a00..000000000
Binary files a/webcit/static/icons/essen/32x32/chat.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/check.png b/webcit/static/icons/essen/32x32/check.png
deleted file mode 100644
index dddc20c73..000000000
Binary files a/webcit/static/icons/essen/32x32/check.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/config.png b/webcit/static/icons/essen/32x32/config.png
deleted file mode 100644
index 8ee17d545..000000000
Binary files a/webcit/static/icons/essen/32x32/config.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/contact.png b/webcit/static/icons/essen/32x32/contact.png
deleted file mode 100644
index 8a130639b..000000000
Binary files a/webcit/static/icons/essen/32x32/contact.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/draft.png b/webcit/static/icons/essen/32x32/draft.png
deleted file mode 100644
index aa76cdc52..000000000
Binary files a/webcit/static/icons/essen/32x32/draft.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/email.png b/webcit/static/icons/essen/32x32/email.png
deleted file mode 100644
index eb9827606..000000000
Binary files a/webcit/static/icons/essen/32x32/email.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/feed.png b/webcit/static/icons/essen/32x32/feed.png
deleted file mode 100644
index 040720dcc..000000000
Binary files a/webcit/static/icons/essen/32x32/feed.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/file.png b/webcit/static/icons/essen/32x32/file.png
deleted file mode 100644
index 6b622b4ce..000000000
Binary files a/webcit/static/icons/essen/32x32/file.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/forward.png b/webcit/static/icons/essen/32x32/forward.png
deleted file mode 100644
index eae25fcdc..000000000
Binary files a/webcit/static/icons/essen/32x32/forward.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/logout.png b/webcit/static/icons/essen/32x32/logout.png
deleted file mode 100644
index 696bc506b..000000000
Binary files a/webcit/static/icons/essen/32x32/logout.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/network.png b/webcit/static/icons/essen/32x32/network.png
deleted file mode 100644
index 424f79bc9..000000000
Binary files a/webcit/static/icons/essen/32x32/network.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/nextroom.png b/webcit/static/icons/essen/32x32/nextroom.png
deleted file mode 100644
index c0255ba84..000000000
Binary files a/webcit/static/icons/essen/32x32/nextroom.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/note.png b/webcit/static/icons/essen/32x32/note.png
deleted file mode 100644
index 825245309..000000000
Binary files a/webcit/static/icons/essen/32x32/note.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/pen.png b/webcit/static/icons/essen/32x32/pen.png
deleted file mode 100644
index 2fed49d40..000000000
Binary files a/webcit/static/icons/essen/32x32/pen.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/pencil.png b/webcit/static/icons/essen/32x32/pencil.png
deleted file mode 100644
index b138a5f89..000000000
Binary files a/webcit/static/icons/essen/32x32/pencil.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/readallmsg.png b/webcit/static/icons/essen/32x32/readallmsg.png
deleted file mode 100644
index 80bbac65e..000000000
Binary files a/webcit/static/icons/essen/32x32/readallmsg.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/refresh.png b/webcit/static/icons/essen/32x32/refresh.png
deleted file mode 100644
index 573d92c89..000000000
Binary files a/webcit/static/icons/essen/32x32/refresh.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/room.png b/webcit/static/icons/essen/32x32/room.png
deleted file mode 100644
index 4d9932f8e..000000000
Binary files a/webcit/static/icons/essen/32x32/room.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/search.png b/webcit/static/icons/essen/32x32/search.png
deleted file mode 100644
index e331d5904..000000000
Binary files a/webcit/static/icons/essen/32x32/search.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/skiproom.png b/webcit/static/icons/essen/32x32/skiproom.png
deleted file mode 100644
index d8dcb1fb7..000000000
Binary files a/webcit/static/icons/essen/32x32/skiproom.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/summary.png b/webcit/static/icons/essen/32x32/summary.png
deleted file mode 100644
index 60d872901..000000000
Binary files a/webcit/static/icons/essen/32x32/summary.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/task.png b/webcit/static/icons/essen/32x32/task.png
deleted file mode 100644
index ca8b05118..000000000
Binary files a/webcit/static/icons/essen/32x32/task.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/taskday.png b/webcit/static/icons/essen/32x32/taskday.png
deleted file mode 100644
index bb53abadf..000000000
Binary files a/webcit/static/icons/essen/32x32/taskday.png and /dev/null differ
diff --git a/webcit/static/icons/essen/32x32/user.png b/webcit/static/icons/essen/32x32/user.png
deleted file mode 100644
index 292dd1cc1..000000000
Binary files a/webcit/static/icons/essen/32x32/user.png and /dev/null differ
diff --git a/webcit/static/icons/openid-32x32.gif b/webcit/static/icons/openid-32x32.gif
deleted file mode 100644
index a840e2adf..000000000
Binary files a/webcit/static/icons/openid-32x32.gif and /dev/null differ
diff --git a/webcit/static/icons/openid-small.gif b/webcit/static/icons/openid-small.gif
deleted file mode 100644
index cde836c89..000000000
Binary files a/webcit/static/icons/openid-small.gif and /dev/null differ
diff --git a/webcit/static/icons/resizecorner.png b/webcit/static/icons/resizecorner.png
deleted file mode 100644
index fa3e382c5..000000000
Binary files a/webcit/static/icons/resizecorner.png and /dev/null differ
diff --git a/webcit/static/icons/resizegrippy.gif b/webcit/static/icons/resizegrippy.gif
deleted file mode 100644
index 3cba00594..000000000
Binary files a/webcit/static/icons/resizegrippy.gif and /dev/null differ
diff --git a/webcit/static/icons/sort_none.gif b/webcit/static/icons/sort_none.gif
deleted file mode 100644
index 68dce00f3..000000000
Binary files a/webcit/static/icons/sort_none.gif and /dev/null differ
diff --git a/webcit/static/icons/throbber.gif b/webcit/static/icons/throbber.gif
deleted file mode 100644
index 772aa892d..000000000
Binary files a/webcit/static/icons/throbber.gif and /dev/null differ
diff --git a/webcit/static/icons/up_pointer.gif b/webcit/static/icons/up_pointer.gif
deleted file mode 100644
index 83e5e61ba..000000000
Binary files a/webcit/static/icons/up_pointer.gif and /dev/null differ
diff --git a/webcit/static/instant_messenger.html b/webcit/static/instant_messenger.html
index 1c01634d2..d254e0ba4 100644
--- a/webcit/static/instant_messenger.html
+++ b/webcit/static/instant_messenger.html
@@ -131,7 +131,7 @@ function ShowNewMsg(gexp_xmlresponse) {
 			+ '<br><form method=\"post\" action=\"null\" name=\"sendform_' + which_div + '\" '
 			+ 'onSubmit=\"return SendSomething(\'' + which_div + '\', \'sendform_'
 			+ which_div + '\', \'' + sender + '\');\">'
-			+ '<img src=\"icons/essen/16x16/chat.png\">&nbsp;'
+			+ '<img src=\"webcit_icons/essen/16x16/chat.png\">&nbsp;'
 			+ '<input type=\"text\" size=\"72\" maxlength=\"600\" name=\"sendthis\">'
 			+ '</form>'
 			+ '<br></div>'
diff --git a/webcit/static/styles/iconbaricns.css b/webcit/static/styles/iconbaricns.css
index 6d3778a98..a0e3e103e 100644
--- a/webcit/static/styles/iconbaricns.css
+++ b/webcit/static/styles/iconbaricns.css
@@ -18,40 +18,40 @@
     min-height: 25px; /* Makes all of the 'button' to be clickable */
 }
 #ib_summary {
-    background-image: url("/static/icons/essen/32x32/summary.png");
+    background-image: url("/static/webcit_icons/essen/32x32/summary.png");
 }
 #ib_inbox {
-    background-image: url("/static/icons/essen/32x32/email.png");
+    background-image: url("/static/webcit_icons/essen/32x32/email.png");
 }
 #ib_calendar {
-    background-image: url("/static/icons/essen/32x32/calendar.png");
+    background-image: url("/static/webcit_icons/essen/32x32/calendar.png");
 }
 #ib_contacts {
-    background-image: url("/static/icons/essen/32x32/contact.png");
+    background-image: url("/static/webcit_icons/essen/32x32/contact.png");
 }
 #ib_notes {
-    background-image: url("/static/icons/essen/32x32/note.png");
+    background-image: url("/static/webcit_icons/essen/32x32/note.png");
 }
 #ib_tasks {
-    background-image: url("/static/icons/essen/32x32/task.png");
+    background-image: url("/static/webcit_icons/essen/32x32/task.png");
 }
 #ib_rooms {
-    background-image: url("/static/icons/essen/32x32/room.png");
+    background-image: url("/static/webcit_icons/essen/32x32/room.png");
 }
 #ib_users {
-    background-image: url("/static/icons/essen/32x32/user.png");
+    background-image: url("/static/webcit_icons/essen/32x32/user.png");
 }
 #ib_chat {
-    background-image: url("/static/icons/essen/32x32/chat.png");
+    background-image: url("/static/webcit_icons/essen/32x32/chat.png");
 }
 #ib_advanced, #ib_admin {
-    background-image: url("/static/icons/essen/32x32/config.png");
+    background-image: url("/static/webcit_icons/essen/32x32/config.png");
 }
 #ib_aide {
-    background-image: url("/static/icons/essen/32x32/config.png");
+    background-image: url("/static/webcit_icons/essen/32x32/config.png");
 }
 #ib_logoff {
-    background-image: url("/static/icons/essen/32x32/logout.png");
+    background-image: url("/static/webcit_icons/essen/32x32/logout.png");
 }
 #citlogo {
     display: block !important;
diff --git a/webcit/static/styles/webcit.css b/webcit/static/styles/webcit.css
index e0368b180..c397bb641 100644
--- a/webcit/static/styles/webcit.css
+++ b/webcit/static/styles/webcit.css
@@ -96,7 +96,7 @@ body {
 #message_list_hdr table { font-style: italic }
 
 #resize_msglist {
-	background-image: url(/static/icons/resizegrippy.gif);
+	background-image: url(/static/webcit_icons/resizegrippy.gif);
 	background-position: center;
 	background-repeat: no-repeat; 
 }
@@ -546,17 +546,17 @@ body {
 /* Override to disable list-style-image" */
 .room a, .room a, .room a:visited, .room a:link { color: #f0feff }
 
-.room-private { list-style-image: url("/static/icons/essen/16x16/email.png") }
+.room-private { list-style-image: url("/static/webcit_icons/essen/16x16/email.png") }
 
-.room-addr { list-style-image: url("/static/icons/essen/16x16/contact.png") }
+.room-addr { list-style-image: url("/static/webcit_icons/essen/16x16/contact.png") }
 
-.room-cal { list-style-image: url("/static/icons/essen/16x16/calendar.png") }
+.room-cal { list-style-image: url("/static/webcit_icons/essen/16x16/calendar.png") }
 
-.room-tasks { list-style-image: url("/static/icons/essen/16x16/task.png") }
+.room-tasks { list-style-image: url("/static/webcit_icons/essen/16x16/task.png") }
 
-.room-notes { list-style-image: url("/static/icons/essen/16x16/note.png") }
+.room-notes { list-style-image: url("/static/webcit_icons/essen/16x16/note.png") }
 
-.room-chat { list-style-image: url("/static/icons/essen/16x16/room.png") }
+.room-chat { list-style-image: url("/static/webcit_icons/essen/16x16/room.png") }
 
 .room-newmsgs { font-weight: bold }
 
@@ -723,9 +723,9 @@ div.auto_complete ul strong.highlight {
 	background-position: center right;
 }
 
-.sort_ascending { background-image: url("/static/icons/down_pointer.gif") }
+.sort_ascending { background-image: url("/static/webcit_icons/down_pointer.gif") }
 
-.sort_descending { background-image: url("/static/icons/up_pointer.gif") }
+.sort_descending { background-image: url("/static/webcit_icons/up_pointer.gif") }
 
 #message_list_hdr > table { border-collapse: collapse }
 
@@ -1160,14 +1160,14 @@ a.event_title:hover span.tooltip, a.event_unread:hover span.tooltip, a.event_rea
 a.event_title:hover span.btttop, a.event_unread:hover span.btttop, a.event_read:hover span.btttop {
 	display: block;
 	padding: 30px 8px 0;
-	background: url(/static/icons/bubble.gif) no-repeat top;
+	background: url(/static/webcit_icons/bubble.gif) no-repeat top;
 }
 
 /* different middle bg for stretch */
 a.event_title:hover span.bttmiddle, a.event_unread:hover span.bttmiddle, a.event_read:hover span.bttmiddle {
 	display: block;
 	padding: 0 8px; 
-	background: url(/static/icons/bubble_filler.gif) repeat bottom; 
+	background: url(/static/webcit_icons/bubble_filler.gif) repeat bottom; 
 	color: #022750;
 	font-size: 10px;
 }
@@ -1175,7 +1175,7 @@ a.event_title:hover span.bttmiddle, a.event_unread:hover span.bttmiddle, a.event
 a.event_title:hover span.bttbottom, a.event_unread:hover span.bttbottom, a.event_read:hover span.bttbottom {
 	display: block;
 	padding:3px 8px 10px;
-	background: url(/static/icons/bubble.gif) no-repeat bottom;
+	background: url(/static/webcit_icons/bubble.gif) no-repeat bottom;
 }
 
 
@@ -1321,7 +1321,7 @@ a.event_title:hover span.bttbottom, a.event_unread:hover span.bttbottom, a.event
 }
 
 .openid_urlarea {
-        background: url('../icons/openid-small.gif') no-repeat scroll 0pt 50%;
+        background: url('../webcit_icons/openid-small.gif') no-repeat scroll 0pt 50%;
         padding-left: 18px;
 }
 
diff --git a/webcit/static/t/aide/edituser/select.html b/webcit/static/t/aide/edituser/select.html
index 99ffe326a..7f026bafb 100644
--- a/webcit/static/t/aide/edituser/select.html
+++ b/webcit/static/t/aide/edituser/select.html
@@ -1,7 +1,7 @@
 <?=("head")>
 <?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
 <div id="banner">
-	<img src="static/icons/essen/32x32/account.png">
+	<img src="static/webcit_icons/essen/32x32/account.png">
 	<h1><??("COND:AIDE", 1)><?_("Edit or delete users")><??("X", 1)></h1>
 </div>
 
diff --git a/webcit/static/t/aide/serverrestart/box.html b/webcit/static/t/aide/serverrestart/box.html
index 147d87ce3..b9baf851e 100644
--- a/webcit/static/t/aide/serverrestart/box.html
+++ b/webcit/static/t/aide/serverrestart/box.html
@@ -1,4 +1,4 @@
-<img src="static/icons/throbber.gif" /> 
+<img src="static/webcit_icons/throbber.gif" /> 
 <font color="#AAAAAA">
  <?_("Please wait while the Citadel server is restarted... ")>
 </font>
diff --git a/webcit/static/t/aide/serverrestart/box_page_do.html b/webcit/static/t/aide/serverrestart/box_page_do.html
index 3a5a78352..258975a56 100644
--- a/webcit/static/t/aide/serverrestart/box_page_do.html
+++ b/webcit/static/t/aide/serverrestart/box_page_do.html
@@ -1,4 +1,4 @@
-<img src="static/icons/throbber.gif" /> 
+<img src="static/webcit_icons/throbber.gif" /> 
 <font color="#AAAAAA">
  <?_("Please wait while your users are being paged, the citadel server will be restarted after that... ")>
 </font>
diff --git a/webcit/static/t/confirmlogoff.html b/webcit/static/t/confirmlogoff.html
index bed1454ae..fbf525f31 100644
--- a/webcit/static/t/confirmlogoff.html
+++ b/webcit/static/t/confirmlogoff.html
@@ -1,6 +1,6 @@
 <html>
 	<body><center>
-		<h1><a href="termquit"><img src="static/icons/essen/32x32/logout.png" border="0">&nbsp;<?_("Log off")></a></h1>
-		<h1><a href="javascript:toggleModal(0);"><img src="static/icons/essen/32x32/abort.png" border="0">&nbsp;<?_("Cancel")></a></h1>
+		<h1><a href="termquit"><img src="static/webcit_icons/essen/32x32/logout.png" border="0">&nbsp;<?_("Log off")></a></h1>
+		<h1><a href="javascript:toggleModal(0);"><img src="static/webcit_icons/essen/32x32/abort.png" border="0">&nbsp;<?_("Cancel")></a></h1>
 	</center></body>
 </html>
diff --git a/webcit/static/t/edit_message.html b/webcit/static/t/edit_message.html
index b5ae5258c..36ceb4da5 100644
--- a/webcit/static/t/edit_message.html
+++ b/webcit/static/t/edit_message.html
@@ -5,7 +5,7 @@
 
 <div id="attachments_form">
     <div id="loading">
-      <p><img src="static/icons/throbber.gif" alt=""></p>
+      <p><img src="static/webcit_icons/throbber.gif" alt=""></p>
       <p><?_("Loading")></p>
     </div>
 </div>
@@ -104,7 +104,7 @@
 <div style="display:none" id="submit-o-matic"><ul>
 <li>
 	<a href="javascript:submit_post('post');">
-		<img src="static/icons/essen/16x16/pencil.png" alt=""">
+		<img src="static/webcit_icons/essen/16x16/pencil.png" alt=""">
 		<span class="navbar_link">
 		<?!("COND:BSTR", 1, "__RCPTREQUIRED")><?_("Send message")><?!("X", 1)>
 		<??("COND:BSTR", 2, "__RCPTREQUIRED")><?_("Post message")><?!("X", 2)>
@@ -113,7 +113,7 @@
 </li>
 <li>
 	<a href="javascript:submit_post('draft');">
-		<img src="static/icons/essen/16x16/draft.png" alt=""">
+		<img src="static/webcit_icons/essen/16x16/draft.png" alt=""">
 		<span class="navbar_link">
 		<?_("Save to Drafts")>
 		</span>
@@ -121,7 +121,7 @@
 </li>
 <li>
 	<a href="javascript:show_attachments_form();">
-		<img src="static/icons/essen/16x16/attachement.png" alt=""">
+		<img src="static/webcit_icons/essen/16x16/attachement.png" alt=""">
 		<span class="navbar_link">
 		<?_("Attachments:")>
 		<span id="num_attachments"><?MSG:NATTACH></span>
@@ -130,7 +130,7 @@
 </li>
 <li>
 	<a href="javascript:submit_post('cancel');">
-		<img src="static/icons/essen/16x16/delete.png" alt="">
+		<img src="static/webcit_icons/essen/16x16/delete.png" alt="">
 		<span class="navbar_link">
 		<?_("Cancel")>
 		</span>
@@ -138,7 +138,7 @@
 </li>
 <?!("COND:BSTR", 1, "__RCPTREQUIRED")><li>
 	<a href="javascript:PopOpenAddressBook('recp_id|<?_("To:")>|cc_id|<?_("CC:")>|bcc_id|<?_("BCC:")>');">
-		<img src="static/icons/essen/16x16/contact.png" alt=""">
+		<img src="static/webcit_icons/essen/16x16/contact.png" alt=""">
 		<span class="navbar_link">
 		<?_("Contacts")>
 		</span>
diff --git a/webcit/static/t/edit_message/attachments_pane.html b/webcit/static/t/edit_message/attachments_pane.html
index edec77866..d4824078c 100644
--- a/webcit/static/t/edit_message/attachments_pane.html
+++ b/webcit/static/t/edit_message/attachments_pane.html
@@ -1,8 +1,8 @@
 <div align="right">
 	<a href="javascript:hide_attachments_form();">
-		<?_("Close window")>&nbsp;<img src="static/icons/closewindow.gif" border="0"></div>
+		<?_("Close window")>&nbsp;<img src="static/webcit_icons/closewindow.gif" border="0"></div>
 	</a>
-	<h2><img src="static/icons/essen/16x16/attachement.png">&nbsp;<?_("Attachments:")></h2>
+	<h2><img src="static/webcit_icons/essen/16x16/attachement.png">&nbsp;<?_("Attachments:")></h2>
 	<ul><?ITERATE("MSG:ATTACHNAMES", ="edit_message_section_attach_select")></ul>
 
 	<iframe id="upload_target" name="upload_target" src="" style="width:0;height:0;border:0">
@@ -18,6 +18,6 @@
 		</div>
 
 		<div id="upload_throbber" style="display:none">
-			<?_("Upload")>&nbsp;<img src="static/icons/throbber.gif" border="0">
+			<?_("Upload")>&nbsp;<img src="static/webcit_icons/throbber.gif" border="0">
 		</div>
 	</form>
diff --git a/webcit/static/t/files/section_onefile.html b/webcit/static/t/files/section_onefile.html
index 72cef8c3c..32ecdf0c6 100644
--- a/webcit/static/t/files/section_onefile.html
+++ b/webcit/static/t/files/section_onefile.html
@@ -11,7 +11,7 @@
 <td><?FILE:SIZE></td>
 <td><?FILE:MIMETYPE></td>
 <td><?FILE:COMMENT("X")></td>
-<??("COND:AIDE", 4)><td><a href="delete_file?file=<?FILE:NAME("U")>"><img src="static/icons/essen/16x16/delete.png" alt="<?_("Delete File")>"></a></td><??("X", 4)>
+<??("COND:AIDE", 4)><td><a href="delete_file?file=<?FILE:NAME("U")>"><img src="static/webcit_icons/essen/16x16/delete.png" alt="<?_("Delete File")>"></a></td><??("X", 4)>
 </tr>
 
 <?!("COND:ITERATE:LASTN", 2)>
diff --git a/webcit/static/t/get_logged_in.html b/webcit/static/t/get_logged_in.html
index 8011697b9..b371af9d7 100644
--- a/webcit/static/t/get_logged_in.html
+++ b/webcit/static/t/get_logged_in.html
@@ -6,7 +6,7 @@
 </div>
 <div id="loginbox_closebutton">
 <a href="javascript:toggleModal(0);">
-<?_("Close window")>&nbsp;<img src="static/icons/closewindow.gif" border="0"></a>
+<?_("Close window")>&nbsp;<img src="static/webcit_icons/closewindow.gif" border="0"></a>
 </div>
 </div>
 <br><br>
@@ -14,12 +14,12 @@
 <div id="auth_container">
 <div id="authbar">
 <ul id="button">
-<li class="ib_button" style='background-image: url("/static/icons/citadel-button-32x32.gif");'>
+<li class="ib_button" style='background-image: url("/static/webcit_icons/citadel-button-32x32.gif");'>
     <a class="ib_button_link" href="javascript:authtoggle('authbox_userpass');" title="<?SERV:HUMANNODE>"><span>
         <?SERV:HUMANNODE>
     </span></a>
 </li>
-<?!("COND:SERV:OPENID",1)><li class="ib_button" style='background-image: url("/static/icons/openid-32x32.gif");'>
+<?!("COND:SERV:OPENID",1)><li class="ib_button" style='background-image: url("/static/webcit_icons/openid-32x32.gif");'>
     <a class="ib_button_link" href="javascript:authtoggle('authbox_openid');" title="OpenID"><span>
         OpenID
     </span></a>
diff --git a/webcit/static/t/iconbar/edit.html b/webcit/static/t/iconbar/edit.html
index 7c81b1568..93695974c 100644
--- a/webcit/static/t/iconbar/edit.html
+++ b/webcit/static/t/iconbar/edit.html
@@ -25,63 +25,63 @@
 		<tr class="odd"><td>
 			<input type="radio" name="ib_summary" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_summary", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
 			<input type="radio" name="ib_summary" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_summary", "CHECKED", "")>> <?_("No")> <br>
-			</td><td><img src="static/icons/essen/32x32/summary.png" alt="&nbsp;"></td>
+			</td><td><img src="static/webcit_icons/essen/32x32/summary.png" alt="&nbsp;"></td>
 			<td><b><?_("Summary")></b><br><?_("Your summary page")></td>
 		</tr>
 		<tr class="even"><td>
 			<input type="radio" name="ib_inbox" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_inbox", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
 			<input type="radio" name="ib_inbox" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_inbox", "CHECKED", "")>> <?_("No")> <br>
 			</td>
-			<td><img src="static/icons/essen/32x32/email.png" alt="&nbsp;"></td>
+			<td><img src="static/webcit_icons/essen/32x32/email.png" alt="&nbsp;"></td>
 			<td><b><?_("Mail (inbox)")></b><br><?_("A shortcut to your email Inbox")></td>
 		</tr>
 		<tr class="odd"><td>
 			<input type="radio" name="ib_contacts" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_contacts", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
 			<input type="radio" name="ib_contacts" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_contacts", "CHECKED", "")>> <?_("No")> <br>
-			</td><td><img src="static/icons/essen/32x32/contact.png" alt="&nbsp;">
+			</td><td><img src="static/webcit_icons/essen/32x32/contact.png" alt="&nbsp;">
 			</td><td><b><?_("Contacts")></b><br><?_("Your personal address book")></td>
 		</tr>
 		<tr class="even"><td>
 			<input type="radio" name="ib_notes" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_notes", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
 			<input type="radio" name="ib_notes" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_notes", "CHECKED", "")>> <?_("No")> <br>
 			</td>
-			<td><img src="static/icons/essen/32x32/note.png" alt="&nbsp;"></td>
+			<td><img src="static/webcit_icons/essen/32x32/note.png" alt="&nbsp;"></td>
 			<td><b><?_("Notes")></b><br><?_("Your personal notes")></td>
 		</tr>
 		<tr class="odd"><td>
 			<input type="radio" name="ib_calendar" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_calendar", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
 			<input type="radio" name="ib_calendar" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_calendar", "CHECKED", "")>> <?_("No")> <br>
-			</td><td><img src="static/icons/essen/32x32/calendar.png" alt="&nbsp;"></td>
+			</td><td><img src="static/webcit_icons/essen/32x32/calendar.png" alt="&nbsp;"></td>
 			<td><b><?_("Calendar")></b><br><?_("A shortcut to your personal calendar")></td>
 		</tr>
 		<tr class="even"><td>
 			<input type="radio" name="ib_tasks" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_tasks", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
 			<input type="radio" name="ib_tasks" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_tasks", "CHECKED", "")>> <?_("No")> <br>
-			</td><td><img src="static/icons/essen/32x32/task.png" alt="&nbsp;"></td>
+			</td><td><img src="static/webcit_icons/essen/32x32/task.png" alt="&nbsp;"></td>
 			<td><b><?_("Tasks")></b><br><?_("A shortcut to your personal task list")></td>
 		</tr>
 		<tr class="odd"><td>
 			<input type="radio" name="ib_rooms" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_rooms", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
 			<input type="radio" name="ib_rooms" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_rooms", "CHECKED", "")>> <?_("No")> <br>
-			</td><td><img src="static/icons/essen/32x32/room.png" alt="&nbsp;"></td>
+			</td><td><img src="static/webcit_icons/essen/32x32/room.png" alt="&nbsp;"></td>
 			<td><b><?_("Rooms")></b><br><?_("Clicking this icon displays a list of all accessible rooms (or folders) available.")></td>
 		</tr>
 		<tr class="even"><td>
 			<input type="radio" name="ib_users" value="yes"     <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_users", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
 			<input type="radio" name="ib_users" value="no"      <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_users", "CHECKED", "")>> <?_("No")> <br>
-			</td><td><img src="static/icons/essen/32x32/user.png" alt="&nbsp;"></td>
+			</td><td><img src="static/webcit_icons/essen/32x32/user.png" alt="&nbsp;"></td>
 			<td><b><?_("Who is online?")></b><br><?_("Clicking this icon displays a list of all users currently logged in.")></td>
 		</tr>
 		<tr class="odd"><td>
 			<input type="radio" name="ib_chat" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_chat", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
 			<input type="radio" name="ib_chat" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_chat", "CHECKED", "")>> <?_("No")> <br>
-			</td><td><img src="static/icons/essen/32x32/chat.png" alt="&nbsp;"></td>
+			</td><td><img src="static/webcit_icons/essen/32x32/chat.png" alt="&nbsp;"></td>
 			<td><b><?_("Chat")></b><br><?_("Clicking this icon enters real-time chat mode with other users in the same room.")></td>
 		</tr>
 		<tr class="even"><td>
 			<input type="radio" name="ib_advanced" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_advanced", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
 			<input type="radio" name="ib_advanced" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_advanced", "CHECKED", "")>> <?_("No")> <br>
-			</td><td><img src="static/icons/essen/32x32/config.png" alt="&nbsp;"></td>
+			</td><td><img src="static/webcit_icons/essen/32x32/config.png" alt="&nbsp;"></td>
 			<td><b><?_("Advanced options")></b><br><?_("Access to the complete menu of Citadel functions.")></td>
 		</tr>
 		<tr class="odd"><td>
diff --git a/webcit/static/t/iconbar/save.html b/webcit/static/t/iconbar/save.html
index d57a93638..bac3f9912 100644
--- a/webcit/static/t/iconbar/save.html
+++ b/webcit/static/t/iconbar/save.html
@@ -6,7 +6,7 @@
 <div id="content" class="service">
 	<center>
 		<table border=1 bgcolor="#ffffff"><tr><td>
-			<img src="static/icons/essen/32x32/config.png">
+			<img src="static/webcit_icons/essen/32x32/config.png">
 			&nbsp;
 			<?_("Your icon bar has been updated. Please select any of its choices to continue.")>(<br><span style="font-weight: bold;"><?_("You may need to force refresh (SHIFT-F5)> in order for changes to take effect")>)</span>
 		</td></tr></table>
diff --git a/webcit/static/t/msg_listview.html b/webcit/static/t/msg_listview.html
index 68bbfa8c8..223d25ea1 100644
--- a/webcit/static/t/msg_listview.html
+++ b/webcit/static/t/msg_listview.html
@@ -16,7 +16,7 @@ var sortmode = ""; /*"<?PREF:ROOM:VALUE("sort")>";*/
 <div id="summary_view">
   <table id="message_list_body" class="mailbox_summary"><tr style="display: none;"><td colspan="4"></td></tr></table>
     <div id="loading">
-      <p><img src="static/icons/throbber.gif" alt=""></p>
+      <p><img src="static/webcit_icons/throbber.gif" alt=""></p>
       <p><?_("Loading messages from server, please wait")></p>
     </div>
 </div>
diff --git a/webcit/static/t/navbar.html b/webcit/static/t/navbar.html
index 5aa0cb1b9..009cc6e7c 100644
--- a/webcit/static/t/navbar.html
+++ b/webcit/static/t/navbar.html
@@ -1,7 +1,7 @@
 <div id="navbar"><ul>
 	<li class="ungoto">
 		<a href="ungoto">
-			<img src="static/icons/essen/16x16/back.png" alt="" width="16" height="16">
+			<img src="static/webcit_icons/essen/16x16/back.png" alt="" width="16" height="16">
 			<span class="navbar_link"><?_("Ungoto")></span>
 		</a>
 	</li>
@@ -9,19 +9,19 @@
 <?!("COND:THISROOM:CURR_VIEW", 10, #"VIEW_BBS")>
 	<li class="newmess">
 		<a href="readnew">
-			<img src="static/icons/essen/16x16/pencil.png" alt="" width="16" height="16">
+			<img src="static/webcit_icons/essen/16x16/pencil.png" alt="" width="16" height="16">
 			<span class="navbar_link"><?_("Read new messages")></span>
 		</a>
 	</li>
 	<li class="readallmess">
 		<a href="readfwd">
-			<img src="static/icons/essen/16x16/readallmsg.png" alt="" width="16" height="16">
+			<img src="static/webcit_icons/essen/16x16/readallmsg.png" alt="" width="16" height="16">
 			<span class="navbar_link"><?_("Read all messages")></span>
 		</a>
 	</li>
 	<li class="newmess">
 		<a href="javascript:GetLoggedInFirst('display_enter')">
-			<img  src="static/icons/essen/16x16/pencil.png" alt="" width="16" height="16">
+			<img  src="static/webcit_icons/essen/16x16/pencil.png" alt="" width="16" height="16">
 			<span class="navbar_link"><?_("Enter a message")></span>
 		</a>
 	</li>
@@ -30,13 +30,13 @@
 <?!("COND:THISROOM:CURR_VIEW", 20, #"VIEW_ADDRESSBOOK")>
 	<li class="viewcontacts">
 		<a href="readfwd">
-			<img src="static/icons/essen/16x16/search.png" alt="" width="16" height="16">
+			<img src="static/webcit_icons/essen/16x16/search.png" alt="" width="16" height="16">
 			<span class="navbar_link"><?_("View contacts")></span>
 		</a>
 	</li>
 	<li class="addnewcontact">
 		<a href="javascript:GetLoggedInFirst('display_enter')">
-			<img src="static/icons/essen/16x16/addcontact.png" alt="" width="16" height="16">
+			<img src="static/webcit_icons/essen/16x16/addcontact.png" alt="" width="16" height="16">
 			<span class="navbar_link"><?_("Add new contact")></span>
 		</a>
 	</li>
@@ -45,19 +45,19 @@
 <?!("COND:THISROOM:CURR_VIEW", 30, #"VIEW_CALENDAR")>
 	<li class="staskday">
 		<a href="readfwd?calview=day">
-			<img src="static/icons/essen/16x16/taskday.png" alt="" width="16" height="16">
+			<img src="static/webcit_icons/essen/16x16/taskday.png" alt="" width="16" height="16">
 			<span class="navbar_link"><?_("Day view")></span>
 		</a>
 	</li>
 	<li class="monthview">
 		<a href="readfwd?calview=month">
-			<img src="static/icons/essen/16x16/calendar.png" alt="" width="16" height="16">
+			<img src="static/webcit_icons/essen/16x16/calendar.png" alt="" width="16" height="16">
 			<span class="navbar_link"><?_("Month view")></span>
 		</a>
 	</li>
 	<li class="addevent">
 		<a href="display_enter<?BSTR:FORWARD("year", "U")><?BSTR:FORWARD("month", "U")><?BSTR:FORWARD("day", "U")>">
-		  	<img  src="static/icons/essen/16x16/pencil.png" alt="" width="16" height="16">
+		  	<img  src="static/webcit_icons/essen/16x16/pencil.png" alt="" width="16" height="16">
 			<span class="navbar_link"><?_("Add new event")></span>
 		</a>
 	</li>
@@ -66,7 +66,7 @@
 <?!("COND:THISROOM:CURR_VIEW", 40, #"VIEW_CALBRIEF")>
 	<li class="monthview">
 		<a href="readfwd?calview=month">
-			<img src="static/icons/essen/16x16/calendar.png" alt="" width="16" height="16">
+			<img src="static/webcit_icons/essen/16x16/calendar.png" alt="" width="16" height="16">
 			<span class="navbar_link"><?_("Calendar list")></span>
 		</a>
 	</li>
@@ -75,13 +75,13 @@
 <?!("COND:THISROOM:CURR_VIEW", 50, #"VIEW_TASKS")>
 	<li class="taskmanag">
 		<a href="readfwd">
-			<img src="static/icons/essen/16x16/task.png" alt="" width="16" height="16">
+			<img src="static/webcit_icons/essen/16x16/task.png" alt="" width="16" height="16">
 			<span class="navbar_link"><?_("View tasks")></span>
 		</a>
 	</li>
 	<li class="newmess">
 		<a href="javascript:GetLoggedInFirst('display_enter')">
-			<img  src="static/icons/essen/16x16/pencil.png" alt="" width="16" height="16">
+			<img  src="static/webcit_icons/essen/16x16/pencil.png" alt="" width="16" height="16">
 			<span class="navbar_link"><?_("Add new task")></span>
 		</a>
 	</li>
@@ -90,14 +90,14 @@
 <?!("COND:THISROOM:CURR_VIEW", 60, #"VIEW_NOTES")>
 	<li class="viewnotes">
 		<a href="readfwd">
-			<img src="static/icons/essen/16x16/note.png" alt="" width="16" height="16">
+			<img src="static/webcit_icons/essen/16x16/note.png" alt="" width="16" height="16">
 			<span class="navbar_link"><?_("View notes")>
 			</span>
 		</a>
 	</li>
 	<li class="enternewnote">
 		<a href="add_new_note">
-			<img  src="static/icons/essen/16x16/pencil.png" alt="" width="16" height="16">
+			<img  src="static/webcit_icons/essen/16x16/pencil.png" alt="" width="16" height="16">
 			<span class="navbar_link"><?_("Add new note")></span>
 		</a>
 	</li>
@@ -106,19 +106,19 @@
 <?!("COND:THISROOM:CURR_VIEW", 70, #"VIEW_MAILBOX")>
 	<li class="readallmess">
 		<a id="m_refresh" href="readfwd">
-			<img src="static/icons/essen/16x16/readallmsg.png" alt="" width="16" height="16">
+			<img src="static/webcit_icons/essen/16x16/readallmsg.png" alt="" width="16" height="16">
 			<span class="navbar_link"><?_("Refresh message list")></span>
 		</a>
 	</li>
 	<li class="deleteselectedmess">
 		<a href="javascript:deleteAllSelectedMessages();">
-			<img src="static/icons/essen/16x16/delete.png" alt="" width="16" height="16">
+			<img src="static/webcit_icons/essen/16x16/delete.png" alt="" width="16" height="16">
 			<span class="navbar_link"><?_("Delete")></span>
 		</a>
 	</li>
 	<li class="newmess">
 		<a href="javascript:GetLoggedInFirst('display_enter')">
-			<img src="static/icons/essen/16x16/pencil.png" alt="" width="16" height="16">
+			<img src="static/webcit_icons/essen/16x16/pencil.png" alt="" width="16" height="16">
 			<span class="navbar_link"><?_("Write mail")></span>
 		</a>
 	</li>
@@ -128,20 +128,20 @@
         <??("COND:WIKI:PAGE", 81, "home")>
 	<li class="readallmess">
 		<a href="wiki?page=home">
-			<img src="static/icons/essen/16x16/readallmsg.png" alt="" width="16" height="16">
+			<img src="static/webcit_icons/essen/16x16/readallmsg.png" alt="" width="16" height="16">
 			<span class="navbar_link"><?_("Wiki home")></span>
 		</a>
 	</li>
 	<?!("X", 81)>
 		<li class="newmess">
 				<a href="javascript:GetLoggedInFirst(encodeURIComponent('display_enter<?BSTR:FORWARD("page", "U")>'))">
-					<img  src="static/icons/essen/16x16/pencil.png" alt="" width="16" height="16">
+					<img  src="static/webcit_icons/essen/16x16/pencil.png" alt="" width="16" height="16">
 					<span class="navbar_link"><?_("Edit this page")></span>
 				</a>
 			</li>
 		<li class="newmess">
 			<a href="wiki<?%("COND:WIKI:TYPE", 84, "wiki_history", "", "", "_history")><?BSTR:FORWARD("page", "U")>">
-				<img  src="static/icons/essen/16x16/pen.png" alt="" width="16" height="16">
+				<img  src="static/webcit_icons/essen/16x16/pen.png" alt="" width="16" height="16">
 				<span class="navbar_link"><?%("COND:WIKI:TYPE", 86, "wiki_history", "", _("Current version", _("History"))></span>
 			</a>
 		</li>
@@ -150,7 +150,7 @@
 <?!("COND:THISROOM:CURR_VIEW", 90, #"VIEW_BLOG")>
 	<li class="newmess">
 		<a href="javascript:GetLoggedInFirst('display_enter')">
-			<img src="static/icons/essen/16x16/pencil.png" alt="" width="16" height="16">
+			<img src="static/webcit_icons/essen/16x16/pencil.png" alt="" width="16" height="16">
 			<span class="navbar_link"><?_("New blog post")></span>
 		</a>
 	</li>
@@ -158,13 +158,13 @@
 	
 	<li class="skipthisroom">
 		<a href="skip" title="<?_("Leave all messages marked as unread, go to next room with unread messages")>">
-			<img  src="static/icons/essen/16x16/skiproom.png" alt="" width="16" height="16">
+			<img  src="static/webcit_icons/essen/16x16/skiproom.png" alt="" width="16" height="16">
 			<span class="navbar_link"><?_("Skip this room")></span>
 		</a>
 	</li>
 	<li class="markngo">
 		<a href="gotonext" title="<?_("Mark all messages as read, go to next room with unread messages")>">
-			<img  src="static/icons/essen/16x16/nextroom.png" alt="" width="16" height="16">
+			<img  src="static/webcit_icons/essen/16x16/nextroom.png" alt="" width="16" height="16">
 			<span class="navbar_link"><?_("Goto next room")></span></a>
 	</li>
 </ul></div>
diff --git a/webcit/static/t/openid_manual_create.html b/webcit/static/t/openid_manual_create.html
index c364e3d02..c67d62d43 100644
--- a/webcit/static/t/openid_manual_create.html
+++ b/webcit/static/t/openid_manual_create.html
@@ -1,5 +1,5 @@
 <div class="login_infos">
-	<img src="static/icons/openid-small.gif"><?_("Your OpenID")> <tt><?BSTR("__claimed_id", "X")></tt> <?_("was successfully verified.")><br>
+	<img src="static/webcit_icons/openid-small.gif"><?_("Your OpenID")> <tt><?BSTR("__claimed_id", "X")></tt> <?_("was successfully verified.")><br>
 <?!("COND:BSTR", 1, "__username")><?_("However, the user name")>  '<?BSTR("__username", "X")>' <?_("conflicts with an existing user.")><??("X", 1)>
 <br>
 	<?_("Please specify the user name you would like to use.")><br>
diff --git a/webcit/static/t/room/edit/tab_access.html b/webcit/static/t/room/edit/tab_access.html
index 9aee5442c..3048972f4 100644
--- a/webcit/static/t/room/edit/tab_access.html
+++ b/webcit/static/t/room/edit/tab_access.html
@@ -31,7 +31,7 @@
 				</center>
 				<!-- Pop open an address book - begin -->
 				<a href="javascript:PopOpenAddressBook('username_id|<?_("User")>');" title="<?_("Users")>">
-					<img align="middle" border="0" width="24" height="24" alt="<?_("Addressbook Popup")>" src="static/icons/essen/16x16/contact.png">
+					<img align="middle" border="0" width="24" height="24" alt="<?_("Addressbook Popup")>" src="static/webcit_icons/essen/16x16/contact.png">
 					&nbsp;<?_("Users")>
 				</a>
 				<!-- Pop open an address book - end -->
diff --git a/webcit/static/t/room/edit/tab_listserv.html b/webcit/static/t/room/edit/tab_listserv.html
index 62798ed31..38579b06e 100644
--- a/webcit/static/t/room/edit/tab_listserv.html
+++ b/webcit/static/t/room/edit/tab_listserv.html
@@ -35,7 +35,7 @@
 		<div align="right">
 			<a href="javascript:PopOpenAddressBook('add_as_listrecp|<?_("List")>|add_as_digestrecp|<?_("Digest")>')"
 			title="<?_("Add recipients from Contacts or other address books")>">
-			<img align="middle" border="0" width="24" height="24" alt="<?_("Addressbook Popup")>" src="static/icons/essen/16x16/contact.png">
+			<img align="middle" border="0" width="24" height="24" alt="<?_("Addressbook Popup")>" src="static/webcit_icons/essen/16x16/contact.png">
 			&nbsp;<?_("Add recipients from Contacts or other address books")></a>
 		</div>
 		<!-- Pop open an address book - end -->
diff --git a/webcit/static/t/room/view_picture.html b/webcit/static/t/room/view_picture.html
index 517ab9a0c..42ce877fc 100644
--- a/webcit/static/t/room/view_picture.html
+++ b/webcit/static/t/room/view_picture.html
@@ -2,30 +2,30 @@
 <img height="64px" alt="<?_("Room Logo")>" src="image?name=_roompic_?room=<?ROOMNAME("U")>">
 <?!("X", 1)><??("COND:THISROOM:HAVE_PIC", 2)>
 	<?!("COND:ROOM:TYPE_IS", 3, #"VIEW_ADDRESSBOOK")>
-		<img class="roompic" alt="" src="static/icons/essen/32x32/contact.png">
+		<img class="roompic" alt="" src="static/webcit_icons/essen/32x32/contact.png">
 	<?!("X", 3)>
 	<?!("COND:ROOM:TYPE_IS", 4, #"VIEW_CALENDAR")>
-		<img class="roompic" alt="" src="static/icons/essen/32x32/calendar.png">
+		<img class="roompic" alt="" src="static/webcit_icons/essen/32x32/calendar.png">
         <?!("X", 4)>
 	<?!("COND:ROOM:TYPE_IS", 5, #"VIEW_CALBRIEF")>
-		<img class="roompic" alt="" src="static/icons/essen/32x32/calendar.png">
+		<img class="roompic" alt="" src="static/webcit_icons/essen/32x32/calendar.png">
 	<?!("X", 5)>
 	<?!("COND:ROOM:TYPE_IS", 6, #"VIEW_TASKS")>
-		<img class="roompic" alt="" src="static/icons/essen/32x32/task.png">
+		<img class="roompic" alt="" src="static/webcit_icons/essen/32x32/task.png">
 	<?!("X", 6)>
 	<?!("COND:ROOM:TYPE_IS", 7, #"VIEW_NOTES")>
-		<img class="roompic" alt="" src="static/icons/essen/32x32/note.png">
+		<img class="roompic" alt="" src="static/webcit_icons/essen/32x32/note.png">
         <?!("X", 7)>
 	<?!("COND:ROOM:TYPE_IS", 8, #"VIEW_MAILBOX")>
-		<img class="roompic" alt="" src="static/icons/essen/32x32/email.png">
+		<img class="roompic" alt="" src="static/webcit_icons/essen/32x32/email.png">
         <?!("X", 8)>
 	<?!("COND:ROOM:TYPE_IS", 9, #"VIEW_BBS")>
-                <img class="roompic" alt="" src="static/icons/essen/32x32/room.png">
+                <img class="roompic" alt="" src="static/webcit_icons/essen/32x32/room.png">
         <?!("X", 9)>
 	<?!("COND:ROOM:TYPE_IS", 9, #"VIEW_JOURNAL")>
-                <img class="roompic" alt="" src="static/icons/essen/32x32/chat.png">
+                <img class="roompic" alt="" src="static/webcit_icons/essen/32x32/chat.png">
         <?!("X", 9)>
 	<?!("COND:ROOM:TYPE_IS", 9, #"VIEW_BLOG")>
-                <img class="roompic" alt="" src="static/icons/essen/32x32/blog.png">
+                <img class="roompic" alt="" src="static/webcit_icons/essen/32x32/blog.png">
         <?!("X", 9)>
 <??("X", 2)>
diff --git a/webcit/static/t/room/zap_entry.html b/webcit/static/t/room/zap_entry.html
index 4fd2369df..eba8ad5af 100644
--- a/webcit/static/t/room/zap_entry.html
+++ b/webcit/static/t/room/zap_entry.html
@@ -2,10 +2,10 @@
 	<span class="<?%("COND:ROOM:FLAG:UA", 4, #"UA_HASNEWMSGS", 0, "roomlist_new", "roomlist_old")>">
 		<?ROOM:INFO:LEVELNTIMES("&nbsp;&nbsp;&nbsp;")><?ROOM:INFO:BASENAME>
 		<??("COND:THISROOM:FLAG:QR", 1, #"QR_DIRECTORY")>
-			<img src="/static/icons/essen/16x16/file.png" alt="<?_("Has Files")>">
+			<img src="/static/webcit_icons/essen/16x16/file.png" alt="<?_("Has Files")>">
 		<??("X", 1)>
 		<??("COND:THISROOM:FLAG:QR", 2, #"QR_NETWORK")>
-			<img src="/static/icons/essen/16x16/network.png" alt="<?_("Networked Room")>">
+			<img src="/static/webcit_icons/essen/16x16/network.png" alt="<?_("Networked Room")>">
 		<??("X", 2)>
 	</span>
 </a><br>
diff --git a/webcit/static/t/roomchat.html b/webcit/static/t/roomchat.html
index 2fd363441..b37aa2dac 100644
--- a/webcit/static/t/roomchat.html
+++ b/webcit/static/t/roomchat.html
@@ -4,7 +4,7 @@
 <div id="chatsend" class="chatsend_class">
 	<form method="POST" onsubmit="return chatsendfunc()" action="chat_send" id="chatsendid" name="chatsendform">
 	<input type="hidden" name="nonce" value="<?NONCE>">
-	<img src="static/icons/essen/32x32/chat.png" alt="">
+	<img src="static/webcit_icons/essen/32x32/chat.png" alt="">
 	<textarea id="send_this_id" name="send_this" rows="4" cols="78"
  		onKeyPress="chat_enter(event);"></textarea>
 	<input type="submit" value="<?_("Send")>">
diff --git a/webcit/static/t/vnoteitem.html b/webcit/static/t/vnoteitem.html
index 1b14feed0..5d8652539 100644
--- a/webcit/static/t/vnoteitem.html
+++ b/webcit/static/t/vnoteitem.html
@@ -9,12 +9,12 @@
 >
 <table border=0 cellpadding=0 cellspacing=0 valign=middle width=100%><tr>
 <td align=left valign=middle>
-<img onclick="NotesClickPalette(event,'<?VNOTE:UID>')" src="static/icons/8paint16.gif">
+<img onclick="NotesClickPalette(event,'<?VNOTE:UID>')" src="static/webcit_icons/8paint16.gif">
 </td>
 <td></td><!-- nothing in the title bar, its just for dragging-->
 <td align=right valign=middle>
  <img onclick="DeleteStickyNote(event,'<?VNOTE:UID>','<?_("Delete this note?")>')"
-  src="static/icons/closewindow.gif">
+  src="static/webcit_icons/closewindow.gif">
 </td></tr></table>
 </div>
 <!--end title bar div; begin body div-->
diff --git a/webcit/static/t/who.html b/webcit/static/t/who.html
index 1ef171e83..02053e914 100644
--- a/webcit/static/t/who.html
+++ b/webcit/static/t/who.html
@@ -9,7 +9,7 @@
 
 <div id="banner">
 	<div class="banner">
-		<img alt="" src="static/icons/essen/32x32/user.png">
+		<img alt="" src="static/webcit_icons/essen/32x32/user.png">
 		<h1><?_("Users currently on ")><?SERV:HUMANNODE></h1>
 	</div>
 	<?=("loggedinas")>
diff --git a/webcit/static/t/who/box_list_static.html b/webcit/static/t/who/box_list_static.html
index 69a4c6822..3ca2ce94d 100644
--- a/webcit/static/t/who/box_list_static.html
+++ b/webcit/static/t/who/box_list_static.html
@@ -12,7 +12,7 @@
 </div>
 <div class="instructions">
 	<?_("Click on a name to read user info.  Click on")>
-		<img align="middle" src="static/icons/essen/16x16/chat.png" alt="(p)">
+		<img align="middle" src="static/webcit_icons/essen/16x16/chat.png" alt="(p)">
 	<?_("to send an instant message to that user.")>
 </div>
 
diff --git a/webcit/static/t/who/section.html b/webcit/static/t/who/section.html
index 1c08ee449..17235f607 100644
--- a/webcit/static/t/who/section.html
+++ b/webcit/static/t/who/section.html
@@ -7,15 +7,15 @@
 	</td>
 	<!-- link to page this user -->
 		<td width="5%"><a href="display_page?recp=<?WHO:NAME("X")>">
-   			<img align="middle" src="static/icons/essen/16x16/chat.png" alt="(p)"></a> 
+   			<img align="middle" src="static/webcit_icons/essen/16x16/chat.png" alt="(p)"></a> 
 		</td>
 	<!-- idle flag -->
 		<td width="5%">
 			<?!("WHO:IDLE", 4)>
-				<img align="middle" src="static/icons/essen/16x16/user.png" alt="(<?_("idle since")>s <?WHO:IDLESINCE> <?_("Minutes")>)">
+				<img align="middle" src="static/webcit_icons/essen/16x16/user.png" alt="(<?_("idle since")>s <?WHO:IDLESINCE> <?_("Minutes")>)">
 			<?!("X", 4)>
 			<??("WHO:IDLE", 5)>
-				<img align="middle" src="static/icons/essen/16x16/activeuser.png" alt="(<?_("active")>)">
+				<img align="middle" src="static/webcit_icons/essen/16x16/activeuser.png" alt="(<?_("active")>)">
 			<?!("X", 5)>
 		</td>
 		<td>
diff --git a/webcit/static/t/who/summary_section.html b/webcit/static/t/who/summary_section.html
index 9d404a941..a5dc85fbf 100644
--- a/webcit/static/t/who/summary_section.html
+++ b/webcit/static/t/who/summary_section.html
@@ -1,15 +1,15 @@
 <tr class="<?ITERATE:ODDEVEN>">
 	<!-- link to page this user -->
 	<td width="5%"><a href="display_page?recp=<?WHO:NAME("X")>">
-   		<img align="middle" src="static/icons/essen/16x16/chat.png" alt="(p)"></a> 
+   		<img align="middle" src="static/webcit_icons/essen/16x16/chat.png" alt="(p)"></a> 
 	</td>
 	<!-- idle flag -->
 	<td width="5%">
 		<?!("WHO:IDLE", 4)>
-			<img align="middle" src="static/icons/essen/16x16/user.png" alt="(<?_("idle since")>s <?WHO:IDLESINCE> <?_("Minutes")>)">
+			<img align="middle" src="static/webcit_icons/essen/16x16/user.png" alt="(<?_("idle since")>s <?WHO:IDLESINCE> <?_("Minutes")>)">
 		<?!("X", 4)>
 		<??("WHO:IDLE", 5)>
-			<img align="middle" src="static/icons/essen/16x16/activeuser.png" alt="(<?_("active")>)">
+			<img align="middle" src="static/webcit_icons/essen/16x16/activeuser.png" alt="(<?_("active")>)">
 		<?!("X", 5)>
 	</td>
 	<td>
diff --git a/webcit/static/webcit_icons/8paint16.gif b/webcit/static/webcit_icons/8paint16.gif
new file mode 100644
index 000000000..5c2b48fe0
Binary files /dev/null and b/webcit/static/webcit_icons/8paint16.gif differ
diff --git a/webcit/static/webcit_icons/blank.gif b/webcit/static/webcit_icons/blank.gif
new file mode 100644
index 000000000..4bcc753a1
Binary files /dev/null and b/webcit/static/webcit_icons/blank.gif differ
diff --git a/webcit/static/webcit_icons/bubble.gif b/webcit/static/webcit_icons/bubble.gif
new file mode 100644
index 000000000..93adba3e2
Binary files /dev/null and b/webcit/static/webcit_icons/bubble.gif differ
diff --git a/webcit/static/webcit_icons/bubble_filler.gif b/webcit/static/webcit_icons/bubble_filler.gif
new file mode 100644
index 000000000..49c9a6b6b
Binary files /dev/null and b/webcit/static/webcit_icons/bubble_filler.gif differ
diff --git a/webcit/static/webcit_icons/citadel-button-32x32.gif b/webcit/static/webcit_icons/citadel-button-32x32.gif
new file mode 100644
index 000000000..f16264f25
Binary files /dev/null and b/webcit/static/webcit_icons/citadel-button-32x32.gif differ
diff --git a/webcit/static/webcit_icons/closewindow.gif b/webcit/static/webcit_icons/closewindow.gif
new file mode 100644
index 000000000..0cdac60b0
Binary files /dev/null and b/webcit/static/webcit_icons/closewindow.gif differ
diff --git a/webcit/static/webcit_icons/delete.gif b/webcit/static/webcit_icons/delete.gif
new file mode 100644
index 000000000..430986304
Binary files /dev/null and b/webcit/static/webcit_icons/delete.gif differ
diff --git a/webcit/static/webcit_icons/down_pointer.gif b/webcit/static/webcit_icons/down_pointer.gif
new file mode 100644
index 000000000..49a3ef500
Binary files /dev/null and b/webcit/static/webcit_icons/down_pointer.gif differ
diff --git a/webcit/static/webcit_icons/error.gif b/webcit/static/webcit_icons/error.gif
new file mode 100644
index 000000000..57d398c3d
Binary files /dev/null and b/webcit/static/webcit_icons/error.gif differ
diff --git a/webcit/static/webcit_icons/essen/16x16/abort.png b/webcit/static/webcit_icons/essen/16x16/abort.png
new file mode 100644
index 000000000..f7b62558f
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/abort.png differ
diff --git a/webcit/static/webcit_icons/essen/16x16/account.png b/webcit/static/webcit_icons/essen/16x16/account.png
new file mode 100644
index 000000000..a705ea93e
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/account.png differ
diff --git a/webcit/static/webcit_icons/essen/16x16/activeuser.png b/webcit/static/webcit_icons/essen/16x16/activeuser.png
new file mode 100644
index 000000000..e405a93c3
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/activeuser.png differ
diff --git a/webcit/static/webcit_icons/essen/16x16/addcontact.png b/webcit/static/webcit_icons/essen/16x16/addcontact.png
new file mode 100644
index 000000000..95a631973
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/addcontact.png differ
diff --git a/webcit/static/webcit_icons/essen/16x16/attachement.png b/webcit/static/webcit_icons/essen/16x16/attachement.png
new file mode 100644
index 000000000..7b54c84ae
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/attachement.png differ
diff --git a/webcit/static/webcit_icons/essen/16x16/back.png b/webcit/static/webcit_icons/essen/16x16/back.png
new file mode 100644
index 000000000..44c07d166
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/back.png differ
diff --git a/webcit/static/webcit_icons/essen/16x16/blog.png b/webcit/static/webcit_icons/essen/16x16/blog.png
new file mode 100644
index 000000000..72fe1d09b
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/blog.png differ
diff --git a/webcit/static/webcit_icons/essen/16x16/calendar.png b/webcit/static/webcit_icons/essen/16x16/calendar.png
new file mode 100644
index 000000000..224306c16
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/calendar.png differ
diff --git a/webcit/static/webcit_icons/essen/16x16/chat.png b/webcit/static/webcit_icons/essen/16x16/chat.png
new file mode 100644
index 000000000..6fd9a4898
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/chat.png differ
diff --git a/webcit/static/webcit_icons/essen/16x16/config.png b/webcit/static/webcit_icons/essen/16x16/config.png
new file mode 100644
index 000000000..6e4f4e716
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/config.png differ
diff --git a/webcit/static/webcit_icons/essen/16x16/contacts.png b/webcit/static/webcit_icons/essen/16x16/contacts.png
new file mode 100644
index 000000000..8c9472256
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/contacts.png differ
diff --git a/webcit/static/webcit_icons/essen/16x16/delete.png b/webcit/static/webcit_icons/essen/16x16/delete.png
new file mode 100644
index 000000000..787a6008a
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/delete.png differ
diff --git a/webcit/static/webcit_icons/essen/16x16/draft.png b/webcit/static/webcit_icons/essen/16x16/draft.png
new file mode 100644
index 000000000..73c3466e8
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/draft.png differ
diff --git a/webcit/static/webcit_icons/essen/16x16/email.png b/webcit/static/webcit_icons/essen/16x16/email.png
new file mode 100644
index 000000000..c72837722
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/email.png differ
diff --git a/webcit/static/webcit_icons/essen/16x16/file.png b/webcit/static/webcit_icons/essen/16x16/file.png
new file mode 100644
index 000000000..aff0a5cb0
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/file.png differ
diff --git a/webcit/static/webcit_icons/essen/16x16/forward.png b/webcit/static/webcit_icons/essen/16x16/forward.png
new file mode 100644
index 000000000..6c86a9a2e
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/forward.png differ
diff --git a/webcit/static/webcit_icons/essen/16x16/logout.png b/webcit/static/webcit_icons/essen/16x16/logout.png
new file mode 100644
index 000000000..10632efa0
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/logout.png differ
diff --git a/webcit/static/webcit_icons/essen/16x16/network.png b/webcit/static/webcit_icons/essen/16x16/network.png
new file mode 100644
index 000000000..68ac98369
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/network.png differ
diff --git a/webcit/static/webcit_icons/essen/16x16/nextroom.png b/webcit/static/webcit_icons/essen/16x16/nextroom.png
new file mode 100644
index 000000000..c6a6ae697
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/nextroom.png differ
diff --git a/webcit/static/webcit_icons/essen/16x16/note.png b/webcit/static/webcit_icons/essen/16x16/note.png
new file mode 100644
index 000000000..b807deb3e
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/note.png differ
diff --git a/webcit/static/webcit_icons/essen/16x16/pen.png b/webcit/static/webcit_icons/essen/16x16/pen.png
new file mode 100644
index 000000000..4d5bbd9a0
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/pen.png differ
diff --git a/webcit/static/webcit_icons/essen/16x16/pencil.png b/webcit/static/webcit_icons/essen/16x16/pencil.png
new file mode 100644
index 000000000..66167401a
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/pencil.png differ
diff --git a/webcit/static/webcit_icons/essen/16x16/readallmsg.png b/webcit/static/webcit_icons/essen/16x16/readallmsg.png
new file mode 100644
index 000000000..c7c26ab7c
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/readallmsg.png differ
diff --git a/webcit/static/webcit_icons/essen/16x16/refresh.png b/webcit/static/webcit_icons/essen/16x16/refresh.png
new file mode 100644
index 000000000..b6cb0e16f
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/refresh.png differ
diff --git a/webcit/static/webcit_icons/essen/16x16/room.png b/webcit/static/webcit_icons/essen/16x16/room.png
new file mode 100644
index 000000000..9951f00ea
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/room.png differ
diff --git a/webcit/static/webcit_icons/essen/16x16/rss.png b/webcit/static/webcit_icons/essen/16x16/rss.png
new file mode 100644
index 000000000..eec61da01
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/rss.png differ
diff --git a/webcit/static/webcit_icons/essen/16x16/search.png b/webcit/static/webcit_icons/essen/16x16/search.png
new file mode 100644
index 000000000..699f40af1
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/search.png differ
diff --git a/webcit/static/webcit_icons/essen/16x16/skiproom.png b/webcit/static/webcit_icons/essen/16x16/skiproom.png
new file mode 100644
index 000000000..5cf416c08
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/skiproom.png differ
diff --git a/webcit/static/webcit_icons/essen/16x16/summary.png b/webcit/static/webcit_icons/essen/16x16/summary.png
new file mode 100644
index 000000000..74cb86bde
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/summary.png differ
diff --git a/webcit/static/webcit_icons/essen/16x16/task.png b/webcit/static/webcit_icons/essen/16x16/task.png
new file mode 100644
index 000000000..704acc229
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/task.png differ
diff --git a/webcit/static/webcit_icons/essen/16x16/taskday.png b/webcit/static/webcit_icons/essen/16x16/taskday.png
new file mode 100644
index 000000000..c7a8a33e0
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/taskday.png differ
diff --git a/webcit/static/webcit_icons/essen/16x16/user.png b/webcit/static/webcit_icons/essen/16x16/user.png
new file mode 100644
index 000000000..2660b9a90
Binary files /dev/null and b/webcit/static/webcit_icons/essen/16x16/user.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/abort.png b/webcit/static/webcit_icons/essen/32x32/abort.png
new file mode 100644
index 000000000..72f9e21df
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/abort.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/account.png b/webcit/static/webcit_icons/essen/32x32/account.png
new file mode 100644
index 000000000..b6520f758
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/account.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/activeuser.png b/webcit/static/webcit_icons/essen/32x32/activeuser.png
new file mode 100644
index 000000000..8cc8ba00e
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/activeuser.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/addcontact.png b/webcit/static/webcit_icons/essen/32x32/addcontact.png
new file mode 100644
index 000000000..6843212c6
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/addcontact.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/attachement.png b/webcit/static/webcit_icons/essen/32x32/attachement.png
new file mode 100644
index 000000000..56fcbcfcb
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/attachement.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/back.png b/webcit/static/webcit_icons/essen/32x32/back.png
new file mode 100644
index 000000000..a367595c0
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/back.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/blog.png b/webcit/static/webcit_icons/essen/32x32/blog.png
new file mode 100644
index 000000000..b0396590b
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/blog.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/calendar.png b/webcit/static/webcit_icons/essen/32x32/calendar.png
new file mode 100644
index 000000000..8e5ca0665
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/calendar.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/chat.png b/webcit/static/webcit_icons/essen/32x32/chat.png
new file mode 100644
index 000000000..7c4154a00
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/chat.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/check.png b/webcit/static/webcit_icons/essen/32x32/check.png
new file mode 100644
index 000000000..dddc20c73
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/check.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/config.png b/webcit/static/webcit_icons/essen/32x32/config.png
new file mode 100644
index 000000000..8ee17d545
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/config.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/contact.png b/webcit/static/webcit_icons/essen/32x32/contact.png
new file mode 100644
index 000000000..8a130639b
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/contact.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/draft.png b/webcit/static/webcit_icons/essen/32x32/draft.png
new file mode 100644
index 000000000..aa76cdc52
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/draft.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/email.png b/webcit/static/webcit_icons/essen/32x32/email.png
new file mode 100644
index 000000000..eb9827606
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/email.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/feed.png b/webcit/static/webcit_icons/essen/32x32/feed.png
new file mode 100644
index 000000000..040720dcc
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/feed.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/file.png b/webcit/static/webcit_icons/essen/32x32/file.png
new file mode 100644
index 000000000..6b622b4ce
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/file.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/forward.png b/webcit/static/webcit_icons/essen/32x32/forward.png
new file mode 100644
index 000000000..eae25fcdc
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/forward.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/logout.png b/webcit/static/webcit_icons/essen/32x32/logout.png
new file mode 100644
index 000000000..696bc506b
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/logout.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/network.png b/webcit/static/webcit_icons/essen/32x32/network.png
new file mode 100644
index 000000000..424f79bc9
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/network.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/nextroom.png b/webcit/static/webcit_icons/essen/32x32/nextroom.png
new file mode 100644
index 000000000..c0255ba84
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/nextroom.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/note.png b/webcit/static/webcit_icons/essen/32x32/note.png
new file mode 100644
index 000000000..825245309
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/note.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/pen.png b/webcit/static/webcit_icons/essen/32x32/pen.png
new file mode 100644
index 000000000..2fed49d40
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/pen.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/pencil.png b/webcit/static/webcit_icons/essen/32x32/pencil.png
new file mode 100644
index 000000000..b138a5f89
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/pencil.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/readallmsg.png b/webcit/static/webcit_icons/essen/32x32/readallmsg.png
new file mode 100644
index 000000000..80bbac65e
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/readallmsg.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/refresh.png b/webcit/static/webcit_icons/essen/32x32/refresh.png
new file mode 100644
index 000000000..573d92c89
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/refresh.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/room.png b/webcit/static/webcit_icons/essen/32x32/room.png
new file mode 100644
index 000000000..4d9932f8e
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/room.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/search.png b/webcit/static/webcit_icons/essen/32x32/search.png
new file mode 100644
index 000000000..e331d5904
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/search.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/skiproom.png b/webcit/static/webcit_icons/essen/32x32/skiproom.png
new file mode 100644
index 000000000..d8dcb1fb7
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/skiproom.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/summary.png b/webcit/static/webcit_icons/essen/32x32/summary.png
new file mode 100644
index 000000000..60d872901
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/summary.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/task.png b/webcit/static/webcit_icons/essen/32x32/task.png
new file mode 100644
index 000000000..ca8b05118
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/task.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/taskday.png b/webcit/static/webcit_icons/essen/32x32/taskday.png
new file mode 100644
index 000000000..bb53abadf
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/taskday.png differ
diff --git a/webcit/static/webcit_icons/essen/32x32/user.png b/webcit/static/webcit_icons/essen/32x32/user.png
new file mode 100644
index 000000000..292dd1cc1
Binary files /dev/null and b/webcit/static/webcit_icons/essen/32x32/user.png differ
diff --git a/webcit/static/webcit_icons/openid-32x32.gif b/webcit/static/webcit_icons/openid-32x32.gif
new file mode 100644
index 000000000..a840e2adf
Binary files /dev/null and b/webcit/static/webcit_icons/openid-32x32.gif differ
diff --git a/webcit/static/webcit_icons/openid-small.gif b/webcit/static/webcit_icons/openid-small.gif
new file mode 100644
index 000000000..cde836c89
Binary files /dev/null and b/webcit/static/webcit_icons/openid-small.gif differ
diff --git a/webcit/static/webcit_icons/resizecorner.png b/webcit/static/webcit_icons/resizecorner.png
new file mode 100644
index 000000000..fa3e382c5
Binary files /dev/null and b/webcit/static/webcit_icons/resizecorner.png differ
diff --git a/webcit/static/webcit_icons/resizegrippy.gif b/webcit/static/webcit_icons/resizegrippy.gif
new file mode 100644
index 000000000..3cba00594
Binary files /dev/null and b/webcit/static/webcit_icons/resizegrippy.gif differ
diff --git a/webcit/static/webcit_icons/sort_none.gif b/webcit/static/webcit_icons/sort_none.gif
new file mode 100644
index 000000000..68dce00f3
Binary files /dev/null and b/webcit/static/webcit_icons/sort_none.gif differ
diff --git a/webcit/static/webcit_icons/throbber.gif b/webcit/static/webcit_icons/throbber.gif
new file mode 100644
index 000000000..772aa892d
Binary files /dev/null and b/webcit/static/webcit_icons/throbber.gif differ
diff --git a/webcit/static/webcit_icons/up_pointer.gif b/webcit/static/webcit_icons/up_pointer.gif
new file mode 100644
index 000000000..83e5e61ba
Binary files /dev/null and b/webcit/static/webcit_icons/up_pointer.gif differ
diff --git a/webcit/subst.c b/webcit/subst.c
index c737e75fb..f857882dc 100644
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -2435,9 +2435,9 @@ enum {
 };
 
 ConstStr SortIcons[] = {
-	{HKEY("static/icons/sort_none.gif")},
-	{HKEY("static/icons/up_pointer.gif")},
-	{HKEY("static/icons/down_pointer.gif")},
+	{HKEY("static/webcit_icons/sort_none.gif")},
+	{HKEY("static/webcit_icons/up_pointer.gif")},
+	{HKEY("static/webcit_icons/down_pointer.gif")},
 };
 
 ConstStr SortNextOrder[] = {
diff --git a/webcit/summary.c b/webcit/summary.c
index ed7bbef47..0d2ec5f23 100644
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -286,7 +286,7 @@ void summary(void) {
 	output_headers(1, 1, 2, 0, 0, 0);
 	wc_printf("<div id=\"banner\" class=\"banner\">\n");
 	wc_printf("<table border=0><tr>");
-        wc_printf("<td><img src=\"static/icons/essen/32x32/summary.png\"></td>");
+        wc_printf("<td><img src=\"static/webcit_icons/essen/32x32/summary.png\"></td>");
         wc_printf("<td><h1>");
         snprintf(title, sizeof title, _("Summary page for %s"),
 		( (WC->logged_in) ?  ChrPtr(WC->wc_fullname) : ChrPtr(WC->serv_info->serv_humannode))
diff --git a/webcit/userlist.c b/webcit/userlist.c
index b9c08818a..7b63bf81b 100644
--- a/webcit/userlist.c
+++ b/webcit/userlist.c
@@ -113,7 +113,7 @@ void showuser(void)
 
 	output_headers(1, 1, 2, 0, 0, 0);
 	wc_printf("<div id=\"banner\">\n");
-	wc_printf("<img src=\"static/icons/essen/32x32/account.png\">");
+	wc_printf("<img src=\"static/webcit_icons/essen/32x32/account.png\">");
         wc_printf("<h1>");
 	wc_printf(_("User profile"));
         wc_printf("</h1>");
@@ -150,7 +150,7 @@ void showuser(void)
 	wc_printf("<br><a href=\"display_page?recp=");
 	urlescputs(who);
 	wc_printf("\">"
-		"<img src=\"static/icons/essen/16x16/chat.png\" "
+		"<img src=\"static/webcit_icons/essen/16x16/chat.png\" "
 		"align=middle border=0>&nbsp;&nbsp;");
 	snprintf(buf, sizeof buf, _("Click here to send an instant message to %s"), who);
 	escputs(buf);
diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index 4934cf6ee..140743038 100644
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -505,7 +505,7 @@ void display_parsed_vcard(StrBuf *Target, struct vCard *v, int full, wc_mime_att
 		if (pass == 1) {
 			StrBufAppendPrintf(Target, "<tr bgcolor=\"#aaaaaa\">"
       "<td colspan=2 bgcolor=\"#ffffff\">"
-      "<img align=\"center\" src=\"static/icons/essen/32x32/contact.png\">"
+      "<img align=\"center\" src=\"static/webcit_icons/essen/32x32/contact.png\">"
       "<font size=\"+1\"><b>");
 			StrEscAppend(Target, NULL, fullname, 0, 0);
 			StrBufAppendPrintf(Target, "</b></font>");