Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into manpage

(This used to be commit eff27744d3dcb4f6bcdf9bd03583bb38634c398d)

1378 files changed, 45 insertions, 1836 deletions

diff --git a/BUGS.txt b/BUGS4.txt
index 1a9790ddd9..1a9790ddd9 100644
--- a/BUGS.txt
+++ b/BUGS4.txt
diff --git a/NEWS b/NEWS4
index 8a63719a0e..8a63719a0e 100644
--- a/NEWS
+++ b/NEWS4
diff --git a/TODO b/TODO4
index 14df8a507a..14df8a507a 100644
--- a/TODO
+++ b/TODO4
diff --git a/WHATSNEW.txt b/WHATSNEW4.txt
index 726fb1cd97..726fb1cd97 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW4.txt
diff --git a/howto.txt b/howto4.txt
index 3ae225ddb8..3ae225ddb8 100644
--- a/howto.txt
+++ b/howto4.txt
diff --git a/packaging/Fedora/cplusplus-headers.patch b/packaging4/Fedora/cplusplus-headers.patch
index ce05f54599..ce05f54599 100644
--- a/packaging/Fedora/cplusplus-headers.patch
+++ b/packaging4/Fedora/cplusplus-headers.patch
diff --git a/packaging/Fedora/samba4.init b/packaging4/Fedora/samba4.init
index a04cce92c5..a04cce92c5 100644
--- a/packaging/Fedora/samba4.init
+++ b/packaging4/Fedora/samba4.init
diff --git a/packaging/Fedora/samba4.log b/packaging4/Fedora/samba4.log
index cd0cf9ae07..cd0cf9ae07 100644
--- a/packaging/Fedora/samba4.log
+++ b/packaging4/Fedora/samba4.log
diff --git a/packaging/Fedora/samba4.spec b/packaging4/Fedora/samba4.spec
index dfdd36811b..dfdd36811b 100644
--- a/packaging/Fedora/samba4.spec
+++ b/packaging4/Fedora/samba4.spec
diff --git a/packaging/Fedora/samba4.sysconfig b/packaging4/Fedora/samba4.sysconfig
index a081c478f3..a081c478f3 100644
--- a/packaging/Fedora/samba4.sysconfig
+++ b/packaging4/Fedora/samba4.sysconfig
diff --git a/packaging/debian/README b/packaging4/debian/README
index fb4f88e63e..fb4f88e63e 100644
--- a/packaging/debian/README
+++ b/packaging4/debian/README
diff --git a/prog_guide.txt b/prog_guide4.txt
index bba58b31b3..bba58b31b3 100644
--- a/prog_guide.txt
+++ b/prog_guide4.txt
diff --git a/source4/dsdb/samdb/ldb_modules/config.mk b/source4/dsdb/samdb/ldb_modules/config.mk
index 830f7c9fa1..00e4f1af92 100644
--- a/source4/dsdb/samdb/ldb_modules/config.mk
+++ b/source4/dsdb/samdb/ldb_modules/config.mk
@@ -204,17 +204,6 @@ INIT_FUNCTION = LDB_MODULE(partition)
 ldb_partition_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/partition.o
 
 ################################################
-# Start MODULE ldb_schema
-[MODULE::ldb_schema]
-SUBSYSTEM = LIBLDB
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS LIBLDB
-INIT_FUNCTION = LDB_MODULE(schema)
-# End MODULE ldb_schema
-################################################
-
-ldb_schema_OBJ_FILES = $(addprefix $(dsdbsrcdir)/samdb/ldb_modules/, schema.o schema_syntax.o)
-
-################################################
 # Start MODULE ldb_update_kt
 [MODULE::ldb_update_keytab]
 SUBSYSTEM = LIBLDB
diff --git a/source4/dsdb/samdb/ldb_modules/schema.c b/source4/dsdb/samdb/ldb_modules/schema.c
deleted file mode 100644
index f2c4d38305..0000000000
--- a/source4/dsdb/samdb/ldb_modules/schema.c
+++ /dev/null
@@ -1,1230 +0,0 @@
-/* 
-   ldb database library
-
-   Copyright (C) Simo Sorce  2004-2006
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*
- *  Name: ldb
- *
- *  Component: ldb schema module
- *
- *  Description: add schema check functionality
- *
- *  Author: Simo Sorce
- */
-
-#include "includes.h"
-#include "libcli/ldap/ldap.h"
-#include "ldb/include/ldb_errors.h"
-#include "ldb/include/ldb_private.h"
-#include "lib/util/dlinklist.h"
-#include "schema_syntax.h"
-
-/* Syntax-Table
-
-   see ldap_server/devdocs/AD-syntaxes.txt
-*/
-
-enum schema_class_type {
-	SCHEMA_CT_88		= 0,
-	SCHEMA_CT_STRUCTURAL	= 1,
-	SCHEMA_CT_ABSTRACT	= 2,
-	SCHEMA_CT_AUXILIARY	= 3
-};
-
-struct schema_attribute {
-	char *OID;				/* attributeID     */
-	char *name;				/* lDAPDisplayName */
-	enum schema_internal_syntax syntax;	/* generated from attributeSyntax, oMSyntax, oMObjectClass */
-	bool single;				/* isSingleValued  */
-	int min;				/* rangeLower      */
-	int max;				/* rangeUpper      */
-	int systemflag;				/* systemFlag      */
-	int searchflag;				/* searchFlag      */
-	bool isdefunct;				/* isDefunct       */
-};
-
-struct schema_class {
-	char *OID;				/* governsID             */
-	char *name;				/* lDAPDisplayName       */
-	enum schema_class_type type;		/* objectClassCategory   */
-	bool systemOnly;			/* systemOnly            */
-	bool isdefunct;				/* isDefunct             */
-	int systemflag;				/* systemFlag            */
-	char *defobjcat;			/* defaultObjectCategory */
-	struct schema_class *parent;		/* subClassOf            */
-	struct schema_class **sysaux;		/* systemAuxiliaryClass  */
-	struct schema_class **aux;		/* auxiliaryClass        */
-	struct schema_class **sysposssup;	/* systemPossSuperiors   */
-	struct schema_class **posssup;		/* possSuperiors         */
-	struct schema_class **possinf;		/* possibleInferiors     */
-	struct schema_attribute **sysmust;	/* systemMustContain     */
-	struct schema_attribute **must;		/* MustContain           */
-	struct schema_attribute **sysmay;	/* systemMayContain      */
-	struct schema_attribute **may;		/* MayContain            */
-};
-
-/* TODO: ditcontentrules */
-
-struct schema_private_data {
-	struct ldb_dn *schema_dn;
-	struct schema_attribute **attrs;
-	struct schema_store *attrs_store;
-	int num_attributes;
-	struct schema_class **class;
-	struct schema_store *class_store;
-	int num_classes;
-};
-
-struct schema_class_dlist {
-	struct schema_class *class;
-	struct schema_class_dlist *prev;
-	struct schema_class_dlist *next;
-	enum schema_class_type role;
-};
-
-struct schema_context {
-
-	enum sc_op { SC_ADD, SC_MOD, SC_DEL, SC_RENAME } op;
-	enum sc_step { SC_INIT, SC_ADD_CHECK_PARENT, SC_ADD_TEMP, SC_DEL_CHECK_CHILDREN } step;
-
-	struct schema_private_data *data;
-
-	struct ldb_module *module;
-	struct ldb_request *orig_req;
-	struct ldb_request *down_req;
-
-	struct ldb_request *parent_req;
-	struct ldb_reply *parent_res;
-
-	struct schema_class_dlist *class_list;
-	struct schema_class **sup_list;
-	struct schema_class **aux_list;
-};
-
-/* FIXME: I'd really like to use an hash table here */
-struct schema_link {
-	const char *name;
-	void *object;
-};
-
-struct schema_store {
-	struct schema_link *store;
-	int num_links;
-};
-
-static struct schema_store *schema_store_new(TALLOC_CTX *mem_ctx)
-{
-	struct schema_store *ht;
-	
-	ht = talloc(mem_ctx, struct schema_store);
-	if (!ht) return NULL;
-
-	ht->store = NULL;
-	ht->num_links = 0;
-
-	return ht;
-}
-	
-static int schema_store_add(struct schema_store *ht, const char *key, void *object)
-{
-	ht->store = talloc_realloc(ht, ht->store, struct schema_link, ht->num_links + 1);
-	if (!ht->store) return LDB_ERR_OPERATIONS_ERROR;
-
-	ht->store[ht->num_links].name = key;
-	ht->store[ht->num_links].object = object;
-
-	ht->num_links++;
-
-	return LDB_SUCCESS;
-}
-
-static void *schema_store_find(struct schema_store *ht, const char *key)
-{
-	int i;
-
-	for (i = 0; i < ht->num_links; i++) {
-		if (strcasecmp(ht->store[i].name, key) == 0) {
-			return ht->store[i].object;
-		}
-	}
-
-	return NULL;
-}
-
-#define SCHEMA_CHECK_VALUE(mem, val, mod) \
-		do { if (mem == val) { \
-			ret = LDB_ERR_OPERATIONS_ERROR; \
-			ldb_asprintf_errstring(mod->ldb, \
-				"schema module: Memory allocation or attribute error on %s", #mem); \
-			goto done; } } while(0)
-
-struct schema_class **schema_get_class_list(struct ldb_module *module,
-					    struct schema_private_data *data,
-					    struct ldb_message_element *el)
-{
-	struct schema_class **list;
-	int i;
-	
-	list = talloc_array(data, struct schema_class *, el->num_values + 1);
-	if (!list) {
-		ldb_debug(module->ldb, LDB_DEBUG_ERROR, "Out of Memory");
-		return NULL;
-	}
-	
-	for (i = 0; i < el->num_values; i++) {
-		list[i] = (struct schema_class *)schema_store_find(data->class_store,
-								  (char *)el->values[i].data);
-		if (!list[i]) {
-			ldb_debug_set(module->ldb,
-					LDB_DEBUG_ERROR,
-					"Class %s referenced but not found in schema\n",
-					(char *)el->values[i].data);
-			return NULL;
-		}
-	}
-	list[i] = NULL;
-
-	return list;
-}
-
-struct schema_attribute **schema_get_attrs_list(struct ldb_module *module,
-						struct schema_private_data *data,
-						struct ldb_message_element *el)
-{
-	struct schema_attribute **list;
-	int i;
-
-	list = talloc_array(data, struct schema_attribute *, el->num_values + 1);
-	if (!list) {
-		ldb_debug(module->ldb, LDB_DEBUG_ERROR, "Out of Memory");
-		return NULL;
-	}
-	
-	for (i = 0; i < el->num_values; i++) {
-		list[i] = (struct schema_attribute *)schema_store_find(data->attrs_store,
-								      (char *)el->values[i].data);
-		if (!list[i]) {
-			ldb_debug_set(module->ldb,
-					LDB_DEBUG_ERROR,
-					"Attriobute %s referenced but not found in schema\n",
-					(char *)el->values[i].data);
-			return NULL;
-		}
-	}
-	list[i] = NULL;
-
-	return list;
-}
-
-static int schema_init_attrs(struct ldb_module *module, struct schema_private_data *data)
-{
-	static const char *schema_attrs[] = {	"attributeID",
-						"lDAPDisplayName",
-						"attributeSyntax",
-						"oMSyntax",
-						"oMObjectClass",
-						"isSingleValued",
-						"rangeLower",
-						"rangeUpper",
-						"searchFlag",
-						"systemFlag",
-						"isDefunct",
-						NULL };
-	struct ldb_result *res;
-	int ret, i;
-
-	ret = ldb_search(module->ldb,
-			 data->schema_dn,
-			 LDB_SCOPE_SUBTREE,
-			 "(objectClass=attributeSchema)",
-			 schema_attrs,
-			 &res);
-
-	if (ret != LDB_SUCCESS) {
-		goto done;
-	}
-
-	data->num_attributes = res->count;
-	data->attrs = talloc_array(data, struct schema_attribute *, res->count);
-	SCHEMA_CHECK_VALUE(data->attrs, NULL, module);
-
-	data->attrs_store = schema_store_new(data);
-	SCHEMA_CHECK_VALUE(data->attrs_store, NULL, module);
-	
-	for (i = 0; i < res->count; i++) {
-		const char *tmp_single;
-		const char *attr_syntax;
-		uint32_t om_syntax;
-		const struct ldb_val *om_class;
-
-		data->attrs[i] = talloc(data->attrs, struct schema_attribute);
-		SCHEMA_CHECK_VALUE(data->attrs[i], NULL, module);
-
-		data->attrs[i]->OID = talloc_strdup(data->attrs[i],
-						ldb_msg_find_attr_as_string(res->msgs[i], "attributeID", NULL));
-		SCHEMA_CHECK_VALUE(data->attrs[i]->OID, NULL, module);
-		
-		data->attrs[i]->name = talloc_strdup(data->attrs[i],
-						ldb_msg_find_attr_as_string(res->msgs[i], "lDAPDisplayName", NULL));
-		SCHEMA_CHECK_VALUE(data->attrs[i]->name, NULL, module);
-
-		/* once we have both the OID and the attribute name, add the pointer to the store */
-		schema_store_add(data->attrs_store, data->attrs[i]->OID, data->attrs[i]);
-		schema_store_add(data->attrs_store, data->attrs[i]->name, data->attrs[i]);
-
-		attr_syntax = ldb_msg_find_attr_as_string(res->msgs[i], "attributeSyntax", NULL);
-		SCHEMA_CHECK_VALUE(attr_syntax, NULL, module);
-		
-		om_syntax = ldb_msg_find_attr_as_uint(res->msgs[i], "oMSyntax", 0);
-		/* 0 is not a valid oMSyntax */
-		SCHEMA_CHECK_VALUE(om_syntax, 0, module);
-
-		om_class = ldb_msg_find_ldb_val(res->msgs[i], "oMObjectClass");
-
-		ret = map_schema_syntax(om_syntax, attr_syntax, om_class, &data->attrs[i]->syntax);
-		if (ret != LDB_SUCCESS) {
-			ldb_asprintf_errstring(module->ldb,
-				"schema module: invalid om syntax value on %s",
-				data->attrs[i]->name);
-			goto done;
-		}
-		
-		tmp_single = ldb_msg_find_attr_as_string(res->msgs[i], "isSingleValued", NULL);
-		SCHEMA_CHECK_VALUE(tmp_single, NULL, module);
-		if (strcmp(tmp_single, "TRUE") == 0) {
-			data->attrs[i]->single = 1;
-		} else {
-			data->attrs[i]->single = 0;
-		}
-
-		/* the following are optional */
-		data->attrs[i]->min = ldb_msg_find_attr_as_int(res->msgs[i], "rangeLower", INT_MIN);
-		data->attrs[i]->max = ldb_msg_find_attr_as_int(res->msgs[i], "rangeUpper", INT_MAX);
-		data->attrs[i]->systemflag = ldb_msg_find_attr_as_int(res->msgs[i], "systemFlag", 0);
-		data->attrs[i]->searchflag = ldb_msg_find_attr_as_int(res->msgs[i], "searchFlag", 0);
-		data->attrs[i]->isdefunct = ldb_msg_find_attr_as_bool(res->msgs[i], "isDefunct", false);
-	}
-
-done:
-	talloc_free(res);
-	return ret;
-}
-
-static int schema_init_classes(struct ldb_module *module, struct schema_private_data *data)
-{
-	const char *schema_attrs[] = {	"governsID",
-						"lDAPDisplayName",
-						"objectClassCategory",
-						"defaultObjectCategory",
-						"systemOnly",
-						"systemFlag",
-						"isDefunct",
-						"subClassOf",
-						"systemAuxiliaryClass",
-						"auxiliaryClass",
-						"systemPossSuperiors",
-						"possSuperiors",
-						"possibleInferiors",
-						"systemMustContain",
-						"MustContain", 
-						"systemMayContain",
-						"MayContain",
-						NULL };
-	struct ldb_result *res;
-	int ret, i;
-
-	ret = ldb_search(module->ldb,
-			 data->schema_dn,
-			 LDB_SCOPE_SUBTREE,
-			 "(objectClass=classSchema)",
-			 schema_attrs,
-			 &res);
-
-	if (ret != LDB_SUCCESS) {
-		goto done;
-	}
-
-	data->num_classes = res->count;
-	data->class = talloc_array(data, struct schema_class *, res->count);
-	SCHEMA_CHECK_VALUE(data->class, NULL, module);
-
-	data->class_store = schema_store_new(data);
-	SCHEMA_CHECK_VALUE(data->class_store, NULL, module);
-
-	for (i = 0; i < res->count; i++) {
-		struct ldb_message_element *el;
-
-		data->class[i] = talloc(data->class, struct schema_class);
-		SCHEMA_CHECK_VALUE(data->class[i], NULL, module);
-
-		data->class[i]->OID = talloc_strdup(data->class[i],
-						ldb_msg_find_attr_as_string(res->msgs[i], "governsID", NULL));
-		SCHEMA_CHECK_VALUE(data->class[i]->OID, NULL, module);
-
-		data->class[i]->name = talloc_strdup(data->class[i],
-						ldb_msg_find_attr_as_string(res->msgs[i], "lDAPDisplayName", NULL));
-		SCHEMA_CHECK_VALUE(data->class[i]->name, NULL, module);
-
-		/* once we have both the OID and the class name, add the pointer to the store */
-		schema_store_add(data->class_store, data->class[i]->OID, data->class[i]);
-		schema_store_add(data->class_store, data->class[i]->name, data->class[i]);
-
-		data->class[i]->type = ldb_msg_find_attr_as_int(res->msgs[i], "objectClassCategory", -1);
-		/* 0 should not be a valid value, but turn out it is so test with -1 */
-		SCHEMA_CHECK_VALUE(data->class[i]->type, -1, module);
-
-		data->class[i]->defobjcat = talloc_strdup(data->class[i],
-						ldb_msg_find_attr_as_string(res->msgs[i],
-									"defaultObjectCategory", NULL));
-/*		SCHEMA_CHECK_VALUE(data->class[i]->defobjcat, NULL, module);
-*/
-		/* the following attributes are all optional */
-
-		data->class[i]->systemOnly = ldb_msg_find_attr_as_bool(res->msgs[i], "systemOnly", false);
-		data->class[i]->systemflag = ldb_msg_find_attr_as_int(res->msgs[i], "systemFlag", 0);
-		data->class[i]->isdefunct = ldb_msg_find_attr_as_bool(res->msgs[i], "isDefunct", false);
-
-		/* attributes are loaded first, so we can just go an query the attributes repo */
-		
-		el = ldb_msg_find_element(res->msgs[i], "systemMustContain");
-		if (el) {
-			data->class[i]->sysmust = schema_get_attrs_list(module, data, el);
-			SCHEMA_CHECK_VALUE(data->class[i]->sysmust, NULL, module);
-		}
-
-		el = ldb_msg_find_element(res->msgs[i], "MustContain");
-		if (el) {
-			data->class[i]->must = schema_get_attrs_list(module, data, el);
-			SCHEMA_CHECK_VALUE(data->class[i]->must, NULL, module);
-		}
-
-		el = ldb_msg_find_element(res->msgs[i], "systemMayContain");
-		if (el) {
-			data->class[i]->sysmay = schema_get_attrs_list(module, data, el);
-			SCHEMA_CHECK_VALUE(data->class[i]->sysmay, NULL, module);
-		}
-
-		el = ldb_msg_find_element(res->msgs[i], "MayContain");
-		if (el) {
-			data->class[i]->may = schema_get_attrs_list(module, data, el);
-			SCHEMA_CHECK_VALUE(data->class[i]->may, NULL, module);
-		}
-
-	}
-
-	/* subClassOf, systemAuxiliaryClass, auxiliaryClass, systemPossSuperiors
-	 * must be filled in a second loop, when all class objects are allocated
-	 * or we may not find a class that has not yet been parsed */
-	for (i = 0; i < res->count; i++) {
-		struct ldb_message_element *el;
-		const char *attr;
-
-		/* this is single valued anyway */
-		attr = ldb_msg_find_attr_as_string(res->msgs[i], "subClassOf", NULL);
-		SCHEMA_CHECK_VALUE(attr, NULL, module);
-		data->class[i]->parent = schema_store_find(data->class_store, attr);
-		SCHEMA_CHECK_VALUE(data->class[i]->parent, NULL, module);
-
-		/* the following attributes are all optional */
-
-		data->class[i]->sysaux = NULL;
-		el = ldb_msg_find_element(res->msgs[i], "systemAuxiliaryClass");
-		if (el) {
-			data->class[i]->sysaux = schema_get_class_list(module, data, el); 
-			SCHEMA_CHECK_VALUE(data->class[i]->sysaux, NULL, module);
-		}
-
-		data->class[i]->aux = NULL;
-		el = ldb_msg_find_element(res->msgs[i], "auxiliaryClass");
-		if (el) {
-			data->class[i]->aux = schema_get_class_list(module, data, el); 
-			SCHEMA_CHECK_VALUE(data->class[i]->aux, NULL, module);
-		}
-
-		data->class[i]->sysposssup = NULL;
-		el = ldb_msg_find_element(res->msgs[i], "systemPossSuperiors");
-		if (el) {
-			data->class[i]->sysposssup = schema_get_class_list(module, data, el); 
-			SCHEMA_CHECK_VALUE(data->class[i]->sysposssup, NULL, module);
-		}
-
-		data->class[i]->posssup = NULL;
-		el = ldb_msg_find_element(res->msgs[i], "possSuperiors");
-		if (el) {
-			data->class[i]->posssup = schema_get_class_list(module, data, el); 
-			SCHEMA_CHECK_VALUE(data->class[i]->posssup, NULL, module);
-		}
-
-		data->class[i]->possinf = NULL;
-		el = ldb_msg_find_element(res->msgs[i], "possibleInferiors");
-		if (el) {
-			data->class[i]->possinf = schema_get_class_list(module, data, el); 
-			SCHEMA_CHECK_VALUE(data->class[i]->possinf, NULL, module);
-		}
-	}
-
-done:
-	talloc_free(res);
-	return ret;
-}
-
-static struct ldb_handle *schema_init_handle(struct ldb_request *req, struct ldb_module *module, enum sc_op op)
-{
-	struct schema_context *sctx;
-	struct ldb_handle *h;
-
-	h = talloc_zero(req, struct ldb_handle);
-	if (h == NULL) {
-		ldb_set_errstring(module->ldb, "Out of Memory");
-		return NULL;
-	}
-
-	h->module = module;
-
-	sctx = talloc_zero(h, struct schema_context);
-	if (sctx == NULL) {
-		ldb_set_errstring(module->ldb, "Out of Memory");
-		talloc_free(h);
-		return NULL;
-	}
-
-	h->private_data = (void *)sctx;
-
-	h->state = LDB_ASYNC_INIT;
-	h->status = LDB_SUCCESS;
-
-	sctx->op = op;
-	sctx->step = SC_INIT;
-	sctx->data = module->private_data;
-	sctx->module = module;
-	sctx->orig_req = req;
-
-	return h;
-}
-
-static int schema_add_check_parent(struct ldb_context *ldb, void *context, struct ldb_reply *ares)
-{
-	struct schema_context *sctx;
-
-	sctx = talloc_get_type(context, struct schema_context);
-
-	/* we are interested only in the single reply (base search) we receive here */
-	if (ares->type == LDB_REPLY_ENTRY) {
-		if (sctx->parent_res != NULL) {
-			ldb_set_errstring(ldb, "Too many results");
-			talloc_free(ares);
-			return LDB_ERR_OPERATIONS_ERROR;
-		}
-		sctx->parent_res = talloc_steal(sctx, ares);
-	} else {
-		talloc_free(ares);
-	}
-
-	return LDB_SUCCESS;
-}
-
-static int schema_add_build_parent_req(struct schema_context *sctx)
-{
-	const char * const parent_attrs[] = { "objectClass", NULL };
-	int ret;
-
-	sctx->parent_req = talloc_zero(sctx, struct ldb_request);
-	if (sctx->parent_req == NULL) {
-		ldb_debug(sctx->module->ldb, LDB_DEBUG_ERROR, "Out of Memory!\n");
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	sctx->parent_req->operation = LDB_SEARCH;
-	sctx->parent_req->op.search.scope = LDB_SCOPE_BASE;
-	sctx->parent_req->op.search.base = ldb_dn_get_parent(sctx->parent_req, sctx->orig_req->op.add.message->dn);
-	sctx->parent_req->op.search.tree = ldb_parse_tree(sctx->parent_req, "(objectClass=*)");
-	sctx->parent_req->op.search.attrs = parent_attrs;
-	sctx->parent_req->controls = NULL;
-	sctx->parent_req->context = sctx;
-	sctx->parent_req->callback = schema_add_check_parent;
-	ret = ldb_set_timeout_from_prev_req(sctx->module->ldb, sctx->orig_req, sctx->parent_req);
-
-	return ret;
-}
-
-static struct schema_class_dlist *schema_add_get_dlist_entry_with_class(struct schema_class_dlist *list, struct schema_class *class)
-{
-	struct schema_class_dlist *temp;
-
-	for (temp = list; temp && (temp->class != class); temp = temp->next) /* noop */ ;
-	return temp;
-}
-
-static int schema_add_class_to_dlist(struct schema_class_dlist *list, struct schema_class *class, enum schema_class_type role)
-{
-	struct schema_class_dlist *entry;
-	struct schema_class_dlist *temp;
-	int ret;
-
-	/* see if this class is usable */
-	if (class->isdefunct) {
-		return LDB_ERR_NO_SUCH_ATTRIBUTE;
-	}
-
-	/* see if this class already exist in the class list */
-	if (schema_add_get_dlist_entry_with_class(list, class)) {
-		return LDB_SUCCESS;
-	}
-
-	/* this is a new class go on and add to the list */
-	entry = talloc_zero(list, struct schema_class_dlist);
-	if (!entry) return LDB_ERR_OPERATIONS_ERROR;
-	entry->class = class;
-	entry->role = class->type;
-
-	/* If parent is top (list is guaranteed to start always with top) */
-	if (class->parent == list->class) {
-		/* if the hierarchy role is structural try to add it just after top */
-		if (role == SCHEMA_CT_STRUCTURAL) {
-			/* but check no other class at after top has a structural role */
-			if (list->next && (list->next->role == SCHEMA_CT_STRUCTURAL)) {
-				return LDB_ERR_OBJECT_CLASS_VIOLATION;
-			}
-			DLIST_ADD_AFTER(list, entry, list);
-		} else {
-			DLIST_ADD_END(list, entry, struct schema_class_dlist *);
-		}
-		return LDB_SUCCESS;
-	}
-
-	/* search if parent has already been added */
-	temp = schema_add_get_dlist_entry_with_class(list->next, class->parent);
-	if (temp == NULL) {
-		ret = schema_add_class_to_dlist(list, class->parent, role);
-		if (ret != LDB_SUCCESS) {
-			return ret;
-		}
-		temp = schema_add_get_dlist_entry_with_class(list->next, class->parent);
-	}
-	if (!temp) { /* parent not found !? */
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	DLIST_ADD_AFTER(list, entry, temp);
-	if (role == SCHEMA_CT_STRUCTURAL || role == SCHEMA_CT_AUXILIARY) {
-		temp = entry;
-		do {
-			temp->role = role;
-			temp = temp->prev;
-			/* stop when hierarchy base is met or when base class parent is top */
-		} while (temp->class == temp->next->class->parent &&
-			 temp->next->class->parent != list->class);
-
-		/* if we have not reached the head of the list
-		 * and role is structural */
-		if (temp != list && role == SCHEMA_CT_STRUCTURAL) {
-			struct schema_class_dlist *hfirst, *hlast;
-
-			/* check if the list second entry is structural */
-			if (list->next->role == SCHEMA_CT_STRUCTURAL) {
-				/* we have a confilict here */
-				return LDB_ERR_OBJECT_CLASS_VIOLATION;
-			}
-			/* we have to move this hierarchy of classes
-			 * so that the base of the structural hierarchy is right after top */
-			 
-			hfirst = temp->next;
-			hlast = entry;
-			/* now hfirst - hlast are the boundaries of the structural hierarchy */
-			
-			/* extract the structural hierachy from the list */
-			hfirst->prev->next = hlast->next;
-			if (hlast->next) hlast->next->prev = hfirst->prev;
-			
-			/* insert the structural hierarchy just after top */
-			list->next->prev = hlast;
-			hlast->next = list->next;
-			list->next = hfirst;
-			hfirst->prev = list;
-		}	
-	}
-
-	return LDB_SUCCESS;
-}
-
-/* merge source list into dest list and remove duplicates */
-static int schema_merge_class_list(TALLOC_CTX *mem_ctx, struct schema_class ***dest, struct schema_class **source)
-{
-	struct schema_class **list = *dest;
-	int i, j, n, f;
-
-	n = 0;	
-	if (list) for (n = 0; list[n]; n++) /* noop */ ;
-	f = n;
-
-	for (i = 0; source[i]; i++) {
-		for (j = 0; j < f; j++) {
-			if (list[j] == source[i]) {
-				break;
-			}
-		}
-		if (j < f) { /* duplicate found */
-			continue;
-		}
-
-		list = talloc_realloc(mem_ctx, list, struct schema_class *, n + 2);
-		if (!list) {
-			return LDB_ERR_OPERATIONS_ERROR;
-		}
-		list[n] = source[i];
-		n++;
-		list[n] = NULL;
-	}
-
-	*dest = list;
-
-	return LDB_SUCCESS;
-}
-
-/* validate and modify the objectclass attribute to sort and add parents */
-static int schema_add_build_objectclass_list(struct schema_context *sctx)
-{
-	struct schema_class_dlist *temp;
-	struct ldb_message_element * el;
-	struct schema_class *class;
-	int ret, i, an;
-
-	/* First of all initialize list, it must start with class top */
-	sctx->class_list = talloc_zero(sctx, struct schema_class_dlist);
-	if (!sctx->class_list) return LDB_ERR_OPERATIONS_ERROR;
-
-	sctx->class_list->class = schema_store_find(sctx->data->class_store, "top");
-	if (!sctx->class_list->class) return LDB_ERR_OPERATIONS_ERROR;
-
-	el = ldb_msg_find_element(sctx->orig_req->op.add.message, "objectClass");
-	if (!el) {
-		return LDB_ERR_OBJECT_CLASS_VIOLATION;
-	}
-
-	for (i = 0; i < el->num_values; i++) {
-
-		class = schema_store_find(sctx->data->class_store, (char *)el->values[i].data);
-		if (!class) {
-			return LDB_ERR_NO_SUCH_ATTRIBUTE;
-		}
-		
-		ret = schema_add_class_to_dlist(sctx->class_list, class, class->type);
-		if (ret != LDB_SUCCESS) {
-			return ret;
-		}
-	}
-
-	/* now check if there is any class role that is still not STRUCTURAL or AUXILIARY */
-	/* build also the auxiliary class list and the possible superiors list */ 
-	temp = sctx->class_list->next; /* top is special, skip it */
-	an = 0;
-
-	while (temp) {
-		if (temp->role == SCHEMA_CT_ABSTRACT || temp->role == SCHEMA_CT_88) {
-			return LDB_ERR_OBJECT_CLASS_VIOLATION;
-		}
-		if (temp->class->sysaux) {
-			ret = schema_merge_class_list(sctx, &sctx->aux_list, temp->class->sysaux);
-			if (ret != LDB_SUCCESS) {
-				return LDB_ERR_OPERATIONS_ERROR;
-			}
-		}
-		if (temp->class->aux) {
-			ret = schema_merge_class_list(sctx, &sctx->aux_list, temp->class->aux);
-			if (ret != LDB_SUCCESS) {
-				return LDB_ERR_OPERATIONS_ERROR;
-			}
-		}
-		if (temp->class->sysposssup) {
-			ret = schema_merge_class_list(sctx, &sctx->sup_list, temp->class->sysposssup);
-			if (ret != LDB_SUCCESS) {
-				return LDB_ERR_OPERATIONS_ERROR;
-			}
-		}
-		if (temp->class->posssup) {
-			ret = schema_merge_class_list(sctx, &sctx->sup_list, temp->class->posssup);
-			if (ret != LDB_SUCCESS) {
-				return LDB_ERR_OPERATIONS_ERROR;
-			}
-		}
-		temp = temp->next;
-	}
-
-	/* complete sup_list with material from the aux classes */
-	for (i = 0; sctx->aux_list && sctx->aux_list[i]; i++) {
-		if (sctx->aux_list[i]->sysposssup) {
-			ret = schema_merge_class_list(sctx, &sctx->sup_list, sctx->aux_list[i]->sysposssup);
-			if (ret != LDB_SUCCESS) {
-				return LDB_ERR_OPERATIONS_ERROR;
-			}
-		}
-		if (sctx->aux_list[i]->posssup) {
-			ret = schema_merge_class_list(sctx, &sctx->sup_list, sctx->aux_list[i]->posssup);
-			if (ret != LDB_SUCCESS) {
-				return LDB_ERR_OPERATIONS_ERROR;
-			}
-		}
-	}
-
-	if (!sctx->sup_list) return LDB_ERR_NAMING_VIOLATION;
-
-	return LDB_SUCCESS;
-}
-
-static int schema_add_check_container_constraints(struct schema_context *sctx)
-{
-	struct schema_class **parent_possinf = NULL;
-	struct schema_class **parent_classes;
-	struct schema_class_dlist *temp;
-	struct ldb_message_element *el;
-	int i, j, ret;
-
-	el = ldb_msg_find_element(sctx->parent_res->message, "objectClass");
-	if (!el) {
-		/* what the .. */
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	parent_classes = talloc_array(sctx, struct schema_class *, el->num_values + 1);
-
-	for (i = 0; i < el->num_values; i++) {
-
-		parent_classes[i] = schema_store_find(sctx->data->class_store, (const char *)el->values[i].data);
-		if (!parent_classes[i]) { /* should not be possible */
-			return LDB_ERR_OPERATIONS_ERROR;
-		}
-
-		if (parent_classes[i]->possinf) {
-			ret = schema_merge_class_list(sctx, &parent_possinf, parent_classes[i]->possinf);
-			if (ret != LDB_SUCCESS) {
-				return LDB_ERR_OPERATIONS_ERROR;
-			}
-		}
-
-		/* check also embedded auxiliary classes possinf */
-		for (j = 0; parent_classes[i]->sysaux && parent_classes[i]->sysaux[j]; j++) {
-			if (parent_classes[i]->sysaux[j]->possinf) {
-				ret = schema_merge_class_list(sctx, &parent_possinf, parent_classes[i]->sysaux[j]->possinf);
-				if (ret != LDB_SUCCESS) {
-					return LDB_ERR_OPERATIONS_ERROR;
-				}
-			}
-		}
-		for (j = 0; parent_classes[i]->aux && parent_classes[i]->aux[j]; j++) {
-			if (parent_classes[i]->aux[j]->possinf) {
-				ret = schema_merge_class_list(sctx, &parent_possinf, parent_classes[i]->aux[j]->possinf);
-				if (ret != LDB_SUCCESS) {
-					return LDB_ERR_OPERATIONS_ERROR;
-				}
-			}
-		}
-	}
-
-	/* foreach parent objectclass,
-	 *   check parent possible inferiors match all of the child objectclasses
-	 *    and that
-	 *   poss Superiors of the child objectclasses mathes one of the parent classes
-	 */
-
-	temp = sctx->class_list->next; /* skip top it is special */
-	while (temp) {
-
-		for (i = 0; parent_possinf[i]; i++) {
-			if (temp->class == parent_possinf[i]) {
-				break;
-			}
-		}
-		if (parent_possinf[i] == NULL) {
-			/* class not found in possible inferiors */
-			return LDB_ERR_NAMING_VIOLATION;
-		}
-
-		temp = temp->next;
-	}
-
-	for (i = 0; parent_classes[i]; i++) {
-		for (j = 0; sctx->sup_list[j]; j++) {
-			if (sctx->sup_list[j] == parent_classes[i]) {
-				break;
-			}
-		}
-		if (sctx->sup_list[j]) { /* possible Superiors match one of the parent classes */
-			return LDB_SUCCESS;
-		}
-	}
-
-	/* no parent classes matched superiors */
-	return LDB_ERR_NAMING_VIOLATION;
-}
-
-static int schema_add_build_down_req(struct schema_context *sctx)
-{
-	struct schema_class_dlist *temp;
-	struct ldb_message *msg;
-	int ret;
-
-	sctx->down_req = talloc(sctx, struct ldb_request);
-	if (!sctx->down_req) {
-		ldb_set_errstring(sctx->module->ldb, "Out of memory!");
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	*(sctx->down_req) = *(sctx->orig_req); /* copy the request */
-	msg = ldb_msg_copy_shallow(sctx->down_req, sctx->orig_req->op.add.message);
-	if (!msg) {
-		ldb_set_errstring(sctx->module->ldb, "Out of memory!");
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	/* rebuild the objectclass list */
-	ldb_msg_remove_attr(msg, "objectClass");
-	ret = ldb_msg_add_empty(msg, "objectClass", 0, NULL);
-	if (ret != LDB_SUCCESS) {
-		return ret;
-	}
-
-	/* Add the complete list of classes back to the message */
-	for (temp = sctx->class_list; temp; temp = temp->next) {
-		ret = ldb_msg_add_string(msg, "objectClass", temp->class->name);
-		if (ret != LDB_SUCCESS) {
-			return ret;
-		}
-	}
-
-	/* objectCategory can be set only by the system */
-	if (ldb_msg_find_element(msg, "objectCategory")) {
-		return LDB_ERR_CONSTRAINT_VIOLATION;
-	}
-
-	/* the OC is mandatory, every class defines it */
-	/* use the one defined in the structural class that defines the object */
-	for (temp = sctx->class_list->next; temp; temp = temp->next) {
-		if (!temp->next) break;
-		if (temp->next->role != SCHEMA_CT_STRUCTURAL) break;
-	}
-/*	oc = talloc_strdup(msg, temp->class->defobjcat);
-	ret = ldb_msg_add_string(msg, "objectCategory", oc);
-*/
-	sctx->down_req->op.add.message = msg;
-
-	return LDB_SUCCESS;
-}
-
-static int schema_check_attributes_syntax(struct schema_context *sctx)
-{
-	struct ldb_message *msg;
-	struct schema_attribute *attr;
-	int i, ret;
-
-	msg = sctx->orig_req->op.add.message;
-	for (i = 0; i < msg->num_elements; i++) {
-		attr = schema_store_find(sctx->data->attrs_store, msg->elements[i].name);
-		if (attr == NULL) {
-			return LDB_ERR_NO_SUCH_ATTRIBUTE;
-		}
-		ret = schema_validate(sctx->module->ldb, &msg->elements[i], attr->syntax, attr->single, attr->min, attr->max);
-		if (ret != LDB_SUCCESS) {
-			return ret;
-		}
-	}
-
-	return LDB_SUCCESS;
-}
-
-static int schema_add_continue(struct ldb_handle *h)
-{
-	struct schema_context *sctx;
-	int ret;
-
-	sctx = talloc_get_type(h->private_data, struct schema_context);
-
-	switch (sctx->step) {
-	case SC_INIT:
-
-		/* First of all check that a parent exists for this entry */
-		ret = schema_add_build_parent_req(sctx);
-		if (ret != LDB_SUCCESS) {
-			break;
-		}
-
-		sctx->step = SC_ADD_CHECK_PARENT;
-		return ldb_next_request(sctx->module, sctx->parent_req);
-
-	case SC_ADD_CHECK_PARENT:
-
-		/* parent search done, check result and go on */
-		if (sctx->parent_res == NULL) {
-			/* we must have a parent */
-			ret = LDB_ERR_NO_SUCH_OBJECT;
-			break;
-		}
-
-		/* Check objectclasses are ok */
-		ret = schema_add_build_objectclass_list(sctx);
-	       	if (ret != LDB_SUCCESS) {
-			break;
-		}
-
-		/* check the parent is of the right type for this object */
-		ret = schema_add_check_container_constraints(sctx);
-	       	if (ret != LDB_SUCCESS) {
-			break;
-		}
-
-		/* check attributes syntax */
-		
-		ret = schema_check_attributes_syntax(sctx);
-		if (ret != LDB_SUCCESS) {
-			break;
-		}
-
-		ret = schema_add_build_down_req(sctx);
-		if (ret != LDB_SUCCESS) {
-			break;
-		}
-		sctx->step = SC_ADD_TEMP;
-
-		return ldb_next_request(sctx->module, sctx->down_req);
-
-	default:
-		ret = LDB_ERR_OPERATIONS_ERROR;
-		break;
-	}
-
-	/* this is reached only in case of error */
-	/* FIXME: fire an async reply ? */
-	h->status = ret;
-	h->state = LDB_ASYNC_DONE;
-	return ret;
-}
-
-static int schema_add(struct ldb_module *module, struct ldb_request *req)
-{
-	struct schema_context *sctx;
-	struct ldb_handle *h;
-
-	if (ldb_dn_is_special(req->op.add.message->dn)) { /* do not manipulate our control entries */
-		return ldb_next_request(module, req);
-	}
-
-	h = schema_init_handle(req, module, SC_ADD);
-	if (!h) {
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	sctx = talloc_get_type(h->private_data, struct schema_context);
-	sctx->orig_req->handle = h;
-	return schema_add_continue(h);
-}
-
-
-static int schema_modify(struct ldb_module *module, struct ldb_request *req)
-{
-	if (ldb_dn_is_special(req->op.mod.message->dn)) { /* do not manipulate our control entries */
-		return ldb_next_request(module, req);
-	}
-
-	return ldb_next_request(module, req);	
-}
-
-static int schema_delete(struct ldb_module *module, struct ldb_request *req)
-{
-	if (ldb_dn_is_special(req->op.del.dn)) { /* do not manipulate our control entries */
-		return ldb_next_request(module, req);
-	}
-	
-	/* First of all check no children exists for this entry */
-
-	return ldb_next_request(module, req);
-}
-
-static int schema_rename(struct ldb_module *module, struct ldb_request *req)
-{
-	if (ldb_dn_is_special(req->op.rename.olddn) &&
-	    ldb_dn_is_special(req->op.rename.newdn)) { /* do not manipulate our control entries */
-		return ldb_next_request(module, req);
-	}
-
-	return ldb_next_request(module, req);
-}
-
-static int schema_wait_loop(struct ldb_handle *handle) {
-	struct schema_context *sctx;
-	int ret;
-    
-	if (!handle || !handle->private_data) {
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	if (handle->state == LDB_ASYNC_DONE) {
-		return handle->status;
-	}
-
-	handle->state = LDB_ASYNC_PENDING;
-	handle->status = LDB_SUCCESS;
-
-	sctx = talloc_get_type(handle->private_data, struct schema_context);
-
-	switch (sctx->step) {
-	case SC_ADD_CHECK_PARENT:
-		ret = ldb_wait(sctx->parent_req->handle, LDB_WAIT_NONE);
-
-		if (ret != LDB_SUCCESS) {
-			handle->status = ret;
-			goto done;
-		}
-		if (sctx->parent_req->handle->status != LDB_SUCCESS) {
-			handle->status = sctx->parent_req->handle->status;
-			goto done;
-		}
-
-		if (sctx->parent_req->handle->state != LDB_ASYNC_DONE) {
-			return LDB_SUCCESS;
-		}
-
-		return schema_add_continue(handle);
-
-	case SC_ADD_TEMP:
-		ret = ldb_wait(sctx->down_req->handle, LDB_WAIT_NONE);
-
-		if (ret != LDB_SUCCESS) {
-			handle->status = ret;
-			goto done;
-		}
-		if (sctx->down_req->handle->status != LDB_SUCCESS) {
-			handle->status = sctx->down_req->handle->status;
-			goto done;
-		}
-
-		if (sctx->down_req->handle->state != LDB_ASYNC_DONE) {
-			return LDB_SUCCESS;
-		}
-
-		break;
-
-	default:
-		ret = LDB_ERR_OPERATIONS_ERROR;
-		goto done;
-	}
-
-	ret = LDB_SUCCESS;
-
-done:
-	handle->state = LDB_ASYNC_DONE;
-	return ret;
-}
-
-static int schema_wait_all(struct ldb_handle *handle) {
-
-	int ret;
-
-	while (handle->state != LDB_ASYNC_DONE) {
-		ret = schema_wait_loop(handle);
-		if (ret != LDB_SUCCESS) {
-			return ret;
-		}
-	}
-
-	return handle->status;
-}
-
-static int schema_wait(struct ldb_handle *handle, enum ldb_wait_type type)
-{
-	if (type == LDB_WAIT_ALL) {
-		return schema_wait_all(handle);
-	} else {
-		return schema_wait_loop(handle);
-	}
-}
-
-static int schema_init(struct ldb_module *module)
-{
-	static const char *schema_attrs[] = { "schemaNamingContext", NULL };
-	struct schema_private_data *data;
-	struct ldb_result *res;
-	int ret;
-
-	/* need to let the partition module to register first */
-	ret = ldb_next_init(module);
-	if (ret != LDB_SUCCESS) {
-		return ret;
-	}
-
-	data = ldb_get_opaque(module->ldb, "schema_instance");
-	if (data) {
-		module->private_data = data;
-		return LDB_SUCCESS;
-	}
-
-	data = talloc_zero(module->ldb, struct schema_private_data);
-	if (data == NULL) {
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	/* find the schema partition */
-	ret = ldb_search(module->ldb,
-			 ldb_dn_new(module, module->ldb, NULL),
-			 LDB_SCOPE_BASE,
-			 "(objectClass=*)",
-			 schema_attrs,
-			 &res);
-
-	if (res->count != 1) {
-		/* FIXME: return a clear error string */
-		talloc_free(data);
-		talloc_free(res);
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	data->schema_dn = ldb_msg_find_attr_as_dn(module->ldb, data, res->msgs[0], "schemaNamingContext");
-	if (data->schema_dn == NULL) {
-		/* FIXME: return a clear error string */
-		talloc_free(data);
-		talloc_free(res);
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	talloc_free(res);
-
-	ret = schema_init_attrs(module, data);
-	if (ret != LDB_SUCCESS) {
-		talloc_free(data);
-		return ret;
-	}
-
-	ret = schema_init_classes(module, data);
-	if (ret != LDB_SUCCESS) {
-		talloc_free(data);
-		return ret;
-	}
-
-	module->private_data = data;
-	ldb_set_opaque(module->ldb, "schema_instance", data);
-
-	return LDB_SUCCESS;
-}
-
-_PUBLIC_ const struct ldb_module_ops ldb_schema_module_ops = {
-	.name          = "schema",
-	.init_context  = schema_init,
-	.add           = schema_add,
-	.modify        = schema_modify,
-	.del           = schema_delete,
-	.rename        = schema_rename,
-	.wait          = schema_wait
-};
diff --git a/source4/dsdb/samdb/ldb_modules/schema_syntax.c b/source4/dsdb/samdb/ldb_modules/schema_syntax.c
deleted file mode 100644
index ab9f32c913..0000000000
--- a/source4/dsdb/samdb/ldb_modules/schema_syntax.c
+++ /dev/null
@@ -1,469 +0,0 @@
-/* 
-   ldb database library
-
-   Copyright (C) Simo Sorce  2004-2006
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*
- *  Name: ldb
- *
- *  Component: ldb schema module
- *
- *  Description: add schema syntax functionality
- *
- *  Author: Simo Sorce
- */
-
-#include "includes.h"
-#include "ldb/include/ldb.h"
-#include "ldb/include/ldb_errors.h"
-#include "schema_syntax.h"
-
-int map_schema_syntax(uint32_t om_syntax, const char *attr_syntax, const struct ldb_val *om_class, enum schema_internal_syntax *syntax)
-{
-	int ret;
-
-	ret = LDB_SUCCESS;
-
-	switch(om_syntax) {
-	case 1:
-		*syntax = SCHEMA_AS_BOOLEAN;
-		break;
-	case 2:
-		*syntax = SCHEMA_AS_INTEGER;
-		break;
-	case 4:
-		if (strcmp(attr_syntax, "2.5.5.10") == 0) {
-			*syntax = SCHEMA_AS_OCTET_STRING;
-			break;
-		}
-		if (strcmp(attr_syntax, "2.5.5.17") == 0) {
-			*syntax = SCHEMA_AS_SID;
-			break;
-		}
-		ret = LDB_ERR_OPERATIONS_ERROR;
-		break;
-	case 6:
-		*syntax = SCHEMA_AS_OID;
-		break;
-	case 10:
-		*syntax = SCHEMA_AS_ENUMERATION;
-		break;
-	case 18:
-		*syntax = SCHEMA_AS_NUMERIC_STRING;
-		break;
-	case 19:
-		*syntax = SCHEMA_AS_PRINTABLE_STRING;
-		break;
-	case 20:
-		*syntax = SCHEMA_AS_CASE_IGNORE_STRING;
-		break;
-	case 22:
-		*syntax = SCHEMA_AS_IA5_STRING;
-		break;
-	case 23:
-		*syntax = SCHEMA_AS_UTC_TIME;
-		break;
-	case 24:
-		*syntax = SCHEMA_AS_GENERALIZED_TIME;
-		break;
-	case 27:
-		*syntax = SCHEMA_AS_CASE_SENSITIVE_STRING;
-		break;
-	case 64:
-		*syntax = SCHEMA_AS_DIRECTORY_STRING;
-		break;
-	case 65:
-		*syntax = SCHEMA_AS_LARGE_INTEGER;
-		break;
-	case 66:
-		*syntax = SCHEMA_AS_OBJECT_SECURITY_DESCRIPTOR;
-		break;
-	case 127:
-		if (!om_class) {
-			ret = LDB_ERR_OPERATIONS_ERROR;
-			break;
-		}
-		
-		if (memcmp(om_class->data, "\x2b\x0c\x02\x87\x73\x1c\x00\x85\x4a\x00", MIN(om_class->length, 10)) == 0) {
-			*syntax = SCHEMA_AS_DN;
-			break;
-		}
-		if (memcmp(om_class->data, "\x2a\x86\x48\x86\xf7\x14\x01\x01\x01\x0b", MIN(om_class->length, 10)) == 0) {
-			*syntax = SCHEMA_AS_DN_BINARY;
-			break;
-		}
-		if (memcmp(om_class->data, "\x56\x06\x01\x02\x05\x0b\x1d\x00\x00\x00", MIN(om_class->length, 10)) == 0) {
-			*syntax = SCHEMA_AS_OR_NAME;
-			break;
-		}
-		if (memcmp(om_class->data, "\x2a\x86\x48\x86\xf7\x14\x01\x01\x01\x06", MIN(om_class->length, 10)) == 0) {
-			*syntax = SCHEMA_AS_REPLICA_LINK;
-			break;
-		}
-		if (memcmp(om_class->data, "\x2b\x0c\x02\x87\x73\x1c\x00\x85\x5c\x00", MIN(om_class->length, 10)) == 0) {
-			*syntax = SCHEMA_AS_PRESENTATION_ADDRESS;
-			break;
-		}
-		if (memcmp(om_class->data, "\x2b\x0c\x02\x87\x73\x1c\x00\x85\x3e\x00", MIN(om_class->length, 10)) == 0) {
-			*syntax = SCHEMA_AS_ACCESS_POINT;
-			break;
-		}
-		if (memcmp(om_class->data, "\x2a\x86\x48\x86\xf7\x14\x01\x01\x01\x0c", MIN(om_class->length, 10)) == 0) {
-			*syntax = SCHEMA_AS_DN_STRING;
-			break;
-		}
-		/* not found will error in default: */
-	default:
-		ret = LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	return ret;
-}
-
-static int schema_validate_boolean(struct ldb_context *ldb, struct ldb_val *val, int min, int max)
-{
-
-	if ((strncmp("TRUE", (const char *)val->data, val->length) != 0) &&
-	    (strncmp("FALSE", (const char *)val->data, val->length) != 0)) {
-		return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX;
-	}
-
-	return LDB_SUCCESS;
-}
-
-static int schema_validate_integer(struct ldb_context *ldb, struct ldb_val *val, int min, int max)
-{
-	int value;
-	char *endptr;
-
-	errno = 0;
-	value = strtol((const char *)val->data, &endptr, 0);
-	if (errno) return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX;
-	if (endptr[0] != '\0') return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX;
-	if ((min > INT_MIN) && (value < min)) return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX;
-	if ((max < INT_MAX) && (value > max)) return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX;
-
-	return LDB_SUCCESS;
-}
-
-static int schema_validate_binary_blob(struct ldb_context *ldb, struct ldb_val *val, int min, int max)
-{
-	/* is there anythign we should check in a binary blob ? */
-	return LDB_SUCCESS;
-}
-
-static int schema_validate_sid(struct ldb_context *ldb, struct ldb_val *val, int min, int max)
-{
-	/* TODO: validate binary form of objectSid */
-	return LDB_SUCCESS;	
-}
-
-static int schema_validate_oid(struct ldb_context *ldb, struct ldb_val *val, int min, int max)
-{
-	if (strspn((const char *)val->data, "0123456789.") != val->length)
-		return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX;
-
-	return LDB_SUCCESS;
-}
-
-static int schema_validate_numeric_string(struct ldb_context *ldb, struct ldb_val *val, int min, int max)
-{
-	if (strspn((const char *)val->data, "0123456789") != val->length)
-		return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX;
-
-	return LDB_SUCCESS;
-}
-
-static int schema_validate_printable_string(struct ldb_context *ldb, struct ldb_val *val, int min, int max)
-{
-	/* TODO: find out what constitutes the printable character set */
-	return LDB_SUCCESS;
-}
-
-static int schema_validate_teletext_string(struct ldb_context *ldb, struct ldb_val *val, int min, int max)
-{
-	/* TODO: find out what constitutes the teletext character set */
-	return LDB_SUCCESS;
-}
-
-static int schema_validate_ia5_string(struct ldb_context *ldb, struct ldb_val *val, int min, int max)
-{
-	/* TODO: find out what constitutes the IA5 character set */
-	return LDB_SUCCESS;
-}
-
-static int schema_validate_utc_time(struct ldb_context *ldb, struct ldb_val *val, int min, int max)
-{
-	/* TODO: validate syntax of UTC Time string */
-	return LDB_SUCCESS;
-}
-
-static int schema_validate_generalized_time(struct ldb_context *ldb, struct ldb_val *val, int min, int max)
-{
-	/* TODO: validate syntax of Generalized Time string */
-	return LDB_SUCCESS;
-}
-
-/* NOTE: not a single attribute has this syntax in the basic w2k3 schema */
-static int schema_validate_sensitive_string(struct ldb_context *ldb, struct ldb_val *val, int min, int max)
-{
-	/* TODO: find out what constitutes a "case sensitive string" */
-	return LDB_SUCCESS;
-}
-
-static int schema_validate_unicode_string(struct ldb_context *ldb, struct ldb_val *val, int min, int max)
-{
-	/* TODO: validate utf8 string */
-	return LDB_SUCCESS;
-}
-
-static int schema_validate_large_integer(struct ldb_context *ldb, struct ldb_val *val, int min, int max)
-{
-	/* TODO: validate large integer/interval */
-	return LDB_SUCCESS;
-}
-
-static int schema_validate_object_sd(struct ldb_context *ldb, struct ldb_val *val, int min, int max)
-{
-	/* TODO: validate object Security Descriptor */
-	return LDB_SUCCESS;
-}
-
-static int schema_validate_dn(struct ldb_context *ldb, struct ldb_val *val, int min, int max)
-{
-	struct ldb_dn *dn;
-	int ret = LDB_SUCCESS;
-
-	dn = ldb_dn_from_ldb_val(ldb, ldb, val);
-	if ( ! ldb_dn_validate(dn)) {
-		ret = LDB_ERR_INVALID_ATTRIBUTE_SYNTAX;
-	}
-
-	talloc_free(dn);
-	return ret;
-}
-
-static int schema_validate_binary_plus_dn(struct ldb_context *ldb, struct ldb_val *val, int min, int max)
-{
-	int ret = LDB_ERR_INVALID_ATTRIBUTE_SYNTAX;
-	TALLOC_CTX *memctx;
-	struct ldb_dn *dn;
-	char *str, *p;
-	char *endptr;
-	int num;
-       
-	memctx = talloc_new(NULL);
-	if (!memctx) return LDB_ERR_OPERATIONS_ERROR;
-
-	str = talloc_strdup(memctx, (const char *)val->data);
-	if (!str) {
-		ret = LDB_ERR_OPERATIONS_ERROR;
-		goto done;
-	}
-	if (strncasecmp(str, "B:", 2) != 0) {
-		goto done;
-	}
-
-	/* point at the number of chars in the string */
-	str = strchr(&str[2], ':');
-	if (!str) {
-		goto done;
-	}
-	str++;
-
-	errno = 0;
-	num = strtol(str, &endptr, 0);
-	if (errno) return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX;
-	if (endptr[0] != ':') return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX;
-	if ((min > INT_MIN) && (num < min)) return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX;
-	if ((max < INT_MAX) && (num > max)) return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX;
-
-	/* point at the string */
-	str = strchr(str, ':');
-	if (!str) {
-		goto done;
-	}
-	str++;
-
-	/* terminate the string */
-	p = strchr(str, ':');
-	if (!p) {
-		goto done;
-	}
-	*p = '\0';
-
-	if (strlen(str) != 2*num) {
-		goto done;
-	}
-
-	str = p + 1;
-
-	dn = ldb_dn_new(memctx, ldb, str);
-	if (ldb_dn_validate(dn)) {
-		ret = LDB_SUCCESS;
-	}
-
-done:
-	talloc_free(memctx);
-	return ret;
-}
-
-static int schema_validate_x400_or_name(struct ldb_context *ldb, struct ldb_val *val, int min, int max)
-{
-	/* TODO: find out what is the syntax of an X400 OR NAME */
-	return LDB_SUCCESS;
-}
-
-static int schema_validate_presentation_address(struct ldb_context *ldb, struct ldb_val *val, int min, int max)
-{
-	/* TODO: find out what is the syntax of a presentation address */
-	return LDB_SUCCESS;
-}
-
-static int schema_validate_x400_access_point(struct ldb_context *ldb, struct ldb_val *val, int min, int max)
-{
-	/* TODO: find out what is the syntax of an X400 Access Point */
-	return LDB_SUCCESS;
-}
-
-/* NOTE: seem there isn't a single attribute defined like this in the base w2k3 schema */
-static int schema_validate_string_plus_dn(struct ldb_context *ldb, struct ldb_val *val, int min, int max)
-{
-	int ret = LDB_ERR_INVALID_ATTRIBUTE_SYNTAX;
-	TALLOC_CTX *memctx;
-	struct ldb_dn *dn;
-	char *str, *p;
-	char *endptr;
-	int num;
-       
-	memctx = talloc_new(NULL);
-	if (!memctx) return LDB_ERR_OPERATIONS_ERROR;
-
-	str = talloc_strdup(memctx, (const char *)val->data);
-	if (!str) {
-		ret = LDB_ERR_OPERATIONS_ERROR;
-		goto done;
-	}
-	if (strncasecmp(str, "S:", 2) != 0) {
-		goto done;
-	}
-
-	/* point at the number of chars in the string */
-	str = strchr(&str[2], ':');
-	if (!str) {
-		goto done;
-	}
-	str++;
-
-	errno = 0;
-	num = strtol(str, &endptr, 0);
-	if (errno) return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX;
-	if (endptr[0] != ':') return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX;
-	if ((min > INT_MIN) && (num < min)) return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX;
-	if ((max < INT_MAX) && (num > max)) return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX;
-
-	/* point at the string */
-	str = strchr(str, ':');
-	if (!str) {
-		goto done;
-	}
-	str++;
-
-	/* terminate the string */
-	p = strchr(str, ':');
-	if (!p) {
-		goto done;
-	}
-	*p = '\0';
-
-	if (strlen(str) != num) {
-		goto done;
-	}
-
-	str = p + 1;
-
-	dn = ldb_dn_new(memctx, ldb, str);
-	if (ldb_dn_validate(dn)) {
-		ret = LDB_SUCCESS;
-	}
-
-done:
-	talloc_free(memctx);
-	return ret;
-}
-
-struct schema_syntax_validator {
-	enum schema_internal_syntax type;
-	int (*validate)(struct ldb_context *ldb, struct ldb_val *, int, int);
-};
-
-struct schema_syntax_validator schema_syntax_validators[] = {
-	{ SCHEMA_AS_BOOLEAN, schema_validate_boolean },
-	{ SCHEMA_AS_INTEGER, schema_validate_integer },
-	{ SCHEMA_AS_OCTET_STRING, schema_validate_binary_blob },
-	{ SCHEMA_AS_SID, schema_validate_sid },
-	{ SCHEMA_AS_OID, schema_validate_oid },
-	{ SCHEMA_AS_ENUMERATION, schema_validate_integer },
-	{ SCHEMA_AS_NUMERIC_STRING, schema_validate_numeric_string },
-	{ SCHEMA_AS_PRINTABLE_STRING, schema_validate_printable_string },
-	{ SCHEMA_AS_CASE_IGNORE_STRING, schema_validate_teletext_string },
-	{ SCHEMA_AS_IA5_STRING, schema_validate_ia5_string },
-	{ SCHEMA_AS_UTC_TIME, schema_validate_utc_time },
-	{ SCHEMA_AS_GENERALIZED_TIME, schema_validate_generalized_time },
-	{ SCHEMA_AS_CASE_SENSITIVE_STRING, schema_validate_sensitive_string },
-	{ SCHEMA_AS_DIRECTORY_STRING, schema_validate_unicode_string },
-	{ SCHEMA_AS_LARGE_INTEGER, schema_validate_large_integer },
-	{ SCHEMA_AS_OBJECT_SECURITY_DESCRIPTOR, schema_validate_object_sd },
-	{ SCHEMA_AS_DN, schema_validate_dn },
-	{ SCHEMA_AS_DN_BINARY, schema_validate_binary_plus_dn },
-	{ SCHEMA_AS_OR_NAME, schema_validate_x400_or_name },
-	{ SCHEMA_AS_REPLICA_LINK, schema_validate_binary_blob },
-	{ SCHEMA_AS_PRESENTATION_ADDRESS, schema_validate_presentation_address }, /* see rfc1278 ? */
-	{ SCHEMA_AS_ACCESS_POINT, schema_validate_x400_access_point },
-	{ SCHEMA_AS_DN_STRING, schema_validate_string_plus_dn },
-	{ -1, NULL }
-};
-
-int schema_validate(struct ldb_context *ldb,
-		    struct ldb_message_element *el,
-		    enum schema_internal_syntax type,
-		    bool single, int min, int max)
-{
-	struct schema_syntax_validator *v;
-	int i, ret;
-
-	if (single && (el->num_values > 1)) {
-		return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX;
-	}
-
-	for (i = 0; schema_syntax_validators[i].type != 0; i++) {
-		if (schema_syntax_validators[i].type == type)
-			break;
-	}
-	if (schema_syntax_validators[i].type == 0) {
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-	v = &schema_syntax_validators[i];
-	
-	for (i = 0; i < el->num_values; i++) {
-		ret = v->validate(ldb, &el->values[i], min, max);
-	}
-
-	return LDB_SUCCESS;
-}
-
-
diff --git a/source4/dsdb/samdb/ldb_modules/schema_syntax.h b/source4/dsdb/samdb/ldb_modules/schema_syntax.h
deleted file mode 100644
index 37f7584d41..0000000000
--- a/source4/dsdb/samdb/ldb_modules/schema_syntax.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* 
-   ldb database library
-
-   Copyright (C) Simo Sorce  2004-2006
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*
- *  Name: ldb
- *
- *  Component: ldb schema module
- *
- *  Description: add schema syntax functionality
- *
- *  Author: Simo Sorce
- */
-
-
-/* Syntax-Table
-
-   see ldap_server/devdocs/AD-syntaxes.txt
-*/
-
-enum schema_internal_syntax {
-	SCHEMA_AS_BOOLEAN = 1,
-	SCHEMA_AS_INTEGER = 2,
-	SCHEMA_AS_OCTET_STRING = 3,
-	SCHEMA_AS_SID = 4,
-	SCHEMA_AS_OID = 5,
-	SCHEMA_AS_ENUMERATION = 6,
-	SCHEMA_AS_NUMERIC_STRING = 7,
-	SCHEMA_AS_PRINTABLE_STRING = 8,
-	SCHEMA_AS_CASE_IGNORE_STRING = 9,
-	SCHEMA_AS_IA5_STRING = 10,
-	SCHEMA_AS_UTC_TIME = 11,
-	SCHEMA_AS_GENERALIZED_TIME = 12,
-	SCHEMA_AS_CASE_SENSITIVE_STRING = 13,
-	SCHEMA_AS_DIRECTORY_STRING = 14,
-	SCHEMA_AS_LARGE_INTEGER = 15,
-	SCHEMA_AS_OBJECT_SECURITY_DESCRIPTOR = 16,
-	SCHEMA_AS_DN = 17,
-	SCHEMA_AS_DN_BINARY = 18,
-	SCHEMA_AS_OR_NAME = 19,
-	SCHEMA_AS_REPLICA_LINK = 20,
-	SCHEMA_AS_PRESENTATION_ADDRESS = 21,
-	SCHEMA_AS_ACCESS_POINT = 22,
-	SCHEMA_AS_DN_STRING = 23
-};
-
-int map_schema_syntax(uint32_t om_syntax,
-		      const char *attr_syntax,
-		      const struct ldb_val *om_class,
-		      enum schema_internal_syntax *syntax);
-
-int schema_validate(struct ldb_context *ldb,
-		    struct ldb_message_element *el,
-		    enum schema_internal_syntax type,
-		    bool single, int min, int max);
-
diff --git a/source4/dsdb/schema/schema_set.c b/source4/dsdb/schema/schema_set.c
index 3f5ddd8446..2303b88a05 100644
--- a/source4/dsdb/schema/schema_set.c
+++ b/source4/dsdb/schema/schema_set.c
@@ -79,13 +79,13 @@ static int dsdb_schema_set_attributes(struct ldb_context *ldb, struct dsdb_schem
 			ret = ldb_msg_add_string(msg, attr->lDAPDisplayName, "CASE_INSENSITIVE");
 		} 
 		if (ret != LDB_SUCCESS) {
-			return ret;
+			break;
 		}
 
 		if (attr->searchFlags & SEARCH_FLAG_ATTINDEX) {
 			ret = ldb_msg_add_string(msg_idx, "@IDXATTR", attr->lDAPDisplayName);
 			if (ret != LDB_SUCCESS) {
-				return ret;
+				break;
 			}
 		}
 
@@ -105,11 +105,11 @@ static int dsdb_schema_set_attributes(struct ldb_context *ldb, struct dsdb_schem
 		}
 		
 		if (ret != LDB_SUCCESS) {
-			return ret;
+			break;
 		}
 	}
 
-	if (!write_attributes) {
+	if (!write_attributes || ret != LDB_SUCCESS) {
 		talloc_free(mem_ctx);
 		return ret;
 	}
@@ -120,19 +120,13 @@ static int dsdb_schema_set_attributes(struct ldb_context *ldb, struct dsdb_schem
 	if (ret == LDB_ERR_NO_SUCH_OBJECT) {
 		ret = ldb_add(ldb, msg);
 	} else if (ret != LDB_SUCCESS) {
-		talloc_free(mem_ctx);
-		return ret;
+	} else if (res->count != 1) {
+		ret = ldb_add(ldb, msg);
 	} else {
-
-		if (res->count != 1) {
-			talloc_free(mem_ctx);
-			return LDB_ERR_NO_SUCH_OBJECT;
-		}
-		
 		ret = LDB_SUCCESS;
 		/* Annoyingly added to our search results */
 		ldb_msg_remove_attr(res->msgs[0], "distinguishedName");
-
+		
 		mod_msg = ldb_msg_diff(ldb, res->msgs[0], msg);
 		if (mod_msg->num_elements > 0) {
 			ret = ldb_modify(ldb, mod_msg);
@@ -141,10 +135,11 @@ static int dsdb_schema_set_attributes(struct ldb_context *ldb, struct dsdb_schem
 
 	if (ret == LDB_ERR_INSUFFICIENT_ACCESS_RIGHTS) {
 		/* We might be on a read-only DB */
+		ret = LDB_SUCCESS;
+	}
+	if (ret != LDB_SUCCESS) {
 		talloc_free(mem_ctx);
 		return ret;
-	} else if (ret != LDB_SUCCESS) {
-		return ret;
 	}
 
 	/* Now write out the indexs, as found in the schema (if they have changed) */
@@ -153,14 +148,10 @@ static int dsdb_schema_set_attributes(struct ldb_context *ldb, struct dsdb_schem
 	if (ret == LDB_ERR_NO_SUCH_OBJECT) {
 		ret = ldb_add(ldb, msg_idx);
 	} else if (ret != LDB_SUCCESS) {
-		talloc_free(mem_ctx);
-		return ret;
+	} else if (res->count != 1) {
+		ret = ldb_add(ldb, msg_idx);
 	} else {
-		if (res_idx->count != 1) {
-			talloc_free(mem_ctx);
-			return LDB_ERR_NO_SUCH_OBJECT;
-		}
-		
+		ret = LDB_SUCCESS;
 		/* Annoyingly added to our search results */
 		ldb_msg_remove_attr(res_idx->msgs[0], "distinguishedName");
 
@@ -171,7 +162,6 @@ static int dsdb_schema_set_attributes(struct ldb_context *ldb, struct dsdb_schem
 	}
 	if (ret == LDB_ERR_INSUFFICIENT_ACCESS_RIGHTS) {
 		/* We might be on a read-only DB */
-		talloc_free(mem_ctx);
 		ret = LDB_SUCCESS;
 	}
 	talloc_free(mem_ctx);
diff --git a/source4/lib/ldb/tests/python/api.py b/source4/lib/ldb/tests/python/api.py
index 1ae3fde744..99ad1a9e66 100755
--- a/source4/lib/ldb/tests/python/api.py
+++ b/source4/lib/ldb/tests/python/api.py
@@ -27,14 +27,14 @@ class NoContextTests(unittest.TestCase):
 
 class SimpleLdb(unittest.TestCase):
     def test_connect(self):
-        ldb.Ldb("foo.tdb")
+        ldb.Ldb("foo.ldb")
 
     def test_connect_none(self):
         ldb.Ldb()
 
     def test_connect_later(self):
         x = ldb.Ldb()
-        x.connect("foo.tdb")
+        x.connect("foo.ldb")
 
     def test_repr(self):
         x = ldb.Ldb()
@@ -49,19 +49,19 @@ class SimpleLdb(unittest.TestCase):
         x.set_modules_dir("/tmp")
 
     def test_search(self):
-        l = ldb.Ldb("foo.tdb")
+        l = ldb.Ldb("foo.ldb")
         self.assertEquals(len(l.search()), 1)
 
     def test_search_controls(self):
-        l = ldb.Ldb("foo.tdb")
-        self.assertEquals(len(l.search(controls=["paged_results:1:5"])), 1)
+        l = ldb.Ldb("foo.ldb")
+        self.assertEquals(len(l.search(controls=["paged_results:0:5"])), 1)
 
     def test_search_attrs(self):
-        l = ldb.Ldb("foo.tdb")
+        l = ldb.Ldb("foo.ldb")
         self.assertEquals(len(l.search(ldb.Dn(l, ""), ldb.SCOPE_SUBTREE, "(dc=*)", ["dc"])), 0)
 
     def test_search_string_dn(self):
-        l = ldb.Ldb("foo.tdb")
+        l = ldb.Ldb("foo.ldb")
         self.assertEquals(len(l.search("", ldb.SCOPE_SUBTREE, "(dc=*)", ["dc"])), 0)
 
     def test_search_attr_string(self):
@@ -69,29 +69,29 @@ class SimpleLdb(unittest.TestCase):
         self.assertRaises(TypeError, l.search, attrs="dc")
 
     def test_opaque(self):
-        l = ldb.Ldb("foo.tdb")
+        l = ldb.Ldb("foo.ldb")
         l.set_opaque("my_opaque", l)
         self.assertTrue(l.get_opaque("my_opaque") is not None)
         self.assertEquals(None, l.get_opaque("unknown"))
 
     def test_parse_control_strings(self):
-        l = ldb.Ldb("foo.tdb")
+        l = ldb.Ldb("foo.ldb")
         self.assertRaises(ldb.LdbError, l.parse_control_strings, ["foo", "bar"])
-        self.assertTrue(l.parse_control_strings(["paged_results:1:5"]) is not None)
+        self.assertTrue(l.parse_control_strings(["paged_results:0:5"]) is not None)
 
     def test_search_scope_base(self):
-        l = ldb.Ldb("foo.tdb")
+        l = ldb.Ldb("foo.ldb")
         self.assertEquals(len(l.search(ldb.Dn(l, "dc=foo"), 
                           ldb.SCOPE_ONELEVEL)), 0)
 
     def test_delete(self):
-        l = ldb.Ldb("foo.tdb")
+        l = ldb.Ldb("foo.ldb")
         self.assertRaises(ldb.LdbError, lambda: l.delete(ldb.Dn(l, "dc=foo")))
 
     def test_contains(self):
-        l = ldb.Ldb("foo.tdb")
+        l = ldb.Ldb("foo.ldb")
         self.assertFalse(ldb.Dn(l, "dc=foo") in l)
-        l = ldb.Ldb("foo.tdb")
+        l = ldb.Ldb("foo.ldb")
         m = ldb.Message()
         m.dn = ldb.Dn(l, "dc=foo")
         m["b"] = ["a"]
@@ -102,23 +102,23 @@ class SimpleLdb(unittest.TestCase):
             l.delete(m.dn)
 
     def test_get_config_basedn(self):
-        l = ldb.Ldb("foo.tdb")
+        l = ldb.Ldb("foo.ldb")
         self.assertEquals(None, l.get_config_basedn())
 
     def test_get_root_basedn(self):
-        l = ldb.Ldb("foo.tdb")
+        l = ldb.Ldb("foo.ldb")
         self.assertEquals(None, l.get_root_basedn())
 
     def test_get_schema_basedn(self):
-        l = ldb.Ldb("foo.tdb")
+        l = ldb.Ldb("foo.ldb")
         self.assertEquals(None, l.get_schema_basedn())
 
     def test_get_default_basedn(self):
-        l = ldb.Ldb("foo.tdb")
+        l = ldb.Ldb("foo.ldb")
         self.assertEquals(None, l.get_default_basedn())
 
     def test_add(self):
-        l = ldb.Ldb("foo.tdb")
+        l = ldb.Ldb("foo.ldb")
         m = ldb.Message()
         m.dn = ldb.Dn(l, "dc=foo")
         m["bla"] = "bla"
@@ -130,7 +130,7 @@ class SimpleLdb(unittest.TestCase):
             l.delete(ldb.Dn(l, "dc=foo"))
 
     def test_add_dict(self):
-        l = ldb.Ldb("foo.tdb")
+        l = ldb.Ldb("foo.ldb")
         m = {"dn": ldb.Dn(l, "dc=foo"),
              "bla": "bla"}
         self.assertEquals(len(l.search()), 1)
@@ -141,7 +141,7 @@ class SimpleLdb(unittest.TestCase):
             l.delete(ldb.Dn(l, "dc=foo"))
 
     def test_add_dict_string_dn(self):
-        l = ldb.Ldb("foo.tdb")
+        l = ldb.Ldb("foo.ldb")
         m = {"dn": "dc=foo", "bla": "bla"}
         self.assertEquals(len(l.search()), 1)
         l.add(m)
@@ -151,7 +151,7 @@ class SimpleLdb(unittest.TestCase):
             l.delete(ldb.Dn(l, "dc=foo"))
 
     def test_rename(self):
-        l = ldb.Ldb("foo.tdb")
+        l = ldb.Ldb("foo.ldb")
         m = ldb.Message()
         m.dn = ldb.Dn(l, "dc=foo")
         m["bla"] = "bla"
@@ -164,7 +164,7 @@ class SimpleLdb(unittest.TestCase):
             l.delete(ldb.Dn(l, "dc=bar"))
 
     def test_rename_string_dns(self):
-        l = ldb.Ldb("foo.tdb")
+        l = ldb.Ldb("foo.ldb")
         m = ldb.Message()
         m.dn = ldb.Dn(l, "dc=foo")
         m["bla"] = "bla"
@@ -177,7 +177,7 @@ class SimpleLdb(unittest.TestCase):
             l.delete(ldb.Dn(l, "dc=bar"))
 
     def test_modify_delete(self):
-        l = ldb.Ldb("foo.tdb")
+        l = ldb.Ldb("foo.ldb")
         m = ldb.Message()
         m.dn = ldb.Dn(l, "dc=modifydelete")
         m["bla"] = ["1234"]
@@ -195,7 +195,7 @@ class SimpleLdb(unittest.TestCase):
             l.delete(ldb.Dn(l, "dc=modifydelete"))
 
     def test_modify_add(self):
-        l = ldb.Ldb("foo.tdb")
+        l = ldb.Ldb("foo.ldb")
         m = ldb.Message()
         m.dn = ldb.Dn(l, "dc=add")
         m["bla"] = ["1234"]
@@ -212,7 +212,7 @@ class SimpleLdb(unittest.TestCase):
             l.delete(ldb.Dn(l, "dc=add"))
 
     def test_modify_modify(self):
-        l = ldb.Ldb("foo.tdb")
+        l = ldb.Ldb("foo.ldb")
         m = ldb.Message()
         m.dn = ldb.Dn(l, "dc=modify2")
         m["bla"] = ["1234", "456"]
@@ -229,7 +229,7 @@ class SimpleLdb(unittest.TestCase):
             l.delete(ldb.Dn(l, "dc=modify2"))
 
     def test_transaction_commit(self):
-        l = ldb.Ldb("foo.tdb")
+        l = ldb.Ldb("foo.ldb")
         l.transaction_start()
         m = ldb.Message(ldb.Dn(l, "dc=foo"))
         m["foo"] = ["bar"]
@@ -238,7 +238,7 @@ class SimpleLdb(unittest.TestCase):
         l.delete(m.dn)
 
     def test_transaction_cancel(self):
-        l = ldb.Ldb("foo.tdb")
+        l = ldb.Ldb("foo.ldb")
         l.transaction_start()
         m = ldb.Message(ldb.Dn(l, "dc=foo"))
         m["foo"] = ["bar"]
@@ -249,13 +249,13 @@ class SimpleLdb(unittest.TestCase):
     def test_set_debug(self):
         def my_report_fn(level, text):
             pass
-        l = ldb.Ldb("foo.tdb")
+        l = ldb.Ldb("foo.ldb")
         l.set_debug(my_report_fn)
 
 
 class DnTests(unittest.TestCase):
     def setUp(self):
-        self.ldb = ldb.Ldb("foo.tdb")
+        self.ldb = ldb.Ldb("foo.ldb")
 
     def test_eq_str(self):
         x = ldb.Dn(self.ldb, "dc=foo,bar=bloe")
@@ -402,7 +402,7 @@ class LdbMsgTests(unittest.TestCase):
         self.assertEquals(["dn", "foo", "bar"], self.msg.keys())
 
     def test_dn(self):
-        self.msg.dn = ldb.Dn(ldb.Ldb("foo.tdb"), "@BASEINFO")
+        self.msg.dn = ldb.Dn(ldb.Ldb("foo.ldb"), "@BASEINFO")
         self.assertEquals("@BASEINFO", self.msg.dn.__str__())
 
     def test_get_dn(self):
diff --git a/source4/lib/ldb/tests/test-generic.sh b/source4/lib/ldb/tests/test-generic.sh
index 14337cc135..50b5ff99a0 100755
--- a/source4/lib/ldb/tests/test-generic.sh
+++ b/source4/lib/ldb/tests/test-generic.sh
@@ -103,7 +103,7 @@ fi
 count=`$VALGRIND ldbsearch '(cn<=t)' cn | grep '^dn' | wc -l`
 if [ $count != 13 ]; then
     echo returned $count records - expected 13
-    echo "this fails on opsnLdap ..."
+    echo "this fails on openLdap ..."
 fi
 
 checkcount() {
diff --git a/swat/cldap_server/index.esp b/swat2/cldap_server/index.esp
index 1ede088705..1ede088705 100644
--- a/swat/cldap_server/index.esp
+++ b/swat2/cldap_server/index.esp
diff --git a/swat/desktop/index.esp b/swat2/desktop/index.esp
index 1dee4d3bb4..1dee4d3bb4 100644
--- a/swat/desktop/index.esp
+++ b/swat2/desktop/index.esp
diff --git a/swat/esptest/exception.esp b/swat2/esptest/exception.esp
index ff28d6318e..ff28d6318e 100644
--- a/swat/esptest/exception.esp
+++ b/swat2/esptest/exception.esp
diff --git a/swat/esptest/formtest.esp b/swat2/esptest/formtest.esp
index 2310849895..2310849895 100644
--- a/swat/esptest/formtest.esp
+++ b/swat2/esptest/formtest.esp
diff --git a/swat/esptest/include.esp b/swat2/esptest/include.esp
index 5d558d59dc..5d558d59dc 100644
--- a/swat/esptest/include.esp
+++ b/swat2/esptest/include.esp
diff --git a/swat/esptest/index.esp b/swat2/esptest/index.esp
index 663f82c599..663f82c599 100644
--- a/swat/esptest/index.esp
+++ b/swat2/esptest/index.esp
diff --git a/swat/esptest/ldb.esp b/swat2/esptest/ldb.esp
index cf2725fbcf..cf2725fbcf 100644
--- a/swat/esptest/ldb.esp
+++ b/swat2/esptest/ldb.esp
diff --git a/swat/esptest/loadparm.esp b/swat2/esptest/loadparm.esp
index 9581af0262..9581af0262 100644
--- a/swat/esptest/loadparm.esp
+++ b/swat2/esptest/loadparm.esp
diff --git a/swat/esptest/qooxdoo.esp b/swat2/esptest/qooxdoo.esp
index 554a4e90d5..554a4e90d5 100644
--- a/swat/esptest/qooxdoo.esp
+++ b/swat2/esptest/qooxdoo.esp
diff --git a/swat/esptest/registry.esp b/swat2/esptest/registry.esp
index efdfefc37e..efdfefc37e 100644
--- a/swat/esptest/registry.esp
+++ b/swat2/esptest/registry.esp
diff --git a/swat/esptest/samr.esp b/swat2/esptest/samr.esp
index a60a02e7c8..a60a02e7c8 100644
--- a/swat/esptest/samr.esp
+++ b/swat2/esptest/samr.esp
diff --git a/swat/esptest/session.esp b/swat2/esptest/session.esp
index 6213dde62f..6213dde62f 100644
--- a/swat/esptest/session.esp
+++ b/swat2/esptest/session.esp
diff --git a/swat/esptest/showvars.esp b/swat2/esptest/showvars.esp
index dc55b1e58b..dc55b1e58b 100644
--- a/swat/esptest/showvars.esp
+++ b/swat2/esptest/showvars.esp
diff --git a/swat/favicon.ico b/swat2/favicon.ico
index ef903bacfe..ef903bacfe 100644
--- a/swat/favicon.ico
+++ b/swat2/favicon.ico
diff --git a/swat/images/core/alpha.gif b/swat2/images/core/alpha.gif
index ab8c332af9..ab8c332af9 100644
--- a/swat/images/core/alpha.gif
+++ b/swat2/images/core/alpha.gif
diff --git a/swat/images/core/blank.gif b/swat2/images/core/blank.gif
index 75b945d255..75b945d255 100644
--- a/swat/images/core/blank.gif
+++ b/swat2/images/core/blank.gif
diff --git a/swat/images/core/brightness.jpg b/swat2/images/core/brightness.jpg
index 008984d1c7..008984d1c7 100644
--- a/swat/images/core/brightness.jpg
+++ b/swat2/images/core/brightness.jpg
diff --git a/swat/images/core/brightnesshandle.gif b/swat2/images/core/brightnesshandle.gif
index 7cf80222af..7cf80222af 100644
--- a/swat/images/core/brightnesshandle.gif
+++ b/swat2/images/core/brightnesshandle.gif
diff --git a/swat/images/core/dotted.gif b/swat2/images/core/dotted.gif
index 467da46f25..467da46f25 100644
--- a/swat/images/core/dotted.gif
+++ b/swat2/images/core/dotted.gif
diff --git a/swat/images/core/huesaturation.jpg b/swat2/images/core/huesaturation.jpg
index 36d2d799d9..36d2d799d9 100644
--- a/swat/images/core/huesaturation.jpg
+++ b/swat2/images/core/huesaturation.jpg
diff --git a/swat/images/core/huesaturationhandle.gif b/swat2/images/core/huesaturationhandle.gif
index 2fcaaece17..2fcaaece17 100644
--- a/swat/images/core/huesaturationhandle.gif
+++ b/swat2/images/core/huesaturationhandle.gif
diff --git a/swat/images/favicon.ico b/swat2/images/favicon.ico
index ef903bacfe..ef903bacfe 100644
--- a/swat/images/favicon.ico
+++ b/swat2/images/favicon.ico
diff --git a/swat/images/icons/crystalsvg/128/antivirus.png b/swat2/images/icons/crystalsvg/128/antivirus.png
index 381fc55d3f..381fc55d3f 100644
--- a/swat/images/icons/crystalsvg/128/antivirus.png
+++ b/swat2/images/icons/crystalsvg/128/antivirus.png
diff --git a/swat/images/icons/crystalsvg/128/back.png b/swat2/images/icons/crystalsvg/128/back.png
index 4e2e380e1f..4e2e380e1f 100644
--- a/swat/images/icons/crystalsvg/128/back.png
+++ b/swat2/images/icons/crystalsvg/128/back.png
diff --git a/swat/images/icons/crystalsvg/128/background.png b/swat2/images/icons/crystalsvg/128/background.png
index dc35d81ebe..dc35d81ebe 100644
--- a/swat/images/icons/crystalsvg/128/background.png
+++ b/swat2/images/icons/crystalsvg/128/background.png
diff --git a/swat/images/icons/crystalsvg/128/bell.png b/swat2/images/icons/crystalsvg/128/bell.png
index 530fbf64a7..530fbf64a7 100644
--- a/swat/images/icons/crystalsvg/128/bell.png
+++ b/swat2/images/icons/crystalsvg/128/bell.png
diff --git a/swat/images/icons/crystalsvg/128/blockdevice.png b/swat2/images/icons/crystalsvg/128/blockdevice.png
index e3068923aa..e3068923aa 100644
--- a/swat/images/icons/crystalsvg/128/blockdevice.png
+++ b/swat2/images/icons/crystalsvg/128/blockdevice.png
diff --git a/swat/images/icons/crystalsvg/128/browser.png b/swat2/images/icons/crystalsvg/128/browser.png
index 63e035fd4d..63e035fd4d 100644
--- a/swat/images/icons/crystalsvg/128/browser.png
+++ b/swat2/images/icons/crystalsvg/128/browser.png
diff --git a/swat/images/icons/crystalsvg/128/cache.png b/swat2/images/icons/crystalsvg/128/cache.png
index f9261381de..f9261381de 100644
--- a/swat/images/icons/crystalsvg/128/cache.png
+++ b/swat2/images/icons/crystalsvg/128/cache.png
diff --git a/swat/images/icons/crystalsvg/128/clock.png b/swat2/images/icons/crystalsvg/128/clock.png
index 692b0502e3..692b0502e3 100644
--- a/swat/images/icons/crystalsvg/128/clock.png
+++ b/swat2/images/icons/crystalsvg/128/clock.png
diff --git a/swat/images/icons/crystalsvg/128/colors.png b/swat2/images/icons/crystalsvg/128/colors.png
index 932e6fbf0b..932e6fbf0b 100644
--- a/swat/images/icons/crystalsvg/128/colors.png
+++ b/swat2/images/icons/crystalsvg/128/colors.png
diff --git a/swat/images/icons/crystalsvg/128/core.png b/swat2/images/icons/crystalsvg/128/core.png
index 485903976b..485903976b 100644
--- a/swat/images/icons/crystalsvg/128/core.png
+++ b/swat2/images/icons/crystalsvg/128/core.png
diff --git a/swat/images/icons/crystalsvg/128/date.png b/swat2/images/icons/crystalsvg/128/date.png
index 1e34bb233f..1e34bb233f 100644
--- a/swat/images/icons/crystalsvg/128/date.png
+++ b/swat2/images/icons/crystalsvg/128/date.png
diff --git a/swat/images/icons/crystalsvg/128/desktop.png b/swat2/images/icons/crystalsvg/128/desktop.png
index 02f2f26d8a..02f2f26d8a 100644
--- a/swat/images/icons/crystalsvg/128/desktop.png
+++ b/swat2/images/icons/crystalsvg/128/desktop.png
diff --git a/swat/images/icons/crystalsvg/128/display.png b/swat2/images/icons/crystalsvg/128/display.png
index 8573935855..8573935855 100644
--- a/swat/images/icons/crystalsvg/128/display.png
+++ b/swat2/images/icons/crystalsvg/128/display.png
diff --git a/swat/images/icons/crystalsvg/128/document.png b/swat2/images/icons/crystalsvg/128/document.png
index 970fe33d50..970fe33d50 100644
--- a/swat/images/icons/crystalsvg/128/document.png
+++ b/swat2/images/icons/crystalsvg/128/document.png
diff --git a/swat/images/icons/crystalsvg/128/email.png b/swat2/images/icons/crystalsvg/128/email.png
index a01dfa0cef..a01dfa0cef 100644
--- a/swat/images/icons/crystalsvg/128/email.png
+++ b/swat2/images/icons/crystalsvg/128/email.png
diff --git a/swat/images/icons/crystalsvg/128/empty.png b/swat2/images/icons/crystalsvg/128/empty.png
index 431c18ed49..431c18ed49 100644
--- a/swat/images/icons/crystalsvg/128/empty.png
+++ b/swat2/images/icons/crystalsvg/128/empty.png
diff --git a/swat/images/icons/crystalsvg/128/encrypted.png b/swat2/images/icons/crystalsvg/128/encrypted.png
index be9140e2da..be9140e2da 100644
--- a/swat/images/icons/crystalsvg/128/encrypted.png
+++ b/swat2/images/icons/crystalsvg/128/encrypted.png
diff --git a/swat/images/icons/crystalsvg/128/energy.png b/swat2/images/icons/crystalsvg/128/energy.png
index 4ad8e61911..4ad8e61911 100644
--- a/swat/images/icons/crystalsvg/128/energy.png
+++ b/swat2/images/icons/crystalsvg/128/energy.png
diff --git a/swat/images/icons/crystalsvg/128/error.png b/swat2/images/icons/crystalsvg/128/error.png
index 44de2575e9..44de2575e9 100644
--- a/swat/images/icons/crystalsvg/128/error.png
+++ b/swat2/images/icons/crystalsvg/128/error.png
diff --git a/swat/images/icons/crystalsvg/128/exec.png b/swat2/images/icons/crystalsvg/128/exec.png
index f20b42433e..f20b42433e 100644
--- a/swat/images/icons/crystalsvg/128/exec.png
+++ b/swat2/images/icons/crystalsvg/128/exec.png
diff --git a/swat/images/icons/crystalsvg/128/fileprint.png b/swat2/images/icons/crystalsvg/128/fileprint.png
index 2625880cf6..2625880cf6 100644
--- a/swat/images/icons/crystalsvg/128/fileprint.png
+++ b/swat2/images/icons/crystalsvg/128/fileprint.png
diff --git a/swat/images/icons/crystalsvg/128/folder.png b/swat2/images/icons/crystalsvg/128/folder.png
index e3d2487f6a..e3d2487f6a 100644
--- a/swat/images/icons/crystalsvg/128/folder.png
+++ b/swat2/images/icons/crystalsvg/128/folder.png
diff --git a/swat/images/icons/crystalsvg/128/folder_home.png b/swat2/images/icons/crystalsvg/128/folder_home.png
index 1523d6e17a..1523d6e17a 100644
--- a/swat/images/icons/crystalsvg/128/folder_home.png
+++ b/swat2/images/icons/crystalsvg/128/folder_home.png
diff --git a/swat/images/icons/crystalsvg/128/folder_important.png b/swat2/images/icons/crystalsvg/128/folder_important.png
index 6470a37b50..6470a37b50 100644
--- a/swat/images/icons/crystalsvg/128/folder_important.png
+++ b/swat2/images/icons/crystalsvg/128/folder_important.png
diff --git a/swat/images/icons/crystalsvg/128/folder_locked.png b/swat2/images/icons/crystalsvg/128/folder_locked.png
index ba6645ba8b..ba6645ba8b 100644
--- a/swat/images/icons/crystalsvg/128/folder_locked.png
+++ b/swat2/images/icons/crystalsvg/128/folder_locked.png
diff --git a/swat/images/icons/crystalsvg/128/folder_open.png b/swat2/images/icons/crystalsvg/128/folder_open.png
index 62faf24ddf..62faf24ddf 100644
--- a/swat/images/icons/crystalsvg/128/folder_open.png
+++ b/swat2/images/icons/crystalsvg/128/folder_open.png
diff --git a/swat/images/icons/crystalsvg/128/font.png b/swat2/images/icons/crystalsvg/128/font.png
index 964d5748cb..964d5748cb 100644
--- a/swat/images/icons/crystalsvg/128/font.png
+++ b/swat2/images/icons/crystalsvg/128/font.png
diff --git a/swat/images/icons/crystalsvg/128/forward.png b/swat2/images/icons/crystalsvg/128/forward.png
index 23035d24a7..23035d24a7 100644
--- a/swat/images/icons/crystalsvg/128/forward.png
+++ b/swat2/images/icons/crystalsvg/128/forward.png
diff --git a/swat/images/icons/crystalsvg/128/gohome.png b/swat2/images/icons/crystalsvg/128/gohome.png
index 1523d6e17a..1523d6e17a 100644
--- a/swat/images/icons/crystalsvg/128/gohome.png
+++ b/swat2/images/icons/crystalsvg/128/gohome.png
diff --git a/swat/images/icons/crystalsvg/128/hwinfo.png b/swat2/images/icons/crystalsvg/128/hwinfo.png
index e2aced9dba..e2aced9dba 100644
--- a/swat/images/icons/crystalsvg/128/hwinfo.png
+++ b/swat2/images/icons/crystalsvg/128/hwinfo.png
diff --git a/swat/images/icons/crystalsvg/128/info.png b/swat2/images/icons/crystalsvg/128/info.png
index 0685f86af8..0685f86af8 100644
--- a/swat/images/icons/crystalsvg/128/info.png
+++ b/swat2/images/icons/crystalsvg/128/info.png
diff --git a/swat/images/icons/crystalsvg/128/kcoloredit.png b/swat2/images/icons/crystalsvg/128/kcoloredit.png
index 932e6fbf0b..932e6fbf0b 100644
--- a/swat/images/icons/crystalsvg/128/kcoloredit.png
+++ b/swat2/images/icons/crystalsvg/128/kcoloredit.png
diff --git a/swat/images/icons/crystalsvg/128/kcontrol.png b/swat2/images/icons/crystalsvg/128/kcontrol.png
index 99a89e323c..99a89e323c 100644
--- a/swat/images/icons/crystalsvg/128/kcontrol.png
+++ b/swat2/images/icons/crystalsvg/128/kcontrol.png
diff --git a/swat/images/icons/crystalsvg/128/keyboard.png b/swat2/images/icons/crystalsvg/128/keyboard.png
index f6539e9afd..f6539e9afd 100644
--- a/swat/images/icons/crystalsvg/128/keyboard.png
+++ b/swat2/images/icons/crystalsvg/128/keyboard.png
diff --git a/swat/images/icons/crystalsvg/128/khelpcenter.png b/swat2/images/icons/crystalsvg/128/khelpcenter.png
index aff331899e..aff331899e 100644
--- a/swat/images/icons/crystalsvg/128/khelpcenter.png
+++ b/swat2/images/icons/crystalsvg/128/khelpcenter.png
diff --git a/swat/images/icons/crystalsvg/128/konqueror.png b/swat2/images/icons/crystalsvg/128/konqueror.png
index 4527db246d..4527db246d 100644
--- a/swat/images/icons/crystalsvg/128/konqueror.png
+++ b/swat2/images/icons/crystalsvg/128/konqueror.png
diff --git a/swat/images/icons/crystalsvg/128/kpaint.png b/swat2/images/icons/crystalsvg/128/kpaint.png
index 2c1bb499c0..2c1bb499c0 100644
--- a/swat/images/icons/crystalsvg/128/kpaint.png
+++ b/swat2/images/icons/crystalsvg/128/kpaint.png
diff --git a/swat/images/icons/crystalsvg/128/krita.png b/swat2/images/icons/crystalsvg/128/krita.png
index 4607286201..4607286201 100644
--- a/swat/images/icons/crystalsvg/128/krita.png
+++ b/swat2/images/icons/crystalsvg/128/krita.png
diff --git a/swat/images/icons/crystalsvg/128/ksmiletris.png b/swat2/images/icons/crystalsvg/128/ksmiletris.png
index a7789b7417..a7789b7417 100644
--- a/swat/images/icons/crystalsvg/128/ksmiletris.png
+++ b/swat2/images/icons/crystalsvg/128/ksmiletris.png
diff --git a/swat/images/icons/crystalsvg/128/ksnapshot.png b/swat2/images/icons/crystalsvg/128/ksnapshot.png
index de8e2a190b..de8e2a190b 100644
--- a/swat/images/icons/crystalsvg/128/ksnapshot.png
+++ b/swat2/images/icons/crystalsvg/128/ksnapshot.png
diff --git a/swat/images/icons/crystalsvg/128/ktalkd.png b/swat2/images/icons/crystalsvg/128/ktalkd.png
index 8d9c97f7dd..8d9c97f7dd 100644
--- a/swat/images/icons/crystalsvg/128/ktalkd.png
+++ b/swat2/images/icons/crystalsvg/128/ktalkd.png
diff --git a/swat/images/icons/crystalsvg/128/kuser.png b/swat2/images/icons/crystalsvg/128/kuser.png
index f28f704f75..f28f704f75 100644
--- a/swat/images/icons/crystalsvg/128/kuser.png
+++ b/swat2/images/icons/crystalsvg/128/kuser.png
diff --git a/swat/images/icons/crystalsvg/128/kview.png b/swat2/images/icons/crystalsvg/128/kview.png
index 6a1b0fef0a..6a1b0fef0a 100644
--- a/swat/images/icons/crystalsvg/128/kview.png
+++ b/swat2/images/icons/crystalsvg/128/kview.png
diff --git a/swat/images/icons/crystalsvg/128/linuxconf.png b/swat2/images/icons/crystalsvg/128/linuxconf.png
index 969b8da3e2..969b8da3e2 100644
--- a/swat/images/icons/crystalsvg/128/linuxconf.png
+++ b/swat2/images/icons/crystalsvg/128/linuxconf.png
diff --git a/swat/images/icons/crystalsvg/128/locale.png b/swat2/images/icons/crystalsvg/128/locale.png
index 25403acc9d..25403acc9d 100644
--- a/swat/images/icons/crystalsvg/128/locale.png
+++ b/swat2/images/icons/crystalsvg/128/locale.png
diff --git a/swat/images/icons/crystalsvg/128/looknfeel.png b/swat2/images/icons/crystalsvg/128/looknfeel.png
index cd1a36b9af..cd1a36b9af 100644
--- a/swat/images/icons/crystalsvg/128/looknfeel.png
+++ b/swat2/images/icons/crystalsvg/128/looknfeel.png
diff --git a/swat/images/icons/crystalsvg/128/mac.png b/swat2/images/icons/crystalsvg/128/mac.png
index 258588b7c7..258588b7c7 100644
--- a/swat/images/icons/crystalsvg/128/mac.png
+++ b/swat2/images/icons/crystalsvg/128/mac.png
diff --git a/swat/images/icons/crystalsvg/128/mail.png b/swat2/images/icons/crystalsvg/128/mail.png
index a4ba0aeccb..a4ba0aeccb 100644
--- a/swat/images/icons/crystalsvg/128/mail.png
+++ b/swat2/images/icons/crystalsvg/128/mail.png
diff --git a/swat/images/icons/crystalsvg/128/mimetypes.png b/swat2/images/icons/crystalsvg/128/mimetypes.png
index fb9189d6b9..fb9189d6b9 100644
--- a/swat/images/icons/crystalsvg/128/mimetypes.png
+++ b/swat2/images/icons/crystalsvg/128/mimetypes.png
diff --git a/swat/images/icons/crystalsvg/128/mouse.png b/swat2/images/icons/crystalsvg/128/mouse.png
index dc44bacf07..dc44bacf07 100644
--- a/swat/images/icons/crystalsvg/128/mouse.png
+++ b/swat2/images/icons/crystalsvg/128/mouse.png
diff --git a/swat/images/icons/crystalsvg/128/mozilla.png b/swat2/images/icons/crystalsvg/128/mozilla.png
index eb71eb5def..eb71eb5def 100644
--- a/swat/images/icons/crystalsvg/128/mozilla.png
+++ b/swat2/images/icons/crystalsvg/128/mozilla.png
diff --git a/swat/images/icons/crystalsvg/128/mycomputer.png b/swat2/images/icons/crystalsvg/128/mycomputer.png
index ed7ac28a75..ed7ac28a75 100644
--- a/swat/images/icons/crystalsvg/128/mycomputer.png
+++ b/swat2/images/icons/crystalsvg/128/mycomputer.png
diff --git a/swat/images/icons/crystalsvg/128/mymac.png b/swat2/images/icons/crystalsvg/128/mymac.png
index d726dd4821..d726dd4821 100644
--- a/swat/images/icons/crystalsvg/128/mymac.png
+++ b/swat2/images/icons/crystalsvg/128/mymac.png
diff --git a/swat/images/icons/crystalsvg/128/netscape.png b/swat2/images/icons/crystalsvg/128/netscape.png
index 2e5cf2c0fd..2e5cf2c0fd 100644
--- a/swat/images/icons/crystalsvg/128/netscape.png
+++ b/swat2/images/icons/crystalsvg/128/netscape.png
diff --git a/swat/images/icons/crystalsvg/128/network.png b/swat2/images/icons/crystalsvg/128/network.png
index 9fb0d1fb2b..9fb0d1fb2b 100644
--- a/swat/images/icons/crystalsvg/128/network.png
+++ b/swat2/images/icons/crystalsvg/128/network.png
diff --git a/swat/images/icons/crystalsvg/128/password.png b/swat2/images/icons/crystalsvg/128/password.png
index f12dfdae6d..f12dfdae6d 100644
--- a/swat/images/icons/crystalsvg/128/password.png
+++ b/swat2/images/icons/crystalsvg/128/password.png
diff --git a/swat/images/icons/crystalsvg/128/penguin.png b/swat2/images/icons/crystalsvg/128/penguin.png
index ebfc696c71..ebfc696c71 100644
--- a/swat/images/icons/crystalsvg/128/penguin.png
+++ b/swat2/images/icons/crystalsvg/128/penguin.png
diff --git a/swat/images/icons/crystalsvg/128/proxy.png b/swat2/images/icons/crystalsvg/128/proxy.png
index ec18d5a92f..ec18d5a92f 100644
--- a/swat/images/icons/crystalsvg/128/proxy.png
+++ b/swat2/images/icons/crystalsvg/128/proxy.png
diff --git a/swat/images/icons/crystalsvg/128/quicktime.png b/swat2/images/icons/crystalsvg/128/quicktime.png
index 9d39ea3284..9d39ea3284 100644
--- a/swat/images/icons/crystalsvg/128/quicktime.png
+++ b/swat2/images/icons/crystalsvg/128/quicktime.png
diff --git a/swat/images/icons/crystalsvg/128/realplayer.png b/swat2/images/icons/crystalsvg/128/realplayer.png
index 2a738353e3..2a738353e3 100644
--- a/swat/images/icons/crystalsvg/128/realplayer.png
+++ b/swat2/images/icons/crystalsvg/128/realplayer.png
diff --git a/swat/images/icons/crystalsvg/128/reload.png b/swat2/images/icons/crystalsvg/128/reload.png
index 62fc0261f5..62fc0261f5 100644
--- a/swat/images/icons/crystalsvg/128/reload.png
+++ b/swat2/images/icons/crystalsvg/128/reload.png
diff --git a/swat/images/icons/crystalsvg/128/services.png b/swat2/images/icons/crystalsvg/128/services.png
index bef393d4be..bef393d4be 100644
--- a/swat/images/icons/crystalsvg/128/services.png
+++ b/swat2/images/icons/crystalsvg/128/services.png
diff --git a/swat/images/icons/crystalsvg/128/socket.png b/swat2/images/icons/crystalsvg/128/socket.png
index 60eed5b0f1..60eed5b0f1 100644
--- a/swat/images/icons/crystalsvg/128/socket.png
+++ b/swat2/images/icons/crystalsvg/128/socket.png
diff --git a/swat/images/icons/crystalsvg/128/stylesheet.png b/swat2/images/icons/crystalsvg/128/stylesheet.png
index bc911a9c9b..bc911a9c9b 100644
--- a/swat/images/icons/crystalsvg/128/stylesheet.png
+++ b/swat2/images/icons/crystalsvg/128/stylesheet.png
diff --git a/swat/images/icons/crystalsvg/128/tux.png b/swat2/images/icons/crystalsvg/128/tux.png
index 8e4e34b53a..8e4e34b53a 100644
--- a/swat/images/icons/crystalsvg/128/tux.png
+++ b/swat2/images/icons/crystalsvg/128/tux.png
diff --git a/swat/images/icons/crystalsvg/128/up.png b/swat2/images/icons/crystalsvg/128/up.png
index 1c64cd8b1a..1c64cd8b1a 100644
--- a/swat/images/icons/crystalsvg/128/up.png
+++ b/swat2/images/icons/crystalsvg/128/up.png
diff --git a/swat/images/icons/crystalsvg/16/access.png b/swat2/images/icons/crystalsvg/16/access.png
index d519c57c7a..d519c57c7a 100644
--- a/swat/images/icons/crystalsvg/16/access.png
+++ b/swat2/images/icons/crystalsvg/16/access.png
diff --git a/swat/images/icons/crystalsvg/16/agent.png b/swat2/images/icons/crystalsvg/16/agent.png
index 9826d3457b..9826d3457b 100644
--- a/swat/images/icons/crystalsvg/16/agent.png
+++ b/swat2/images/icons/crystalsvg/16/agent.png
diff --git a/swat/images/icons/crystalsvg/16/antivirus.png b/swat2/images/icons/crystalsvg/16/antivirus.png
index a5fe838bd0..a5fe838bd0 100644
--- a/swat/images/icons/crystalsvg/16/antivirus.png
+++ b/swat2/images/icons/crystalsvg/16/antivirus.png
diff --git a/swat/images/icons/crystalsvg/16/appearance.png b/swat2/images/icons/crystalsvg/16/appearance.png
index 9612cd5233..9612cd5233 100644
--- a/swat/images/icons/crystalsvg/16/appearance.png
+++ b/swat2/images/icons/crystalsvg/16/appearance.png
diff --git a/swat/images/icons/crystalsvg/16/apply.png b/swat2/images/icons/crystalsvg/16/apply.png
index 543710fb7b..543710fb7b 100644
--- a/swat/images/icons/crystalsvg/16/apply.png
+++ b/swat2/images/icons/crystalsvg/16/apply.png
diff --git a/swat/images/icons/crystalsvg/16/back.png b/swat2/images/icons/crystalsvg/16/back.png
index b6d9bd134b..b6d9bd134b 100644
--- a/swat/images/icons/crystalsvg/16/back.png
+++ b/swat2/images/icons/crystalsvg/16/back.png
diff --git a/swat/images/icons/crystalsvg/16/background.png b/swat2/images/icons/crystalsvg/16/background.png
index f4ef81c608..f4ef81c608 100644
--- a/swat/images/icons/crystalsvg/16/background.png
+++ b/swat2/images/icons/crystalsvg/16/background.png
diff --git a/swat/images/icons/crystalsvg/16/bell.png b/swat2/images/icons/crystalsvg/16/bell.png
index 7a3fcae59a..7a3fcae59a 100644
--- a/swat/images/icons/crystalsvg/16/bell.png
+++ b/swat2/images/icons/crystalsvg/16/bell.png
diff --git a/swat/images/icons/crystalsvg/16/blockdevice.png b/swat2/images/icons/crystalsvg/16/blockdevice.png
index a4acb09cbd..a4acb09cbd 100644
--- a/swat/images/icons/crystalsvg/16/blockdevice.png
+++ b/swat2/images/icons/crystalsvg/16/blockdevice.png
diff --git a/swat/images/icons/crystalsvg/16/bookmark.png b/swat2/images/icons/crystalsvg/16/bookmark.png
index 5e76158719..5e76158719 100644
--- a/swat/images/icons/crystalsvg/16/bookmark.png
+++ b/swat2/images/icons/crystalsvg/16/bookmark.png
diff --git a/swat/images/icons/crystalsvg/16/browser.png b/swat2/images/icons/crystalsvg/16/browser.png
index 49202d1980..49202d1980 100644
--- a/swat/images/icons/crystalsvg/16/browser.png
+++ b/swat2/images/icons/crystalsvg/16/browser.png
diff --git a/swat/images/icons/crystalsvg/16/button_cancel.png b/swat2/images/icons/crystalsvg/16/button_cancel.png
index 2415dfc78b..2415dfc78b 100644
--- a/swat/images/icons/crystalsvg/16/button_cancel.png
+++ b/swat2/images/icons/crystalsvg/16/button_cancel.png
diff --git a/swat/images/icons/crystalsvg/16/button_ok.png b/swat2/images/icons/crystalsvg/16/button_ok.png
index 543710fb7b..543710fb7b 100644
--- a/swat/images/icons/crystalsvg/16/button_ok.png
+++ b/swat2/images/icons/crystalsvg/16/button_ok.png
diff --git a/swat/images/icons/crystalsvg/16/cache.png b/swat2/images/icons/crystalsvg/16/cache.png
index 9d3f243aba..9d3f243aba 100644
--- a/swat/images/icons/crystalsvg/16/cache.png
+++ b/swat2/images/icons/crystalsvg/16/cache.png
diff --git a/swat/images/icons/crystalsvg/16/clock.png b/swat2/images/icons/crystalsvg/16/clock.png
index dca2c7ef85..dca2c7ef85 100644
--- a/swat/images/icons/crystalsvg/16/clock.png
+++ b/swat2/images/icons/crystalsvg/16/clock.png
diff --git a/swat/images/icons/crystalsvg/16/colorize.png b/swat2/images/icons/crystalsvg/16/colorize.png
index 9612cd5233..9612cd5233 100644
--- a/swat/images/icons/crystalsvg/16/colorize.png
+++ b/swat2/images/icons/crystalsvg/16/colorize.png
diff --git a/swat/images/icons/crystalsvg/16/colors.png b/swat2/images/icons/crystalsvg/16/colors.png
index c0a67bb903..c0a67bb903 100644
--- a/swat/images/icons/crystalsvg/16/colors.png
+++ b/swat2/images/icons/crystalsvg/16/colors.png
diff --git a/swat/images/icons/crystalsvg/16/colorset.png b/swat2/images/icons/crystalsvg/16/colorset.png
index 1c2b54f546..1c2b54f546 100644
--- a/swat/images/icons/crystalsvg/16/colorset.png
+++ b/swat2/images/icons/crystalsvg/16/colorset.png
diff --git a/swat/images/icons/crystalsvg/16/configure.png b/swat2/images/icons/crystalsvg/16/configure.png
index 95bd319ce1..95bd319ce1 100644
--- a/swat/images/icons/crystalsvg/16/configure.png
+++ b/swat2/images/icons/crystalsvg/16/configure.png
diff --git a/swat/images/icons/crystalsvg/16/contents.png b/swat2/images/icons/crystalsvg/16/contents.png
index e2a44ecae8..e2a44ecae8 100644
--- a/swat/images/icons/crystalsvg/16/contents.png
+++ b/swat2/images/icons/crystalsvg/16/contents.png
diff --git a/swat/images/icons/crystalsvg/16/cookie.png b/swat2/images/icons/crystalsvg/16/cookie.png
index 5ebe2e3564..5ebe2e3564 100644
--- a/swat/images/icons/crystalsvg/16/cookie.png
+++ b/swat2/images/icons/crystalsvg/16/cookie.png
diff --git a/swat/images/icons/crystalsvg/16/core.png b/swat2/images/icons/crystalsvg/16/core.png
index 7bc1bcdb51..7bc1bcdb51 100644
--- a/swat/images/icons/crystalsvg/16/core.png
+++ b/swat2/images/icons/crystalsvg/16/core.png
diff --git a/swat/images/icons/crystalsvg/16/date.png b/swat2/images/icons/crystalsvg/16/date.png
index fbf29f5219..fbf29f5219 100644
--- a/swat/images/icons/crystalsvg/16/date.png
+++ b/swat2/images/icons/crystalsvg/16/date.png
diff --git a/swat/images/icons/crystalsvg/16/decrypted.png b/swat2/images/icons/crystalsvg/16/decrypted.png
index 3a1a0d34ef..3a1a0d34ef 100644
--- a/swat/images/icons/crystalsvg/16/decrypted.png
+++ b/swat2/images/icons/crystalsvg/16/decrypted.png
diff --git a/swat/images/icons/crystalsvg/16/desktop.png b/swat2/images/icons/crystalsvg/16/desktop.png
index 883d92df16..883d92df16 100644
--- a/swat/images/icons/crystalsvg/16/desktop.png
+++ b/swat2/images/icons/crystalsvg/16/desktop.png
diff --git a/swat/images/icons/crystalsvg/16/display.png b/swat2/images/icons/crystalsvg/16/display.png
index 2e228bd7a4..2e228bd7a4 100644
--- a/swat/images/icons/crystalsvg/16/display.png
+++ b/swat2/images/icons/crystalsvg/16/display.png
diff --git a/swat/images/icons/crystalsvg/16/doc.png b/swat2/images/icons/crystalsvg/16/doc.png
index 870f1abaa5..870f1abaa5 100644
--- a/swat/images/icons/crystalsvg/16/doc.png
+++ b/swat2/images/icons/crystalsvg/16/doc.png
diff --git a/swat/images/icons/crystalsvg/16/document.png b/swat2/images/icons/crystalsvg/16/document.png
index 1930fb233f..1930fb233f 100644
--- a/swat/images/icons/crystalsvg/16/document.png
+++ b/swat2/images/icons/crystalsvg/16/document.png
diff --git a/swat/images/icons/crystalsvg/16/down.png b/swat2/images/icons/crystalsvg/16/down.png
index 4249bde45b..4249bde45b 100644
--- a/swat/images/icons/crystalsvg/16/down.png
+++ b/swat2/images/icons/crystalsvg/16/down.png
diff --git a/swat/images/icons/crystalsvg/16/edit.png b/swat2/images/icons/crystalsvg/16/edit.png
index a8b69f73fe..a8b69f73fe 100644
--- a/swat/images/icons/crystalsvg/16/edit.png
+++ b/swat2/images/icons/crystalsvg/16/edit.png
diff --git a/swat/images/icons/crystalsvg/16/editcopy.png b/swat2/images/icons/crystalsvg/16/editcopy.png
index c3ff243b85..c3ff243b85 100644
--- a/swat/images/icons/crystalsvg/16/editcopy.png
+++ b/swat2/images/icons/crystalsvg/16/editcopy.png
diff --git a/swat/images/icons/crystalsvg/16/editcut.png b/swat2/images/icons/crystalsvg/16/editcut.png
index 2232854368..2232854368 100644
--- a/swat/images/icons/crystalsvg/16/editcut.png
+++ b/swat2/images/icons/crystalsvg/16/editcut.png
diff --git a/swat/images/icons/crystalsvg/16/editdelete.png b/swat2/images/icons/crystalsvg/16/editdelete.png
index 6d0d29d760..6d0d29d760 100644
--- a/swat/images/icons/crystalsvg/16/editdelete.png
+++ b/swat2/images/icons/crystalsvg/16/editdelete.png
diff --git a/swat/images/icons/crystalsvg/16/editpaste.png b/swat2/images/icons/crystalsvg/16/editpaste.png
index 636a4c5a0b..636a4c5a0b 100644
--- a/swat/images/icons/crystalsvg/16/editpaste.png
+++ b/swat2/images/icons/crystalsvg/16/editpaste.png
diff --git a/swat/images/icons/crystalsvg/16/edittrash.png b/swat2/images/icons/crystalsvg/16/edittrash.png
index bfceb88d60..bfceb88d60 100644
--- a/swat/images/icons/crystalsvg/16/edittrash.png
+++ b/swat2/images/icons/crystalsvg/16/edittrash.png
diff --git a/swat/images/icons/crystalsvg/16/email.png b/swat2/images/icons/crystalsvg/16/email.png
index 387ed18e68..387ed18e68 100644
--- a/swat/images/icons/crystalsvg/16/email.png
+++ b/swat2/images/icons/crystalsvg/16/email.png
diff --git a/swat/images/icons/crystalsvg/16/empty.png b/swat2/images/icons/crystalsvg/16/empty.png
index f68776b977..f68776b977 100644
--- a/swat/images/icons/crystalsvg/16/empty.png
+++ b/swat2/images/icons/crystalsvg/16/empty.png
diff --git a/swat/images/icons/crystalsvg/16/empty_ascii.png b/swat2/images/icons/crystalsvg/16/empty_ascii.png
index 4039a2e628..4039a2e628 100644
--- a/swat/images/icons/crystalsvg/16/empty_ascii.png
+++ b/swat2/images/icons/crystalsvg/16/empty_ascii.png
diff --git a/swat/images/icons/crystalsvg/16/encrypted.png b/swat2/images/icons/crystalsvg/16/encrypted.png
index f498798e93..f498798e93 100644
--- a/swat/images/icons/crystalsvg/16/encrypted.png
+++ b/swat2/images/icons/crystalsvg/16/encrypted.png
diff --git a/swat/images/icons/crystalsvg/16/energy.png b/swat2/images/icons/crystalsvg/16/energy.png
index df22fd8d97..df22fd8d97 100644
--- a/swat/images/icons/crystalsvg/16/energy.png
+++ b/swat2/images/icons/crystalsvg/16/energy.png
diff --git a/swat/images/icons/crystalsvg/16/error.png b/swat2/images/icons/crystalsvg/16/error.png
index 9152973b92..9152973b92 100644
--- a/swat/images/icons/crystalsvg/16/error.png
+++ b/swat2/images/icons/crystalsvg/16/error.png
diff --git a/swat/images/icons/crystalsvg/16/exec.png b/swat2/images/icons/crystalsvg/16/exec.png
index bc00f51a16..bc00f51a16 100644
--- a/swat/images/icons/crystalsvg/16/exec.png
+++ b/swat2/images/icons/crystalsvg/16/exec.png
diff --git a/swat/images/icons/crystalsvg/16/favorites.png b/swat2/images/icons/crystalsvg/16/favorites.png
index 6a3fc5efe7..6a3fc5efe7 100644
--- a/swat/images/icons/crystalsvg/16/favorites.png
+++ b/swat2/images/icons/crystalsvg/16/favorites.png
diff --git a/swat/images/icons/crystalsvg/16/filefind.png b/swat2/images/icons/crystalsvg/16/filefind.png
index 3978d1e7be..3978d1e7be 100644
--- a/swat/images/icons/crystalsvg/16/filefind.png
+++ b/swat2/images/icons/crystalsvg/16/filefind.png
diff --git a/swat/images/icons/crystalsvg/16/filenew.png b/swat2/images/icons/crystalsvg/16/filenew.png
index 83f375218c..83f375218c 100644
--- a/swat/images/icons/crystalsvg/16/filenew.png
+++ b/swat2/images/icons/crystalsvg/16/filenew.png
diff --git a/swat/images/icons/crystalsvg/16/fileopen.png b/swat2/images/icons/crystalsvg/16/fileopen.png
index 037c2da98d..037c2da98d 100644
--- a/swat/images/icons/crystalsvg/16/fileopen.png
+++ b/swat2/images/icons/crystalsvg/16/fileopen.png
diff --git a/swat/images/icons/crystalsvg/16/fileprint.png b/swat2/images/icons/crystalsvg/16/fileprint.png
index 471448fcae..471448fcae 100644
--- a/swat/images/icons/crystalsvg/16/fileprint.png
+++ b/swat2/images/icons/crystalsvg/16/fileprint.png
diff --git a/swat/images/icons/crystalsvg/16/filesave.png b/swat2/images/icons/crystalsvg/16/filesave.png
index 41b3f43679..41b3f43679 100644
--- a/swat/images/icons/crystalsvg/16/filesave.png
+++ b/swat2/images/icons/crystalsvg/16/filesave.png
diff --git a/swat/images/icons/crystalsvg/16/filesaveas.png b/swat2/images/icons/crystalsvg/16/filesaveas.png
index 3e28d5d359..3e28d5d359 100644
--- a/swat/images/icons/crystalsvg/16/filesaveas.png
+++ b/swat2/images/icons/crystalsvg/16/filesaveas.png
diff --git a/swat/images/icons/crystalsvg/16/find.png b/swat2/images/icons/crystalsvg/16/find.png
index 416d064595..416d064595 100644
--- a/swat/images/icons/crystalsvg/16/find.png
+++ b/swat2/images/icons/crystalsvg/16/find.png
diff --git a/swat/images/icons/crystalsvg/16/folder.png b/swat2/images/icons/crystalsvg/16/folder.png
index 02325a0012..02325a0012 100644
--- a/swat/images/icons/crystalsvg/16/folder.png
+++ b/swat2/images/icons/crystalsvg/16/folder.png
diff --git a/swat/images/icons/crystalsvg/16/folder_home.png b/swat2/images/icons/crystalsvg/16/folder_home.png
index 3d26af5529..3d26af5529 100644
--- a/swat/images/icons/crystalsvg/16/folder_home.png
+++ b/swat2/images/icons/crystalsvg/16/folder_home.png
diff --git a/swat/images/icons/crystalsvg/16/folder_important.png b/swat2/images/icons/crystalsvg/16/folder_important.png
index d89fd1d2f0..d89fd1d2f0 100644
--- a/swat/images/icons/crystalsvg/16/folder_important.png
+++ b/swat2/images/icons/crystalsvg/16/folder_important.png
diff --git a/swat/images/icons/crystalsvg/16/folder_locked.png b/swat2/images/icons/crystalsvg/16/folder_locked.png
index a679e79766..a679e79766 100644
--- a/swat/images/icons/crystalsvg/16/folder_locked.png
+++ b/swat2/images/icons/crystalsvg/16/folder_locked.png
diff --git a/swat/images/icons/crystalsvg/16/folder_open.png b/swat2/images/icons/crystalsvg/16/folder_open.png
index 4b545f3e34..4b545f3e34 100644
--- a/swat/images/icons/crystalsvg/16/folder_open.png
+++ b/swat2/images/icons/crystalsvg/16/folder_open.png
diff --git a/swat/images/icons/crystalsvg/16/font.png b/swat2/images/icons/crystalsvg/16/font.png
index 2e788c25d9..2e788c25d9 100644
--- a/swat/images/icons/crystalsvg/16/font.png
+++ b/swat2/images/icons/crystalsvg/16/font.png
diff --git a/swat/images/icons/crystalsvg/16/forward.png b/swat2/images/icons/crystalsvg/16/forward.png
index 4a2a215c86..4a2a215c86 100644
--- a/swat/images/icons/crystalsvg/16/forward.png
+++ b/swat2/images/icons/crystalsvg/16/forward.png
diff --git a/swat/images/icons/crystalsvg/16/gohome.png b/swat2/images/icons/crystalsvg/16/gohome.png
index 3d26af5529..3d26af5529 100644
--- a/swat/images/icons/crystalsvg/16/gohome.png
+++ b/swat2/images/icons/crystalsvg/16/gohome.png
diff --git a/swat/images/icons/crystalsvg/16/help.png b/swat2/images/icons/crystalsvg/16/help.png
index b580f51ed4..b580f51ed4 100644
--- a/swat/images/icons/crystalsvg/16/help.png
+++ b/swat2/images/icons/crystalsvg/16/help.png
diff --git a/swat/images/icons/crystalsvg/16/history.png b/swat2/images/icons/crystalsvg/16/history.png
index 1de43d56b0..1de43d56b0 100644
--- a/swat/images/icons/crystalsvg/16/history.png
+++ b/swat2/images/icons/crystalsvg/16/history.png
diff --git a/swat/images/icons/crystalsvg/16/hwinfo.png b/swat2/images/icons/crystalsvg/16/hwinfo.png
index b8e4f32006..b8e4f32006 100644
--- a/swat/images/icons/crystalsvg/16/hwinfo.png
+++ b/swat2/images/icons/crystalsvg/16/hwinfo.png
diff --git a/swat/images/icons/crystalsvg/16/icons.png b/swat2/images/icons/crystalsvg/16/icons.png
index 10d2a2d636..10d2a2d636 100644
--- a/swat/images/icons/crystalsvg/16/icons.png
+++ b/swat2/images/icons/crystalsvg/16/icons.png
diff --git a/swat/images/icons/crystalsvg/16/iconthemes.png b/swat2/images/icons/crystalsvg/16/iconthemes.png
index 4a90815645..4a90815645 100644
--- a/swat/images/icons/crystalsvg/16/iconthemes.png
+++ b/swat2/images/icons/crystalsvg/16/iconthemes.png
diff --git a/swat/images/icons/crystalsvg/16/idea.png b/swat2/images/icons/crystalsvg/16/idea.png
index 8d72794dd0..8d72794dd0 100644
--- a/swat/images/icons/crystalsvg/16/idea.png
+++ b/swat2/images/icons/crystalsvg/16/idea.png
diff --git a/swat/images/icons/crystalsvg/16/important.png b/swat2/images/icons/crystalsvg/16/important.png
index 64d07f3912..64d07f3912 100644
--- a/swat/images/icons/crystalsvg/16/important.png
+++ b/swat2/images/icons/crystalsvg/16/important.png
diff --git a/swat/images/icons/crystalsvg/16/info.png b/swat2/images/icons/crystalsvg/16/info.png
index 1903fabccd..1903fabccd 100644
--- a/swat/images/icons/crystalsvg/16/info.png
+++ b/swat2/images/icons/crystalsvg/16/info.png
diff --git a/swat/images/icons/crystalsvg/16/kcoloredit.png b/swat2/images/icons/crystalsvg/16/kcoloredit.png
index c0a67bb903..c0a67bb903 100644
--- a/swat/images/icons/crystalsvg/16/kcoloredit.png
+++ b/swat2/images/icons/crystalsvg/16/kcoloredit.png
diff --git a/swat/images/icons/crystalsvg/16/kcontrol.png b/swat2/images/icons/crystalsvg/16/kcontrol.png
index 64bf8b71db..64bf8b71db 100644
--- a/swat/images/icons/crystalsvg/16/kcontrol.png
+++ b/swat2/images/icons/crystalsvg/16/kcontrol.png
diff --git a/swat/images/icons/crystalsvg/16/key_enter.png b/swat2/images/icons/crystalsvg/16/key_enter.png
index cc4ead9bf4..cc4ead9bf4 100644
--- a/swat/images/icons/crystalsvg/16/key_enter.png
+++ b/swat2/images/icons/crystalsvg/16/key_enter.png
diff --git a/swat/images/icons/crystalsvg/16/keyboard.png b/swat2/images/icons/crystalsvg/16/keyboard.png
index 198d20221c..198d20221c 100644
--- a/swat/images/icons/crystalsvg/16/keyboard.png
+++ b/swat2/images/icons/crystalsvg/16/keyboard.png
diff --git a/swat/images/icons/crystalsvg/16/khelpcenter.png b/swat2/images/icons/crystalsvg/16/khelpcenter.png
index d155536c56..d155536c56 100644
--- a/swat/images/icons/crystalsvg/16/khelpcenter.png
+++ b/swat2/images/icons/crystalsvg/16/khelpcenter.png
diff --git a/swat/images/icons/crystalsvg/16/kmix.png b/swat2/images/icons/crystalsvg/16/kmix.png
index dbf51d2039..dbf51d2039 100644
--- a/swat/images/icons/crystalsvg/16/kmix.png
+++ b/swat2/images/icons/crystalsvg/16/kmix.png
diff --git a/swat/images/icons/crystalsvg/16/knotify.png b/swat2/images/icons/crystalsvg/16/knotify.png
index a893d62293..a893d62293 100644
--- a/swat/images/icons/crystalsvg/16/knotify.png
+++ b/swat2/images/icons/crystalsvg/16/knotify.png
diff --git a/swat/images/icons/crystalsvg/16/konqueror.png b/swat2/images/icons/crystalsvg/16/konqueror.png
index 69344cd831..69344cd831 100644
--- a/swat/images/icons/crystalsvg/16/konqueror.png
+++ b/swat2/images/icons/crystalsvg/16/konqueror.png
diff --git a/swat/images/icons/crystalsvg/16/kpackage.png b/swat2/images/icons/crystalsvg/16/kpackage.png
index a69df614f9..a69df614f9 100644
--- a/swat/images/icons/crystalsvg/16/kpackage.png
+++ b/swat2/images/icons/crystalsvg/16/kpackage.png
diff --git a/swat/images/icons/crystalsvg/16/kpaint.png b/swat2/images/icons/crystalsvg/16/kpaint.png
index 92039e4f17..92039e4f17 100644
--- a/swat/images/icons/crystalsvg/16/kpaint.png
+++ b/swat2/images/icons/crystalsvg/16/kpaint.png
diff --git a/swat/images/icons/crystalsvg/16/kpersonalizer.png b/swat2/images/icons/crystalsvg/16/kpersonalizer.png
index 86186d7959..86186d7959 100644
--- a/swat/images/icons/crystalsvg/16/kpersonalizer.png
+++ b/swat2/images/icons/crystalsvg/16/kpersonalizer.png
diff --git a/swat/images/icons/crystalsvg/16/krita.png b/swat2/images/icons/crystalsvg/16/krita.png
index 6563434c34..6563434c34 100644
--- a/swat/images/icons/crystalsvg/16/krita.png
+++ b/swat2/images/icons/crystalsvg/16/krita.png
diff --git a/swat/images/icons/crystalsvg/16/ksmiletris.png b/swat2/images/icons/crystalsvg/16/ksmiletris.png
index c088395823..c088395823 100644
--- a/swat/images/icons/crystalsvg/16/ksmiletris.png
+++ b/swat2/images/icons/crystalsvg/16/ksmiletris.png
diff --git a/swat/images/icons/crystalsvg/16/ksnapshot.png b/swat2/images/icons/crystalsvg/16/ksnapshot.png
index 79743e8298..79743e8298 100644
--- a/swat/images/icons/crystalsvg/16/ksnapshot.png
+++ b/swat2/images/icons/crystalsvg/16/ksnapshot.png
diff --git a/swat/images/icons/crystalsvg/16/ktalkd.png b/swat2/images/icons/crystalsvg/16/ktalkd.png
index fd36501c33..fd36501c33 100644
--- a/swat/images/icons/crystalsvg/16/ktalkd.png
+++ b/swat2/images/icons/crystalsvg/16/ktalkd.png
diff --git a/swat/images/icons/crystalsvg/16/ktip.png b/swat2/images/icons/crystalsvg/16/ktip.png
index 2b206f2a40..2b206f2a40 100644
--- a/swat/images/icons/crystalsvg/16/ktip.png
+++ b/swat2/images/icons/crystalsvg/16/ktip.png
diff --git a/swat/images/icons/crystalsvg/16/kuser.png b/swat2/images/icons/crystalsvg/16/kuser.png
index 8f69e2b998..8f69e2b998 100644
--- a/swat/images/icons/crystalsvg/16/kuser.png
+++ b/swat2/images/icons/crystalsvg/16/kuser.png
diff --git a/swat/images/icons/crystalsvg/16/kview.png b/swat2/images/icons/crystalsvg/16/kview.png
index b5f17a31f7..b5f17a31f7 100644
--- a/swat/images/icons/crystalsvg/16/kview.png
+++ b/swat2/images/icons/crystalsvg/16/kview.png
diff --git a/swat/images/icons/crystalsvg/16/launch.png b/swat2/images/icons/crystalsvg/16/launch.png
index 838c38bf13..838c38bf13 100644
--- a/swat/images/icons/crystalsvg/16/launch.png
+++ b/swat2/images/icons/crystalsvg/16/launch.png
diff --git a/swat/images/icons/crystalsvg/16/linuxconf.png b/swat2/images/icons/crystalsvg/16/linuxconf.png
index 9a420444c4..9a420444c4 100644
--- a/swat/images/icons/crystalsvg/16/linuxconf.png
+++ b/swat2/images/icons/crystalsvg/16/linuxconf.png
diff --git a/swat/images/icons/crystalsvg/16/locale.png b/swat2/images/icons/crystalsvg/16/locale.png
index 0dfece4d3f..0dfece4d3f 100644
--- a/swat/images/icons/crystalsvg/16/locale.png
+++ b/swat2/images/icons/crystalsvg/16/locale.png
diff --git a/swat/images/icons/crystalsvg/16/looknfeel.png b/swat2/images/icons/crystalsvg/16/looknfeel.png
index fb4181004d..fb4181004d 100644
--- a/swat/images/icons/crystalsvg/16/looknfeel.png
+++ b/swat2/images/icons/crystalsvg/16/looknfeel.png
diff --git a/swat/images/icons/crystalsvg/16/mac.png b/swat2/images/icons/crystalsvg/16/mac.png
index 23e7e7221b..23e7e7221b 100644
--- a/swat/images/icons/crystalsvg/16/mac.png
+++ b/swat2/images/icons/crystalsvg/16/mac.png
diff --git a/swat/images/icons/crystalsvg/16/mail.png b/swat2/images/icons/crystalsvg/16/mail.png
index b3c2974499..b3c2974499 100644
--- a/swat/images/icons/crystalsvg/16/mail.png
+++ b/swat2/images/icons/crystalsvg/16/mail.png
diff --git a/swat/images/icons/crystalsvg/16/mail_delete.png b/swat2/images/icons/crystalsvg/16/mail_delete.png
index 65c7422aaa..65c7422aaa 100644
--- a/swat/images/icons/crystalsvg/16/mail_delete.png
+++ b/swat2/images/icons/crystalsvg/16/mail_delete.png
diff --git a/swat/images/icons/crystalsvg/16/mail_find.png b/swat2/images/icons/crystalsvg/16/mail_find.png
index 81417be487..81417be487 100644
--- a/swat/images/icons/crystalsvg/16/mail_find.png
+++ b/swat2/images/icons/crystalsvg/16/mail_find.png
diff --git a/swat/images/icons/crystalsvg/16/mail_forward.png b/swat2/images/icons/crystalsvg/16/mail_forward.png
index 150b624019..150b624019 100644
--- a/swat/images/icons/crystalsvg/16/mail_forward.png
+++ b/swat2/images/icons/crystalsvg/16/mail_forward.png
diff --git a/swat/images/icons/crystalsvg/16/mail_generic.png b/swat2/images/icons/crystalsvg/16/mail_generic.png
index cf7160ab42..cf7160ab42 100644
--- a/swat/images/icons/crystalsvg/16/mail_generic.png
+++ b/swat2/images/icons/crystalsvg/16/mail_generic.png
diff --git a/swat/images/icons/crystalsvg/16/mail_new.png b/swat2/images/icons/crystalsvg/16/mail_new.png
index c388644721..c388644721 100644
--- a/swat/images/icons/crystalsvg/16/mail_new.png
+++ b/swat2/images/icons/crystalsvg/16/mail_new.png
diff --git a/swat/images/icons/crystalsvg/16/mail_replay.png b/swat2/images/icons/crystalsvg/16/mail_replay.png
index af0b3b3e19..af0b3b3e19 100644
--- a/swat/images/icons/crystalsvg/16/mail_replay.png
+++ b/swat2/images/icons/crystalsvg/16/mail_replay.png
diff --git a/swat/images/icons/crystalsvg/16/mail_replyall.png b/swat2/images/icons/crystalsvg/16/mail_replyall.png
index 8a3ae557ad..8a3ae557ad 100644
--- a/swat/images/icons/crystalsvg/16/mail_replyall.png
+++ b/swat2/images/icons/crystalsvg/16/mail_replyall.png
diff --git a/swat/images/icons/crystalsvg/16/mail_send.png b/swat2/images/icons/crystalsvg/16/mail_send.png
index d96b1ec06f..d96b1ec06f 100644
--- a/swat/images/icons/crystalsvg/16/mail_send.png
+++ b/swat2/images/icons/crystalsvg/16/mail_send.png
diff --git a/swat/images/icons/crystalsvg/16/mimetypes.png b/swat2/images/icons/crystalsvg/16/mimetypes.png
index 623417d052..623417d052 100644
--- a/swat/images/icons/crystalsvg/16/mimetypes.png
+++ b/swat2/images/icons/crystalsvg/16/mimetypes.png
diff --git a/swat/images/icons/crystalsvg/16/misc.png b/swat2/images/icons/crystalsvg/16/misc.png
index 215fc6aa92..215fc6aa92 100644
--- a/swat/images/icons/crystalsvg/16/misc.png
+++ b/swat2/images/icons/crystalsvg/16/misc.png
diff --git a/swat/images/icons/crystalsvg/16/mouse.png b/swat2/images/icons/crystalsvg/16/mouse.png
index 3c0d31df22..3c0d31df22 100644
--- a/swat/images/icons/crystalsvg/16/mouse.png
+++ b/swat2/images/icons/crystalsvg/16/mouse.png
diff --git a/swat/images/icons/crystalsvg/16/mousecursor.png b/swat2/images/icons/crystalsvg/16/mousecursor.png
index c0aa32285f..c0aa32285f 100644
--- a/swat/images/icons/crystalsvg/16/mousecursor.png
+++ b/swat2/images/icons/crystalsvg/16/mousecursor.png
diff --git a/swat/images/icons/crystalsvg/16/mozilla.png b/swat2/images/icons/crystalsvg/16/mozilla.png
index b3ae537e84..b3ae537e84 100644
--- a/swat/images/icons/crystalsvg/16/mozilla.png
+++ b/swat2/images/icons/crystalsvg/16/mozilla.png
diff --git a/swat/images/icons/crystalsvg/16/mycomputer.png b/swat2/images/icons/crystalsvg/16/mycomputer.png
index c399a2f00f..c399a2f00f 100644
--- a/swat/images/icons/crystalsvg/16/mycomputer.png
+++ b/swat2/images/icons/crystalsvg/16/mycomputer.png
diff --git a/swat/images/icons/crystalsvg/16/mymac.png b/swat2/images/icons/crystalsvg/16/mymac.png
index 35d365829f..35d365829f 100644
--- a/swat/images/icons/crystalsvg/16/mymac.png
+++ b/swat2/images/icons/crystalsvg/16/mymac.png
diff --git a/swat/images/icons/crystalsvg/16/netscape.png b/swat2/images/icons/crystalsvg/16/netscape.png
index e36f58e695..e36f58e695 100644
--- a/swat/images/icons/crystalsvg/16/netscape.png
+++ b/swat2/images/icons/crystalsvg/16/netscape.png
diff --git a/swat/images/icons/crystalsvg/16/network.png b/swat2/images/icons/crystalsvg/16/network.png
index ebfc6c3247..ebfc6c3247 100644
--- a/swat/images/icons/crystalsvg/16/network.png
+++ b/swat2/images/icons/crystalsvg/16/network.png
diff --git a/swat/images/icons/crystalsvg/16/no.png b/swat2/images/icons/crystalsvg/16/no.png
index 1cabc6e95d..1cabc6e95d 100644
--- a/swat/images/icons/crystalsvg/16/no.png
+++ b/swat2/images/icons/crystalsvg/16/no.png
diff --git a/swat/images/icons/crystalsvg/16/ok.png b/swat2/images/icons/crystalsvg/16/ok.png
index 543710fb7b..543710fb7b 100644
--- a/swat/images/icons/crystalsvg/16/ok.png
+++ b/swat2/images/icons/crystalsvg/16/ok.png
diff --git a/swat/images/icons/crystalsvg/16/opera.png b/swat2/images/icons/crystalsvg/16/opera.png
index 4694c2bcad..4694c2bcad 100644
--- a/swat/images/icons/crystalsvg/16/opera.png
+++ b/swat2/images/icons/crystalsvg/16/opera.png
diff --git a/swat/images/icons/crystalsvg/16/package.png b/swat2/images/icons/crystalsvg/16/package.png
index 03483d7bbd..03483d7bbd 100644
--- a/swat/images/icons/crystalsvg/16/package.png
+++ b/swat2/images/icons/crystalsvg/16/package.png
diff --git a/swat/images/icons/crystalsvg/16/password.png b/swat2/images/icons/crystalsvg/16/password.png
index ca93f0d149..ca93f0d149 100644
--- a/swat/images/icons/crystalsvg/16/password.png
+++ b/swat2/images/icons/crystalsvg/16/password.png
diff --git a/swat/images/icons/crystalsvg/16/penguin.png b/swat2/images/icons/crystalsvg/16/penguin.png
index a0a9743f53..a0a9743f53 100644
--- a/swat/images/icons/crystalsvg/16/penguin.png
+++ b/swat2/images/icons/crystalsvg/16/penguin.png
diff --git a/swat/images/icons/crystalsvg/16/pipe.png b/swat2/images/icons/crystalsvg/16/pipe.png
index 5f4d840c39..5f4d840c39 100644
--- a/swat/images/icons/crystalsvg/16/pipe.png
+++ b/swat2/images/icons/crystalsvg/16/pipe.png
diff --git a/swat/images/icons/crystalsvg/16/printer.png b/swat2/images/icons/crystalsvg/16/printer.png
index 2fa62c335c..2fa62c335c 100644
--- a/swat/images/icons/crystalsvg/16/printer.png
+++ b/swat2/images/icons/crystalsvg/16/printer.png
diff --git a/swat/images/icons/crystalsvg/16/proxy.png b/swat2/images/icons/crystalsvg/16/proxy.png
index 69f8bb745b..69f8bb745b 100644
--- a/swat/images/icons/crystalsvg/16/proxy.png
+++ b/swat2/images/icons/crystalsvg/16/proxy.png
diff --git a/swat/images/icons/crystalsvg/16/quicktime.png b/swat2/images/icons/crystalsvg/16/quicktime.png
index de7b762d86..de7b762d86 100644
--- a/swat/images/icons/crystalsvg/16/quicktime.png
+++ b/swat2/images/icons/crystalsvg/16/quicktime.png
diff --git a/swat/images/icons/crystalsvg/16/realplayer.png b/swat2/images/icons/crystalsvg/16/realplayer.png
index afa6392fe5..afa6392fe5 100644
--- a/swat/images/icons/crystalsvg/16/realplayer.png
+++ b/swat2/images/icons/crystalsvg/16/realplayer.png
diff --git a/swat/images/icons/crystalsvg/16/redo.png b/swat2/images/icons/crystalsvg/16/redo.png
index 5d6121b821..5d6121b821 100644
--- a/swat/images/icons/crystalsvg/16/redo.png
+++ b/swat2/images/icons/crystalsvg/16/redo.png
diff --git a/swat/images/icons/crystalsvg/16/reload.png b/swat2/images/icons/crystalsvg/16/reload.png
index eb0388df4c..eb0388df4c 100644
--- a/swat/images/icons/crystalsvg/16/reload.png
+++ b/swat2/images/icons/crystalsvg/16/reload.png
diff --git a/swat/images/icons/crystalsvg/16/run.png b/swat2/images/icons/crystalsvg/16/run.png
index 215fc6aa92..215fc6aa92 100644
--- a/swat/images/icons/crystalsvg/16/run.png
+++ b/swat2/images/icons/crystalsvg/16/run.png
diff --git a/swat/images/icons/crystalsvg/16/search.png b/swat2/images/icons/crystalsvg/16/search.png
index 593a56634b..593a56634b 100644
--- a/swat/images/icons/crystalsvg/16/search.png
+++ b/swat2/images/icons/crystalsvg/16/search.png
diff --git a/swat/images/icons/crystalsvg/16/services.png b/swat2/images/icons/crystalsvg/16/services.png
index af009d9fa1..af009d9fa1 100644
--- a/swat/images/icons/crystalsvg/16/services.png
+++ b/swat2/images/icons/crystalsvg/16/services.png
diff --git a/swat/images/icons/crystalsvg/16/socket.png b/swat2/images/icons/crystalsvg/16/socket.png
index 7cfee72c6c..7cfee72c6c 100644
--- a/swat/images/icons/crystalsvg/16/socket.png
+++ b/swat2/images/icons/crystalsvg/16/socket.png
diff --git a/swat/images/icons/crystalsvg/16/spellcheck.png b/swat2/images/icons/crystalsvg/16/spellcheck.png
index dbb8aa6b85..dbb8aa6b85 100644
--- a/swat/images/icons/crystalsvg/16/spellcheck.png
+++ b/swat2/images/icons/crystalsvg/16/spellcheck.png
diff --git a/swat/images/icons/crystalsvg/16/stop.png b/swat2/images/icons/crystalsvg/16/stop.png
index 45c03d5d4d..45c03d5d4d 100644
--- a/swat/images/icons/crystalsvg/16/stop.png
+++ b/swat2/images/icons/crystalsvg/16/stop.png
diff --git a/swat/images/icons/crystalsvg/16/style.png b/swat2/images/icons/crystalsvg/16/style.png
index b727f8f609..b727f8f609 100644
--- a/swat/images/icons/crystalsvg/16/style.png
+++ b/swat2/images/icons/crystalsvg/16/style.png
diff --git a/swat/images/icons/crystalsvg/16/stylesheet.png b/swat2/images/icons/crystalsvg/16/stylesheet.png
index 63bbee69cf..63bbee69cf 100644
--- a/swat/images/icons/crystalsvg/16/stylesheet.png
+++ b/swat2/images/icons/crystalsvg/16/stylesheet.png
diff --git a/swat/images/icons/crystalsvg/16/tar.png b/swat2/images/icons/crystalsvg/16/tar.png
index f6416924b2..f6416924b2 100644
--- a/swat/images/icons/crystalsvg/16/tar.png
+++ b/swat2/images/icons/crystalsvg/16/tar.png
diff --git a/swat/images/icons/crystalsvg/16/thumbnail.png b/swat2/images/icons/crystalsvg/16/thumbnail.png
index a8c7195769..a8c7195769 100644
--- a/swat/images/icons/crystalsvg/16/thumbnail.png
+++ b/swat2/images/icons/crystalsvg/16/thumbnail.png
diff --git a/swat/images/icons/crystalsvg/16/todo.png b/swat2/images/icons/crystalsvg/16/todo.png
index b82a790f62..b82a790f62 100644
--- a/swat/images/icons/crystalsvg/16/todo.png
+++ b/swat2/images/icons/crystalsvg/16/todo.png
diff --git a/swat/images/icons/crystalsvg/16/tux.png b/swat2/images/icons/crystalsvg/16/tux.png
index 7b62ccecf0..7b62ccecf0 100644
--- a/swat/images/icons/crystalsvg/16/tux.png
+++ b/swat2/images/icons/crystalsvg/16/tux.png
diff --git a/swat/images/icons/crystalsvg/16/up.png b/swat2/images/icons/crystalsvg/16/up.png
index 0777b0b356..0777b0b356 100644
--- a/swat/images/icons/crystalsvg/16/up.png
+++ b/swat2/images/icons/crystalsvg/16/up.png
diff --git a/swat/images/icons/crystalsvg/16/wizard.png b/swat2/images/icons/crystalsvg/16/wizard.png
index 3107990dde..3107990dde 100644
--- a/swat/images/icons/crystalsvg/16/wizard.png
+++ b/swat2/images/icons/crystalsvg/16/wizard.png
diff --git a/swat/images/icons/crystalsvg/22/antivirus.png b/swat2/images/icons/crystalsvg/22/antivirus.png
index 4ac0c809d9..4ac0c809d9 100644
--- a/swat/images/icons/crystalsvg/22/antivirus.png
+++ b/swat2/images/icons/crystalsvg/22/antivirus.png
diff --git a/swat/images/icons/crystalsvg/22/appearance.png b/swat2/images/icons/crystalsvg/22/appearance.png
index 985147ddf1..985147ddf1 100644
--- a/swat/images/icons/crystalsvg/22/appearance.png
+++ b/swat2/images/icons/crystalsvg/22/appearance.png
diff --git a/swat/images/icons/crystalsvg/22/back.png b/swat2/images/icons/crystalsvg/22/back.png
index 4148ab8811..4148ab8811 100644
--- a/swat/images/icons/crystalsvg/22/back.png
+++ b/swat2/images/icons/crystalsvg/22/back.png
diff --git a/swat/images/icons/crystalsvg/22/background.png b/swat2/images/icons/crystalsvg/22/background.png
index 5ab7323ce9..5ab7323ce9 100644
--- a/swat/images/icons/crystalsvg/22/background.png
+++ b/swat2/images/icons/crystalsvg/22/background.png
diff --git a/swat/images/icons/crystalsvg/22/bell.png b/swat2/images/icons/crystalsvg/22/bell.png
index 3482bacce2..3482bacce2 100644
--- a/swat/images/icons/crystalsvg/22/bell.png
+++ b/swat2/images/icons/crystalsvg/22/bell.png
diff --git a/swat/images/icons/crystalsvg/22/blockdevice.png b/swat2/images/icons/crystalsvg/22/blockdevice.png
index c1330e8fc3..c1330e8fc3 100644
--- a/swat/images/icons/crystalsvg/22/blockdevice.png
+++ b/swat2/images/icons/crystalsvg/22/blockdevice.png
diff --git a/swat/images/icons/crystalsvg/22/bookmark.png b/swat2/images/icons/crystalsvg/22/bookmark.png
index ced954c97f..ced954c97f 100644
--- a/swat/images/icons/crystalsvg/22/bookmark.png
+++ b/swat2/images/icons/crystalsvg/22/bookmark.png
diff --git a/swat/images/icons/crystalsvg/22/browser.png b/swat2/images/icons/crystalsvg/22/browser.png
index 80a173d72c..80a173d72c 100644
--- a/swat/images/icons/crystalsvg/22/browser.png
+++ b/swat2/images/icons/crystalsvg/22/browser.png
diff --git a/swat/images/icons/crystalsvg/22/button_cancel.png b/swat2/images/icons/crystalsvg/22/button_cancel.png
index 96919575af..96919575af 100644
--- a/swat/images/icons/crystalsvg/22/button_cancel.png
+++ b/swat2/images/icons/crystalsvg/22/button_cancel.png
diff --git a/swat/images/icons/crystalsvg/22/button_ok.png b/swat2/images/icons/crystalsvg/22/button_ok.png
index 31c064ba92..31c064ba92 100644
--- a/swat/images/icons/crystalsvg/22/button_ok.png
+++ b/swat2/images/icons/crystalsvg/22/button_ok.png
diff --git a/swat/images/icons/crystalsvg/22/cache.png b/swat2/images/icons/crystalsvg/22/cache.png
index a9d0dd2813..a9d0dd2813 100644
--- a/swat/images/icons/crystalsvg/22/cache.png
+++ b/swat2/images/icons/crystalsvg/22/cache.png
diff --git a/swat/images/icons/crystalsvg/22/clock.png b/swat2/images/icons/crystalsvg/22/clock.png
index d1099336ea..d1099336ea 100644
--- a/swat/images/icons/crystalsvg/22/clock.png
+++ b/swat2/images/icons/crystalsvg/22/clock.png
diff --git a/swat/images/icons/crystalsvg/22/colorize.png b/swat2/images/icons/crystalsvg/22/colorize.png
index 985147ddf1..985147ddf1 100644
--- a/swat/images/icons/crystalsvg/22/colorize.png
+++ b/swat2/images/icons/crystalsvg/22/colorize.png
diff --git a/swat/images/icons/crystalsvg/22/colors.png b/swat2/images/icons/crystalsvg/22/colors.png
index a2fb946e86..a2fb946e86 100644
--- a/swat/images/icons/crystalsvg/22/colors.png
+++ b/swat2/images/icons/crystalsvg/22/colors.png
diff --git a/swat/images/icons/crystalsvg/22/configure.png b/swat2/images/icons/crystalsvg/22/configure.png
index 96ba4338f4..96ba4338f4 100644
--- a/swat/images/icons/crystalsvg/22/configure.png
+++ b/swat2/images/icons/crystalsvg/22/configure.png
diff --git a/swat/images/icons/crystalsvg/22/contents.png b/swat2/images/icons/crystalsvg/22/contents.png
index 7596e67a64..7596e67a64 100644
--- a/swat/images/icons/crystalsvg/22/contents.png
+++ b/swat2/images/icons/crystalsvg/22/contents.png
diff --git a/swat/images/icons/crystalsvg/22/core.png b/swat2/images/icons/crystalsvg/22/core.png
index b12540b6aa..b12540b6aa 100644
--- a/swat/images/icons/crystalsvg/22/core.png
+++ b/swat2/images/icons/crystalsvg/22/core.png
diff --git a/swat/images/icons/crystalsvg/22/date.png b/swat2/images/icons/crystalsvg/22/date.png
index 0e9f6815a7..0e9f6815a7 100644
--- a/swat/images/icons/crystalsvg/22/date.png
+++ b/swat2/images/icons/crystalsvg/22/date.png
diff --git a/swat/images/icons/crystalsvg/22/decrypted.png b/swat2/images/icons/crystalsvg/22/decrypted.png
index 2228639459..2228639459 100644
--- a/swat/images/icons/crystalsvg/22/decrypted.png
+++ b/swat2/images/icons/crystalsvg/22/decrypted.png
diff --git a/swat/images/icons/crystalsvg/22/desktop.png b/swat2/images/icons/crystalsvg/22/desktop.png
index 7a90fa1fa4..7a90fa1fa4 100644
--- a/swat/images/icons/crystalsvg/22/desktop.png
+++ b/swat2/images/icons/crystalsvg/22/desktop.png
diff --git a/swat/images/icons/crystalsvg/22/display.png b/swat2/images/icons/crystalsvg/22/display.png
index 4c8a28820d..4c8a28820d 100644
--- a/swat/images/icons/crystalsvg/22/display.png
+++ b/swat2/images/icons/crystalsvg/22/display.png
diff --git a/swat/images/icons/crystalsvg/22/document.png b/swat2/images/icons/crystalsvg/22/document.png
index 8901c3aa35..8901c3aa35 100644
--- a/swat/images/icons/crystalsvg/22/document.png
+++ b/swat2/images/icons/crystalsvg/22/document.png
diff --git a/swat/images/icons/crystalsvg/22/down.png b/swat2/images/icons/crystalsvg/22/down.png
index aeaa0c834b..aeaa0c834b 100644
--- a/swat/images/icons/crystalsvg/22/down.png
+++ b/swat2/images/icons/crystalsvg/22/down.png
diff --git a/swat/images/icons/crystalsvg/22/edit.png b/swat2/images/icons/crystalsvg/22/edit.png
index ce8b226710..ce8b226710 100644
--- a/swat/images/icons/crystalsvg/22/edit.png
+++ b/swat2/images/icons/crystalsvg/22/edit.png
diff --git a/swat/images/icons/crystalsvg/22/editcopy.png b/swat2/images/icons/crystalsvg/22/editcopy.png
index eac4d8c93b..eac4d8c93b 100644
--- a/swat/images/icons/crystalsvg/22/editcopy.png
+++ b/swat2/images/icons/crystalsvg/22/editcopy.png
diff --git a/swat/images/icons/crystalsvg/22/editcut.png b/swat2/images/icons/crystalsvg/22/editcut.png
index 192b5757a7..192b5757a7 100644
--- a/swat/images/icons/crystalsvg/22/editcut.png
+++ b/swat2/images/icons/crystalsvg/22/editcut.png
diff --git a/swat/images/icons/crystalsvg/22/editdelete.png b/swat2/images/icons/crystalsvg/22/editdelete.png
index 6fb193f061..6fb193f061 100644
--- a/swat/images/icons/crystalsvg/22/editdelete.png
+++ b/swat2/images/icons/crystalsvg/22/editdelete.png
diff --git a/swat/images/icons/crystalsvg/22/editpaste.png b/swat2/images/icons/crystalsvg/22/editpaste.png
index b8454f91da..b8454f91da 100644
--- a/swat/images/icons/crystalsvg/22/editpaste.png
+++ b/swat2/images/icons/crystalsvg/22/editpaste.png
diff --git a/swat/images/icons/crystalsvg/22/edittrash.png b/swat2/images/icons/crystalsvg/22/edittrash.png
index eea039dd5d..eea039dd5d 100644
--- a/swat/images/icons/crystalsvg/22/edittrash.png
+++ b/swat2/images/icons/crystalsvg/22/edittrash.png
diff --git a/swat/images/icons/crystalsvg/22/email.png b/swat2/images/icons/crystalsvg/22/email.png
index a21f68f259..a21f68f259 100644
--- a/swat/images/icons/crystalsvg/22/email.png
+++ b/swat2/images/icons/crystalsvg/22/email.png
diff --git a/swat/images/icons/crystalsvg/22/empty.png b/swat2/images/icons/crystalsvg/22/empty.png
index 1b149459e3..1b149459e3 100644
--- a/swat/images/icons/crystalsvg/22/empty.png
+++ b/swat2/images/icons/crystalsvg/22/empty.png
diff --git a/swat/images/icons/crystalsvg/22/encrypted.png b/swat2/images/icons/crystalsvg/22/encrypted.png
index 351df8709d..351df8709d 100644
--- a/swat/images/icons/crystalsvg/22/encrypted.png
+++ b/swat2/images/icons/crystalsvg/22/encrypted.png
diff --git a/swat/images/icons/crystalsvg/22/energy.png b/swat2/images/icons/crystalsvg/22/energy.png
index f70a153fa6..f70a153fa6 100644
--- a/swat/images/icons/crystalsvg/22/energy.png
+++ b/swat2/images/icons/crystalsvg/22/energy.png
diff --git a/swat/images/icons/crystalsvg/22/error.png b/swat2/images/icons/crystalsvg/22/error.png
index ddce82a94b..ddce82a94b 100644
--- a/swat/images/icons/crystalsvg/22/error.png
+++ b/swat2/images/icons/crystalsvg/22/error.png
diff --git a/swat/images/icons/crystalsvg/22/exec.png b/swat2/images/icons/crystalsvg/22/exec.png
index 8e3b5a9043..8e3b5a9043 100644
--- a/swat/images/icons/crystalsvg/22/exec.png
+++ b/swat2/images/icons/crystalsvg/22/exec.png
diff --git a/swat/images/icons/crystalsvg/22/filefind.png b/swat2/images/icons/crystalsvg/22/filefind.png
index 40762a0250..40762a0250 100644
--- a/swat/images/icons/crystalsvg/22/filefind.png
+++ b/swat2/images/icons/crystalsvg/22/filefind.png
diff --git a/swat/images/icons/crystalsvg/22/filenew.png b/swat2/images/icons/crystalsvg/22/filenew.png
index 7be37e89a7..7be37e89a7 100644
--- a/swat/images/icons/crystalsvg/22/filenew.png
+++ b/swat2/images/icons/crystalsvg/22/filenew.png
diff --git a/swat/images/icons/crystalsvg/22/fileopen.png b/swat2/images/icons/crystalsvg/22/fileopen.png
index a79982ea1f..a79982ea1f 100644
--- a/swat/images/icons/crystalsvg/22/fileopen.png
+++ b/swat2/images/icons/crystalsvg/22/fileopen.png
diff --git a/swat/images/icons/crystalsvg/22/fileprint.png b/swat2/images/icons/crystalsvg/22/fileprint.png
index ca4b80e19b..ca4b80e19b 100644
--- a/swat/images/icons/crystalsvg/22/fileprint.png
+++ b/swat2/images/icons/crystalsvg/22/fileprint.png
diff --git a/swat/images/icons/crystalsvg/22/filesave.png b/swat2/images/icons/crystalsvg/22/filesave.png
index f85b99afe1..f85b99afe1 100644
--- a/swat/images/icons/crystalsvg/22/filesave.png
+++ b/swat2/images/icons/crystalsvg/22/filesave.png
diff --git a/swat/images/icons/crystalsvg/22/filesaveas.png b/swat2/images/icons/crystalsvg/22/filesaveas.png
index 517fc2eac2..517fc2eac2 100644
--- a/swat/images/icons/crystalsvg/22/filesaveas.png
+++ b/swat2/images/icons/crystalsvg/22/filesaveas.png
diff --git a/swat/images/icons/crystalsvg/22/find.png b/swat2/images/icons/crystalsvg/22/find.png
index da3da6d625..da3da6d625 100644
--- a/swat/images/icons/crystalsvg/22/find.png
+++ b/swat2/images/icons/crystalsvg/22/find.png
diff --git a/swat/images/icons/crystalsvg/22/folder.png b/swat2/images/icons/crystalsvg/22/folder.png
index 33cc0bb90e..33cc0bb90e 100644
--- a/swat/images/icons/crystalsvg/22/folder.png
+++ b/swat2/images/icons/crystalsvg/22/folder.png
diff --git a/swat/images/icons/crystalsvg/22/folder_home.png b/swat2/images/icons/crystalsvg/22/folder_home.png
index 3afa803379..3afa803379 100644
--- a/swat/images/icons/crystalsvg/22/folder_home.png
+++ b/swat2/images/icons/crystalsvg/22/folder_home.png
diff --git a/swat/images/icons/crystalsvg/22/folder_important.png b/swat2/images/icons/crystalsvg/22/folder_important.png
index a24e1a00b0..a24e1a00b0 100644
--- a/swat/images/icons/crystalsvg/22/folder_important.png
+++ b/swat2/images/icons/crystalsvg/22/folder_important.png
diff --git a/swat/images/icons/crystalsvg/22/folder_locked.png b/swat2/images/icons/crystalsvg/22/folder_locked.png
index 9dc2e48a86..9dc2e48a86 100644
--- a/swat/images/icons/crystalsvg/22/folder_locked.png
+++ b/swat2/images/icons/crystalsvg/22/folder_locked.png
diff --git a/swat/images/icons/crystalsvg/22/folder_open.png b/swat2/images/icons/crystalsvg/22/folder_open.png
index b0534c4882..b0534c4882 100644
--- a/swat/images/icons/crystalsvg/22/folder_open.png
+++ b/swat2/images/icons/crystalsvg/22/folder_open.png
diff --git a/swat/images/icons/crystalsvg/22/font.png b/swat2/images/icons/crystalsvg/22/font.png
index 1ac93bcdcf..1ac93bcdcf 100644
--- a/swat/images/icons/crystalsvg/22/font.png
+++ b/swat2/images/icons/crystalsvg/22/font.png
diff --git a/swat/images/icons/crystalsvg/22/forward.png b/swat2/images/icons/crystalsvg/22/forward.png
index aa3ce7f578..aa3ce7f578 100644
--- a/swat/images/icons/crystalsvg/22/forward.png
+++ b/swat2/images/icons/crystalsvg/22/forward.png
diff --git a/swat/images/icons/crystalsvg/22/gohome.png b/swat2/images/icons/crystalsvg/22/gohome.png
index 14ee4846f3..14ee4846f3 100644
--- a/swat/images/icons/crystalsvg/22/gohome.png
+++ b/swat2/images/icons/crystalsvg/22/gohome.png
diff --git a/swat/images/icons/crystalsvg/22/help.png b/swat2/images/icons/crystalsvg/22/help.png
index 9fe7652669..9fe7652669 100644
--- a/swat/images/icons/crystalsvg/22/help.png
+++ b/swat2/images/icons/crystalsvg/22/help.png
diff --git a/swat/images/icons/crystalsvg/22/history.png b/swat2/images/icons/crystalsvg/22/history.png
index ea64540042..ea64540042 100644
--- a/swat/images/icons/crystalsvg/22/history.png
+++ b/swat2/images/icons/crystalsvg/22/history.png
diff --git a/swat/images/icons/crystalsvg/22/hwinfo.png b/swat2/images/icons/crystalsvg/22/hwinfo.png
index 8d0c3cf670..8d0c3cf670 100644
--- a/swat/images/icons/crystalsvg/22/hwinfo.png
+++ b/swat2/images/icons/crystalsvg/22/hwinfo.png
diff --git a/swat/images/icons/crystalsvg/22/idea.png b/swat2/images/icons/crystalsvg/22/idea.png
index d9e7d12e3b..d9e7d12e3b 100644
--- a/swat/images/icons/crystalsvg/22/idea.png
+++ b/swat2/images/icons/crystalsvg/22/idea.png
diff --git a/swat/images/icons/crystalsvg/22/info.png b/swat2/images/icons/crystalsvg/22/info.png
index 3626ba7ee6..3626ba7ee6 100644
--- a/swat/images/icons/crystalsvg/22/info.png
+++ b/swat2/images/icons/crystalsvg/22/info.png
diff --git a/swat/images/icons/crystalsvg/22/kcoloredit.png b/swat2/images/icons/crystalsvg/22/kcoloredit.png
index a2fb946e86..a2fb946e86 100644
--- a/swat/images/icons/crystalsvg/22/kcoloredit.png
+++ b/swat2/images/icons/crystalsvg/22/kcoloredit.png
diff --git a/swat/images/icons/crystalsvg/22/kcontrol.png b/swat2/images/icons/crystalsvg/22/kcontrol.png
index 28a7199dea..28a7199dea 100644
--- a/swat/images/icons/crystalsvg/22/kcontrol.png
+++ b/swat2/images/icons/crystalsvg/22/kcontrol.png
diff --git a/swat/images/icons/crystalsvg/22/keyboard.png b/swat2/images/icons/crystalsvg/22/keyboard.png
index 637ed8609f..637ed8609f 100644
--- a/swat/images/icons/crystalsvg/22/keyboard.png
+++ b/swat2/images/icons/crystalsvg/22/keyboard.png
diff --git a/swat/images/icons/crystalsvg/22/khelpcenter.png b/swat2/images/icons/crystalsvg/22/khelpcenter.png
index 44588c9178..44588c9178 100644
--- a/swat/images/icons/crystalsvg/22/khelpcenter.png
+++ b/swat2/images/icons/crystalsvg/22/khelpcenter.png
diff --git a/swat/images/icons/crystalsvg/22/konqueror.png b/swat2/images/icons/crystalsvg/22/konqueror.png
index 4f65bf543e..4f65bf543e 100644
--- a/swat/images/icons/crystalsvg/22/konqueror.png
+++ b/swat2/images/icons/crystalsvg/22/konqueror.png
diff --git a/swat/images/icons/crystalsvg/22/kpaint.png b/swat2/images/icons/crystalsvg/22/kpaint.png
index faa687b165..faa687b165 100644
--- a/swat/images/icons/crystalsvg/22/kpaint.png
+++ b/swat2/images/icons/crystalsvg/22/kpaint.png
diff --git a/swat/images/icons/crystalsvg/22/krita.png b/swat2/images/icons/crystalsvg/22/krita.png
index 253cc09d4d..253cc09d4d 100644
--- a/swat/images/icons/crystalsvg/22/krita.png
+++ b/swat2/images/icons/crystalsvg/22/krita.png
diff --git a/swat/images/icons/crystalsvg/22/ksmiletris.png b/swat2/images/icons/crystalsvg/22/ksmiletris.png
index e4b46fea7f..e4b46fea7f 100644
--- a/swat/images/icons/crystalsvg/22/ksmiletris.png
+++ b/swat2/images/icons/crystalsvg/22/ksmiletris.png
diff --git a/swat/images/icons/crystalsvg/22/ksnapshot.png b/swat2/images/icons/crystalsvg/22/ksnapshot.png
index 9a8db0bf98..9a8db0bf98 100644
--- a/swat/images/icons/crystalsvg/22/ksnapshot.png
+++ b/swat2/images/icons/crystalsvg/22/ksnapshot.png
diff --git a/swat/images/icons/crystalsvg/22/ktalkd.png b/swat2/images/icons/crystalsvg/22/ktalkd.png
index d631036e1a..d631036e1a 100644
--- a/swat/images/icons/crystalsvg/22/ktalkd.png
+++ b/swat2/images/icons/crystalsvg/22/ktalkd.png
diff --git a/swat/images/icons/crystalsvg/22/kuser.png b/swat2/images/icons/crystalsvg/22/kuser.png
index ee321d4ef8..ee321d4ef8 100644
--- a/swat/images/icons/crystalsvg/22/kuser.png
+++ b/swat2/images/icons/crystalsvg/22/kuser.png
diff --git a/swat/images/icons/crystalsvg/22/kview.png b/swat2/images/icons/crystalsvg/22/kview.png
index d868a8dadc..d868a8dadc 100644
--- a/swat/images/icons/crystalsvg/22/kview.png
+++ b/swat2/images/icons/crystalsvg/22/kview.png
diff --git a/swat/images/icons/crystalsvg/22/launch.png b/swat2/images/icons/crystalsvg/22/launch.png
index da97aef509..da97aef509 100644
--- a/swat/images/icons/crystalsvg/22/launch.png
+++ b/swat2/images/icons/crystalsvg/22/launch.png
diff --git a/swat/images/icons/crystalsvg/22/linuxconf.png b/swat2/images/icons/crystalsvg/22/linuxconf.png
index a7fd2911c8..a7fd2911c8 100644
--- a/swat/images/icons/crystalsvg/22/linuxconf.png
+++ b/swat2/images/icons/crystalsvg/22/linuxconf.png
diff --git a/swat/images/icons/crystalsvg/22/locale.png b/swat2/images/icons/crystalsvg/22/locale.png
index 553e683278..553e683278 100644
--- a/swat/images/icons/crystalsvg/22/locale.png
+++ b/swat2/images/icons/crystalsvg/22/locale.png
diff --git a/swat/images/icons/crystalsvg/22/looknfeel.png b/swat2/images/icons/crystalsvg/22/looknfeel.png
index 0792b3a872..0792b3a872 100644
--- a/swat/images/icons/crystalsvg/22/looknfeel.png
+++ b/swat2/images/icons/crystalsvg/22/looknfeel.png
diff --git a/swat/images/icons/crystalsvg/22/mac.png b/swat2/images/icons/crystalsvg/22/mac.png
index 1e8db45990..1e8db45990 100644
--- a/swat/images/icons/crystalsvg/22/mac.png
+++ b/swat2/images/icons/crystalsvg/22/mac.png
diff --git a/swat/images/icons/crystalsvg/22/mail.png b/swat2/images/icons/crystalsvg/22/mail.png
index 304b8fc7f7..304b8fc7f7 100644
--- a/swat/images/icons/crystalsvg/22/mail.png
+++ b/swat2/images/icons/crystalsvg/22/mail.png
diff --git a/swat/images/icons/crystalsvg/22/mail_delete.png b/swat2/images/icons/crystalsvg/22/mail_delete.png
index 7b1430ae61..7b1430ae61 100644
--- a/swat/images/icons/crystalsvg/22/mail_delete.png
+++ b/swat2/images/icons/crystalsvg/22/mail_delete.png
diff --git a/swat/images/icons/crystalsvg/22/mail_find.png b/swat2/images/icons/crystalsvg/22/mail_find.png
index 202275ab61..202275ab61 100644
--- a/swat/images/icons/crystalsvg/22/mail_find.png
+++ b/swat2/images/icons/crystalsvg/22/mail_find.png
diff --git a/swat/images/icons/crystalsvg/22/mail_forward.png b/swat2/images/icons/crystalsvg/22/mail_forward.png
index 919b41ea82..919b41ea82 100644
--- a/swat/images/icons/crystalsvg/22/mail_forward.png
+++ b/swat2/images/icons/crystalsvg/22/mail_forward.png
diff --git a/swat/images/icons/crystalsvg/22/mail_generic.png b/swat2/images/icons/crystalsvg/22/mail_generic.png
index 732b5b60b6..732b5b60b6 100644
--- a/swat/images/icons/crystalsvg/22/mail_generic.png
+++ b/swat2/images/icons/crystalsvg/22/mail_generic.png
diff --git a/swat/images/icons/crystalsvg/22/mail_new.png b/swat2/images/icons/crystalsvg/22/mail_new.png
index 384cbf34e9..384cbf34e9 100644
--- a/swat/images/icons/crystalsvg/22/mail_new.png
+++ b/swat2/images/icons/crystalsvg/22/mail_new.png
diff --git a/swat/images/icons/crystalsvg/22/mail_replay.png b/swat2/images/icons/crystalsvg/22/mail_replay.png
index 27c401ad6c..27c401ad6c 100644
--- a/swat/images/icons/crystalsvg/22/mail_replay.png
+++ b/swat2/images/icons/crystalsvg/22/mail_replay.png
diff --git a/swat/images/icons/crystalsvg/22/mail_replyall.png b/swat2/images/icons/crystalsvg/22/mail_replyall.png
index 742a40b76e..742a40b76e 100644
--- a/swat/images/icons/crystalsvg/22/mail_replyall.png
+++ b/swat2/images/icons/crystalsvg/22/mail_replyall.png
diff --git a/swat/images/icons/crystalsvg/22/mail_send.png b/swat2/images/icons/crystalsvg/22/mail_send.png
index a802f04aee..a802f04aee 100644
--- a/swat/images/icons/crystalsvg/22/mail_send.png
+++ b/swat2/images/icons/crystalsvg/22/mail_send.png
diff --git a/swat/images/icons/crystalsvg/22/misc.png b/swat2/images/icons/crystalsvg/22/misc.png
index b5c894955b..b5c894955b 100644
--- a/swat/images/icons/crystalsvg/22/misc.png
+++ b/swat2/images/icons/crystalsvg/22/misc.png
diff --git a/swat/images/icons/crystalsvg/22/mouse.png b/swat2/images/icons/crystalsvg/22/mouse.png
index db3ddfaf91..db3ddfaf91 100644
--- a/swat/images/icons/crystalsvg/22/mouse.png
+++ b/swat2/images/icons/crystalsvg/22/mouse.png
diff --git a/swat/images/icons/crystalsvg/22/mozilla.png b/swat2/images/icons/crystalsvg/22/mozilla.png
index bd1b4d5313..bd1b4d5313 100644
--- a/swat/images/icons/crystalsvg/22/mozilla.png
+++ b/swat2/images/icons/crystalsvg/22/mozilla.png
diff --git a/swat/images/icons/crystalsvg/22/mycomputer.png b/swat2/images/icons/crystalsvg/22/mycomputer.png
index c707081eba..c707081eba 100644
--- a/swat/images/icons/crystalsvg/22/mycomputer.png
+++ b/swat2/images/icons/crystalsvg/22/mycomputer.png
diff --git a/swat/images/icons/crystalsvg/22/mymac.png b/swat2/images/icons/crystalsvg/22/mymac.png
index f574f7b0cd..f574f7b0cd 100644
--- a/swat/images/icons/crystalsvg/22/mymac.png
+++ b/swat2/images/icons/crystalsvg/22/mymac.png
diff --git a/swat/images/icons/crystalsvg/22/netscape.png b/swat2/images/icons/crystalsvg/22/netscape.png
index 25cb9da55b..25cb9da55b 100644
--- a/swat/images/icons/crystalsvg/22/netscape.png
+++ b/swat2/images/icons/crystalsvg/22/netscape.png
diff --git a/swat/images/icons/crystalsvg/22/network.png b/swat2/images/icons/crystalsvg/22/network.png
index 071eed6fce..071eed6fce 100644
--- a/swat/images/icons/crystalsvg/22/network.png
+++ b/swat2/images/icons/crystalsvg/22/network.png
diff --git a/swat/images/icons/crystalsvg/22/next.png b/swat2/images/icons/crystalsvg/22/next.png
index 5698be5ea4..5698be5ea4 100644
--- a/swat/images/icons/crystalsvg/22/next.png
+++ b/swat2/images/icons/crystalsvg/22/next.png
diff --git a/swat/images/icons/crystalsvg/22/password.png b/swat2/images/icons/crystalsvg/22/password.png
index 2c84ee4f7d..2c84ee4f7d 100644
--- a/swat/images/icons/crystalsvg/22/password.png
+++ b/swat2/images/icons/crystalsvg/22/password.png
diff --git a/swat/images/icons/crystalsvg/22/penguin.png b/swat2/images/icons/crystalsvg/22/penguin.png
index 83819e5202..83819e5202 100644
--- a/swat/images/icons/crystalsvg/22/penguin.png
+++ b/swat2/images/icons/crystalsvg/22/penguin.png
diff --git a/swat/images/icons/crystalsvg/22/previous.png b/swat2/images/icons/crystalsvg/22/previous.png
index fe11a3024d..fe11a3024d 100644
--- a/swat/images/icons/crystalsvg/22/previous.png
+++ b/swat2/images/icons/crystalsvg/22/previous.png
diff --git a/swat/images/icons/crystalsvg/22/proxy.png b/swat2/images/icons/crystalsvg/22/proxy.png
index e28c1b2039..e28c1b2039 100644
--- a/swat/images/icons/crystalsvg/22/proxy.png
+++ b/swat2/images/icons/crystalsvg/22/proxy.png
diff --git a/swat/images/icons/crystalsvg/22/quicktime.png b/swat2/images/icons/crystalsvg/22/quicktime.png
index bda512030a..bda512030a 100644
--- a/swat/images/icons/crystalsvg/22/quicktime.png
+++ b/swat2/images/icons/crystalsvg/22/quicktime.png
diff --git a/swat/images/icons/crystalsvg/22/realplayer.png b/swat2/images/icons/crystalsvg/22/realplayer.png
index 23cf04bca5..23cf04bca5 100644
--- a/swat/images/icons/crystalsvg/22/realplayer.png
+++ b/swat2/images/icons/crystalsvg/22/realplayer.png
diff --git a/swat/images/icons/crystalsvg/22/redo.png b/swat2/images/icons/crystalsvg/22/redo.png
index 8a4c817d01..8a4c817d01 100644
--- a/swat/images/icons/crystalsvg/22/redo.png
+++ b/swat2/images/icons/crystalsvg/22/redo.png
diff --git a/swat/images/icons/crystalsvg/22/reload.png b/swat2/images/icons/crystalsvg/22/reload.png
index 9b80d879c7..9b80d879c7 100644
--- a/swat/images/icons/crystalsvg/22/reload.png
+++ b/swat2/images/icons/crystalsvg/22/reload.png
diff --git a/swat/images/icons/crystalsvg/22/run.png b/swat2/images/icons/crystalsvg/22/run.png
index b5c894955b..b5c894955b 100644
--- a/swat/images/icons/crystalsvg/22/run.png
+++ b/swat2/images/icons/crystalsvg/22/run.png
diff --git a/swat/images/icons/crystalsvg/22/search.png b/swat2/images/icons/crystalsvg/22/search.png
index 4f880ab65f..4f880ab65f 100644
--- a/swat/images/icons/crystalsvg/22/search.png
+++ b/swat2/images/icons/crystalsvg/22/search.png
diff --git a/swat/images/icons/crystalsvg/22/services.png b/swat2/images/icons/crystalsvg/22/services.png
index 8d3eb53735..8d3eb53735 100644
--- a/swat/images/icons/crystalsvg/22/services.png
+++ b/swat2/images/icons/crystalsvg/22/services.png
diff --git a/swat/images/icons/crystalsvg/22/socket.png b/swat2/images/icons/crystalsvg/22/socket.png
index 9261437f11..9261437f11 100644
--- a/swat/images/icons/crystalsvg/22/socket.png
+++ b/swat2/images/icons/crystalsvg/22/socket.png
diff --git a/swat/images/icons/crystalsvg/22/spellcheck.png b/swat2/images/icons/crystalsvg/22/spellcheck.png
index 444dce6368..444dce6368 100644
--- a/swat/images/icons/crystalsvg/22/spellcheck.png
+++ b/swat2/images/icons/crystalsvg/22/spellcheck.png
diff --git a/swat/images/icons/crystalsvg/22/stop.png b/swat2/images/icons/crystalsvg/22/stop.png
index 830e2e62b5..830e2e62b5 100644
--- a/swat/images/icons/crystalsvg/22/stop.png
+++ b/swat2/images/icons/crystalsvg/22/stop.png
diff --git a/swat/images/icons/crystalsvg/22/stylesheet.png b/swat2/images/icons/crystalsvg/22/stylesheet.png
index c3544ad4e4..c3544ad4e4 100644
--- a/swat/images/icons/crystalsvg/22/stylesheet.png
+++ b/swat2/images/icons/crystalsvg/22/stylesheet.png
diff --git a/swat/images/icons/crystalsvg/22/thumbnail.png b/swat2/images/icons/crystalsvg/22/thumbnail.png
index fdb7c4e35e..fdb7c4e35e 100644
--- a/swat/images/icons/crystalsvg/22/thumbnail.png
+++ b/swat2/images/icons/crystalsvg/22/thumbnail.png
diff --git a/swat/images/icons/crystalsvg/22/todo.png b/swat2/images/icons/crystalsvg/22/todo.png
index 6002fb5c8d..6002fb5c8d 100644
--- a/swat/images/icons/crystalsvg/22/todo.png
+++ b/swat2/images/icons/crystalsvg/22/todo.png
diff --git a/swat/images/icons/crystalsvg/22/tux.png b/swat2/images/icons/crystalsvg/22/tux.png
index 32c851493f..32c851493f 100644
--- a/swat/images/icons/crystalsvg/22/tux.png
+++ b/swat2/images/icons/crystalsvg/22/tux.png
diff --git a/swat/images/icons/crystalsvg/22/up.png b/swat2/images/icons/crystalsvg/22/up.png
index dfd2fd086e..dfd2fd086e 100644
--- a/swat/images/icons/crystalsvg/22/up.png
+++ b/swat2/images/icons/crystalsvg/22/up.png
diff --git a/swat/images/icons/crystalsvg/22/wizard.png b/swat2/images/icons/crystalsvg/22/wizard.png
index 21d5e2f828..21d5e2f828 100644
--- a/swat/images/icons/crystalsvg/22/wizard.png
+++ b/swat2/images/icons/crystalsvg/22/wizard.png
diff --git a/swat/images/icons/crystalsvg/32/access.png b/swat2/images/icons/crystalsvg/32/access.png
index 58429cabfb..58429cabfb 100644
--- a/swat/images/icons/crystalsvg/32/access.png
+++ b/swat2/images/icons/crystalsvg/32/access.png
diff --git a/swat/images/icons/crystalsvg/32/agent.png b/swat2/images/icons/crystalsvg/32/agent.png
index d10a80c618..d10a80c618 100644
--- a/swat/images/icons/crystalsvg/32/agent.png
+++ b/swat2/images/icons/crystalsvg/32/agent.png
diff --git a/swat/images/icons/crystalsvg/32/antivirus.png b/swat2/images/icons/crystalsvg/32/antivirus.png
index eaca74ae86..eaca74ae86 100644
--- a/swat/images/icons/crystalsvg/32/antivirus.png
+++ b/swat2/images/icons/crystalsvg/32/antivirus.png
diff --git a/swat/images/icons/crystalsvg/32/appearance.png b/swat2/images/icons/crystalsvg/32/appearance.png
index 3b39c56162..3b39c56162 100644
--- a/swat/images/icons/crystalsvg/32/appearance.png
+++ b/swat2/images/icons/crystalsvg/32/appearance.png
diff --git a/swat/images/icons/crystalsvg/32/back.png b/swat2/images/icons/crystalsvg/32/back.png
index 895755ea21..895755ea21 100644
--- a/swat/images/icons/crystalsvg/32/back.png
+++ b/swat2/images/icons/crystalsvg/32/back.png
diff --git a/swat/images/icons/crystalsvg/32/background.png b/swat2/images/icons/crystalsvg/32/background.png
index 45d81edefb..45d81edefb 100644
--- a/swat/images/icons/crystalsvg/32/background.png
+++ b/swat2/images/icons/crystalsvg/32/background.png
diff --git a/swat/images/icons/crystalsvg/32/bell.png b/swat2/images/icons/crystalsvg/32/bell.png
index 6f8293fae7..6f8293fae7 100644
--- a/swat/images/icons/crystalsvg/32/bell.png
+++ b/swat2/images/icons/crystalsvg/32/bell.png
diff --git a/swat/images/icons/crystalsvg/32/blockdevice.png b/swat2/images/icons/crystalsvg/32/blockdevice.png
index 6553907ba2..6553907ba2 100644
--- a/swat/images/icons/crystalsvg/32/blockdevice.png
+++ b/swat2/images/icons/crystalsvg/32/blockdevice.png
diff --git a/swat/images/icons/crystalsvg/32/bookmark.png b/swat2/images/icons/crystalsvg/32/bookmark.png
index 028869cbe3..028869cbe3 100644
--- a/swat/images/icons/crystalsvg/32/bookmark.png
+++ b/swat2/images/icons/crystalsvg/32/bookmark.png
diff --git a/swat/images/icons/crystalsvg/32/browser.png b/swat2/images/icons/crystalsvg/32/browser.png
index cb3df0b92f..cb3df0b92f 100644
--- a/swat/images/icons/crystalsvg/32/browser.png
+++ b/swat2/images/icons/crystalsvg/32/browser.png
diff --git a/swat/images/icons/crystalsvg/32/button_cancel.png b/swat2/images/icons/crystalsvg/32/button_cancel.png
index c6464d90a6..c6464d90a6 100644
--- a/swat/images/icons/crystalsvg/32/button_cancel.png
+++ b/swat2/images/icons/crystalsvg/32/button_cancel.png
diff --git a/swat/images/icons/crystalsvg/32/button_ok.png b/swat2/images/icons/crystalsvg/32/button_ok.png
index 230de53029..230de53029 100644
--- a/swat/images/icons/crystalsvg/32/button_ok.png
+++ b/swat2/images/icons/crystalsvg/32/button_ok.png
diff --git a/swat/images/icons/crystalsvg/32/cache.png b/swat2/images/icons/crystalsvg/32/cache.png
index 7700fd9ad7..7700fd9ad7 100644
--- a/swat/images/icons/crystalsvg/32/cache.png
+++ b/swat2/images/icons/crystalsvg/32/cache.png
diff --git a/swat/images/icons/crystalsvg/32/clock.png b/swat2/images/icons/crystalsvg/32/clock.png
index 0f93b36ccb..0f93b36ccb 100644
--- a/swat/images/icons/crystalsvg/32/clock.png
+++ b/swat2/images/icons/crystalsvg/32/clock.png
diff --git a/swat/images/icons/crystalsvg/32/colorize.png b/swat2/images/icons/crystalsvg/32/colorize.png
index 3b39c56162..3b39c56162 100644
--- a/swat/images/icons/crystalsvg/32/colorize.png
+++ b/swat2/images/icons/crystalsvg/32/colorize.png
diff --git a/swat/images/icons/crystalsvg/32/colors.png b/swat2/images/icons/crystalsvg/32/colors.png
index e5aa87cbdc..e5aa87cbdc 100644
--- a/swat/images/icons/crystalsvg/32/colors.png
+++ b/swat2/images/icons/crystalsvg/32/colors.png
diff --git a/swat/images/icons/crystalsvg/32/configure.png b/swat2/images/icons/crystalsvg/32/configure.png
index 11415643fb..11415643fb 100644
--- a/swat/images/icons/crystalsvg/32/configure.png
+++ b/swat2/images/icons/crystalsvg/32/configure.png
diff --git a/swat/images/icons/crystalsvg/32/contents.png b/swat2/images/icons/crystalsvg/32/contents.png
index 2e86079c02..2e86079c02 100644
--- a/swat/images/icons/crystalsvg/32/contents.png
+++ b/swat2/images/icons/crystalsvg/32/contents.png
diff --git a/swat/images/icons/crystalsvg/32/cookie.png b/swat2/images/icons/crystalsvg/32/cookie.png
index c062d072bc..c062d072bc 100644
--- a/swat/images/icons/crystalsvg/32/cookie.png
+++ b/swat2/images/icons/crystalsvg/32/cookie.png
diff --git a/swat/images/icons/crystalsvg/32/core.png b/swat2/images/icons/crystalsvg/32/core.png
index c3e6fd2111..c3e6fd2111 100644
--- a/swat/images/icons/crystalsvg/32/core.png
+++ b/swat2/images/icons/crystalsvg/32/core.png
diff --git a/swat/images/icons/crystalsvg/32/date.png b/swat2/images/icons/crystalsvg/32/date.png
index 54b320347d..54b320347d 100644
--- a/swat/images/icons/crystalsvg/32/date.png
+++ b/swat2/images/icons/crystalsvg/32/date.png
diff --git a/swat/images/icons/crystalsvg/32/decrypted.png b/swat2/images/icons/crystalsvg/32/decrypted.png
index 0becd65abd..0becd65abd 100644
--- a/swat/images/icons/crystalsvg/32/decrypted.png
+++ b/swat2/images/icons/crystalsvg/32/decrypted.png
diff --git a/swat/images/icons/crystalsvg/32/desktop.png b/swat2/images/icons/crystalsvg/32/desktop.png
index 85b495e999..85b495e999 100644
--- a/swat/images/icons/crystalsvg/32/desktop.png
+++ b/swat2/images/icons/crystalsvg/32/desktop.png
diff --git a/swat/images/icons/crystalsvg/32/display.png b/swat2/images/icons/crystalsvg/32/display.png
index 1d9b132443..1d9b132443 100644
--- a/swat/images/icons/crystalsvg/32/display.png
+++ b/swat2/images/icons/crystalsvg/32/display.png
diff --git a/swat/images/icons/crystalsvg/32/document.png b/swat2/images/icons/crystalsvg/32/document.png
index 1ddec27941..1ddec27941 100644
--- a/swat/images/icons/crystalsvg/32/document.png
+++ b/swat2/images/icons/crystalsvg/32/document.png
diff --git a/swat/images/icons/crystalsvg/32/down.png b/swat2/images/icons/crystalsvg/32/down.png
index bbf31ec561..bbf31ec561 100644
--- a/swat/images/icons/crystalsvg/32/down.png
+++ b/swat2/images/icons/crystalsvg/32/down.png
diff --git a/swat/images/icons/crystalsvg/32/edit.png b/swat2/images/icons/crystalsvg/32/edit.png
index 1d69145151..1d69145151 100644
--- a/swat/images/icons/crystalsvg/32/edit.png
+++ b/swat2/images/icons/crystalsvg/32/edit.png
diff --git a/swat/images/icons/crystalsvg/32/editcopy.png b/swat2/images/icons/crystalsvg/32/editcopy.png
index cfa9cb4317..cfa9cb4317 100644
--- a/swat/images/icons/crystalsvg/32/editcopy.png
+++ b/swat2/images/icons/crystalsvg/32/editcopy.png
diff --git a/swat/images/icons/crystalsvg/32/editcut.png b/swat2/images/icons/crystalsvg/32/editcut.png
index 79d2dcae39..79d2dcae39 100644
--- a/swat/images/icons/crystalsvg/32/editcut.png
+++ b/swat2/images/icons/crystalsvg/32/editcut.png
diff --git a/swat/images/icons/crystalsvg/32/editdelete.png b/swat2/images/icons/crystalsvg/32/editdelete.png
index 945d221eea..945d221eea 100644
--- a/swat/images/icons/crystalsvg/32/editdelete.png
+++ b/swat2/images/icons/crystalsvg/32/editdelete.png
diff --git a/swat/images/icons/crystalsvg/32/editpaste.png b/swat2/images/icons/crystalsvg/32/editpaste.png
index a192060bdd..a192060bdd 100644
--- a/swat/images/icons/crystalsvg/32/editpaste.png
+++ b/swat2/images/icons/crystalsvg/32/editpaste.png
diff --git a/swat/images/icons/crystalsvg/32/edittrash.png b/swat2/images/icons/crystalsvg/32/edittrash.png
index 4bd294c0ad..4bd294c0ad 100644
--- a/swat/images/icons/crystalsvg/32/edittrash.png
+++ b/swat2/images/icons/crystalsvg/32/edittrash.png
diff --git a/swat/images/icons/crystalsvg/32/email.png b/swat2/images/icons/crystalsvg/32/email.png
index edaba054ed..edaba054ed 100644
--- a/swat/images/icons/crystalsvg/32/email.png
+++ b/swat2/images/icons/crystalsvg/32/email.png
diff --git a/swat/images/icons/crystalsvg/32/empty.png b/swat2/images/icons/crystalsvg/32/empty.png
index f274fd4369..f274fd4369 100644
--- a/swat/images/icons/crystalsvg/32/empty.png
+++ b/swat2/images/icons/crystalsvg/32/empty.png
diff --git a/swat/images/icons/crystalsvg/32/encrypted.png b/swat2/images/icons/crystalsvg/32/encrypted.png
index f6db914602..f6db914602 100644
--- a/swat/images/icons/crystalsvg/32/encrypted.png
+++ b/swat2/images/icons/crystalsvg/32/encrypted.png
diff --git a/swat/images/icons/crystalsvg/32/energy.png b/swat2/images/icons/crystalsvg/32/energy.png
index 97681a4df1..97681a4df1 100644
--- a/swat/images/icons/crystalsvg/32/energy.png
+++ b/swat2/images/icons/crystalsvg/32/energy.png
diff --git a/swat/images/icons/crystalsvg/32/error.png b/swat2/images/icons/crystalsvg/32/error.png
index 1327c241d3..1327c241d3 100644
--- a/swat/images/icons/crystalsvg/32/error.png
+++ b/swat2/images/icons/crystalsvg/32/error.png
diff --git a/swat/images/icons/crystalsvg/32/exec.png b/swat2/images/icons/crystalsvg/32/exec.png
index 6d21477035..6d21477035 100644
--- a/swat/images/icons/crystalsvg/32/exec.png
+++ b/swat2/images/icons/crystalsvg/32/exec.png
diff --git a/swat/images/icons/crystalsvg/32/favorites.png b/swat2/images/icons/crystalsvg/32/favorites.png
index b7e10c47fa..b7e10c47fa 100644
--- a/swat/images/icons/crystalsvg/32/favorites.png
+++ b/swat2/images/icons/crystalsvg/32/favorites.png
diff --git a/swat/images/icons/crystalsvg/32/filefind.png b/swat2/images/icons/crystalsvg/32/filefind.png
index 418a8ad2c3..418a8ad2c3 100644
--- a/swat/images/icons/crystalsvg/32/filefind.png
+++ b/swat2/images/icons/crystalsvg/32/filefind.png
diff --git a/swat/images/icons/crystalsvg/32/filenew.png b/swat2/images/icons/crystalsvg/32/filenew.png
index 8a303b7db2..8a303b7db2 100644
--- a/swat/images/icons/crystalsvg/32/filenew.png
+++ b/swat2/images/icons/crystalsvg/32/filenew.png
diff --git a/swat/images/icons/crystalsvg/32/fileopen.png b/swat2/images/icons/crystalsvg/32/fileopen.png
index 503a004591..503a004591 100644
--- a/swat/images/icons/crystalsvg/32/fileopen.png
+++ b/swat2/images/icons/crystalsvg/32/fileopen.png
diff --git a/swat/images/icons/crystalsvg/32/fileprint.png b/swat2/images/icons/crystalsvg/32/fileprint.png
index 4325b61869..4325b61869 100644
--- a/swat/images/icons/crystalsvg/32/fileprint.png
+++ b/swat2/images/icons/crystalsvg/32/fileprint.png
diff --git a/swat/images/icons/crystalsvg/32/filesave.png b/swat2/images/icons/crystalsvg/32/filesave.png
index dd00abd166..dd00abd166 100644
--- a/swat/images/icons/crystalsvg/32/filesave.png
+++ b/swat2/images/icons/crystalsvg/32/filesave.png
diff --git a/swat/images/icons/crystalsvg/32/filesaveas.png b/swat2/images/icons/crystalsvg/32/filesaveas.png
index 61a080ecd0..61a080ecd0 100644
--- a/swat/images/icons/crystalsvg/32/filesaveas.png
+++ b/swat2/images/icons/crystalsvg/32/filesaveas.png
diff --git a/swat/images/icons/crystalsvg/32/find.png b/swat2/images/icons/crystalsvg/32/find.png
index 91f6eb6568..91f6eb6568 100644
--- a/swat/images/icons/crystalsvg/32/find.png
+++ b/swat2/images/icons/crystalsvg/32/find.png
diff --git a/swat/images/icons/crystalsvg/32/folder.png b/swat2/images/icons/crystalsvg/32/folder.png
index 91d8e098b4..91d8e098b4 100644
--- a/swat/images/icons/crystalsvg/32/folder.png
+++ b/swat2/images/icons/crystalsvg/32/folder.png
diff --git a/swat/images/icons/crystalsvg/32/folder_home.png b/swat2/images/icons/crystalsvg/32/folder_home.png
index baa8912e99..baa8912e99 100644
--- a/swat/images/icons/crystalsvg/32/folder_home.png
+++ b/swat2/images/icons/crystalsvg/32/folder_home.png
diff --git a/swat/images/icons/crystalsvg/32/folder_important.png b/swat2/images/icons/crystalsvg/32/folder_important.png
index 9f82d14d3d..9f82d14d3d 100644
--- a/swat/images/icons/crystalsvg/32/folder_important.png
+++ b/swat2/images/icons/crystalsvg/32/folder_important.png
diff --git a/swat/images/icons/crystalsvg/32/folder_locked.png b/swat2/images/icons/crystalsvg/32/folder_locked.png
index 0e20d8cfc4..0e20d8cfc4 100644
--- a/swat/images/icons/crystalsvg/32/folder_locked.png
+++ b/swat2/images/icons/crystalsvg/32/folder_locked.png
diff --git a/swat/images/icons/crystalsvg/32/folder_open.png b/swat2/images/icons/crystalsvg/32/folder_open.png
index 18cfb602d9..18cfb602d9 100644
--- a/swat/images/icons/crystalsvg/32/folder_open.png
+++ b/swat2/images/icons/crystalsvg/32/folder_open.png
diff --git a/swat/images/icons/crystalsvg/32/font.png b/swat2/images/icons/crystalsvg/32/font.png
index 431ca00ece..431ca00ece 100644
--- a/swat/images/icons/crystalsvg/32/font.png
+++ b/swat2/images/icons/crystalsvg/32/font.png
diff --git a/swat/images/icons/crystalsvg/32/forward.png b/swat2/images/icons/crystalsvg/32/forward.png
index 46ce06f8ca..46ce06f8ca 100644
--- a/swat/images/icons/crystalsvg/32/forward.png
+++ b/swat2/images/icons/crystalsvg/32/forward.png
diff --git a/swat/images/icons/crystalsvg/32/gohome.png b/swat2/images/icons/crystalsvg/32/gohome.png
index 5205539fbe..5205539fbe 100644
--- a/swat/images/icons/crystalsvg/32/gohome.png
+++ b/swat2/images/icons/crystalsvg/32/gohome.png
diff --git a/swat/images/icons/crystalsvg/32/help.png b/swat2/images/icons/crystalsvg/32/help.png
index 5858f03f7e..5858f03f7e 100644
--- a/swat/images/icons/crystalsvg/32/help.png
+++ b/swat2/images/icons/crystalsvg/32/help.png
diff --git a/swat/images/icons/crystalsvg/32/hwinfo.png b/swat2/images/icons/crystalsvg/32/hwinfo.png
index c9ad3a0f2b..c9ad3a0f2b 100644
--- a/swat/images/icons/crystalsvg/32/hwinfo.png
+++ b/swat2/images/icons/crystalsvg/32/hwinfo.png
diff --git a/swat/images/icons/crystalsvg/32/icons.png b/swat2/images/icons/crystalsvg/32/icons.png
index a12f847d9d..a12f847d9d 100644
--- a/swat/images/icons/crystalsvg/32/icons.png
+++ b/swat2/images/icons/crystalsvg/32/icons.png
diff --git a/swat/images/icons/crystalsvg/32/iconthemes.png b/swat2/images/icons/crystalsvg/32/iconthemes.png
index c5326752ac..c5326752ac 100644
--- a/swat/images/icons/crystalsvg/32/iconthemes.png
+++ b/swat2/images/icons/crystalsvg/32/iconthemes.png
diff --git a/swat/images/icons/crystalsvg/32/important.png b/swat2/images/icons/crystalsvg/32/important.png
index d83f3491e6..d83f3491e6 100644
--- a/swat/images/icons/crystalsvg/32/important.png
+++ b/swat2/images/icons/crystalsvg/32/important.png
diff --git a/swat/images/icons/crystalsvg/32/info.png b/swat2/images/icons/crystalsvg/32/info.png
index 4405fae307..4405fae307 100644
--- a/swat/images/icons/crystalsvg/32/info.png
+++ b/swat2/images/icons/crystalsvg/32/info.png
diff --git a/swat/images/icons/crystalsvg/32/kcoloredit.png b/swat2/images/icons/crystalsvg/32/kcoloredit.png
index e5aa87cbdc..e5aa87cbdc 100644
--- a/swat/images/icons/crystalsvg/32/kcoloredit.png
+++ b/swat2/images/icons/crystalsvg/32/kcoloredit.png
diff --git a/swat/images/icons/crystalsvg/32/kcontrol.png b/swat2/images/icons/crystalsvg/32/kcontrol.png
index 6537ba75ec..6537ba75ec 100644
--- a/swat/images/icons/crystalsvg/32/kcontrol.png
+++ b/swat2/images/icons/crystalsvg/32/kcontrol.png
diff --git a/swat/images/icons/crystalsvg/32/keyboard.png b/swat2/images/icons/crystalsvg/32/keyboard.png
index 3bbc805364..3bbc805364 100644
--- a/swat/images/icons/crystalsvg/32/keyboard.png
+++ b/swat2/images/icons/crystalsvg/32/keyboard.png
diff --git a/swat/images/icons/crystalsvg/32/khelpcenter.png b/swat2/images/icons/crystalsvg/32/khelpcenter.png
index a626c9d761..a626c9d761 100644
--- a/swat/images/icons/crystalsvg/32/khelpcenter.png
+++ b/swat2/images/icons/crystalsvg/32/khelpcenter.png
diff --git a/swat/images/icons/crystalsvg/32/kmix.png b/swat2/images/icons/crystalsvg/32/kmix.png
index c122c880bf..c122c880bf 100644
--- a/swat/images/icons/crystalsvg/32/kmix.png
+++ b/swat2/images/icons/crystalsvg/32/kmix.png
diff --git a/swat/images/icons/crystalsvg/32/knotify.png b/swat2/images/icons/crystalsvg/32/knotify.png
index ede0d8ed1d..ede0d8ed1d 100644
--- a/swat/images/icons/crystalsvg/32/knotify.png
+++ b/swat2/images/icons/crystalsvg/32/knotify.png
diff --git a/swat/images/icons/crystalsvg/32/konqueror.png b/swat2/images/icons/crystalsvg/32/konqueror.png
index 1a04af26f8..1a04af26f8 100644
--- a/swat/images/icons/crystalsvg/32/konqueror.png
+++ b/swat2/images/icons/crystalsvg/32/konqueror.png
diff --git a/swat/images/icons/crystalsvg/32/kpackage.png b/swat2/images/icons/crystalsvg/32/kpackage.png
index b938d97c62..b938d97c62 100644
--- a/swat/images/icons/crystalsvg/32/kpackage.png
+++ b/swat2/images/icons/crystalsvg/32/kpackage.png
diff --git a/swat/images/icons/crystalsvg/32/kpaint.png b/swat2/images/icons/crystalsvg/32/kpaint.png
index 6abbe8cffb..6abbe8cffb 100644
--- a/swat/images/icons/crystalsvg/32/kpaint.png
+++ b/swat2/images/icons/crystalsvg/32/kpaint.png
diff --git a/swat/images/icons/crystalsvg/32/kpersonalizer.png b/swat2/images/icons/crystalsvg/32/kpersonalizer.png
index cc3e986989..cc3e986989 100644
--- a/swat/images/icons/crystalsvg/32/kpersonalizer.png
+++ b/swat2/images/icons/crystalsvg/32/kpersonalizer.png
diff --git a/swat/images/icons/crystalsvg/32/krita.png b/swat2/images/icons/crystalsvg/32/krita.png
index eee2e32d19..eee2e32d19 100644
--- a/swat/images/icons/crystalsvg/32/krita.png
+++ b/swat2/images/icons/crystalsvg/32/krita.png
diff --git a/swat/images/icons/crystalsvg/32/ksmiletris.png b/swat2/images/icons/crystalsvg/32/ksmiletris.png
index 2c38e3ce14..2c38e3ce14 100644
--- a/swat/images/icons/crystalsvg/32/ksmiletris.png
+++ b/swat2/images/icons/crystalsvg/32/ksmiletris.png
diff --git a/swat/images/icons/crystalsvg/32/ksnapshot.png b/swat2/images/icons/crystalsvg/32/ksnapshot.png
index 4619ae8d4d..4619ae8d4d 100644
--- a/swat/images/icons/crystalsvg/32/ksnapshot.png
+++ b/swat2/images/icons/crystalsvg/32/ksnapshot.png
diff --git a/swat/images/icons/crystalsvg/32/ktalkd.png b/swat2/images/icons/crystalsvg/32/ktalkd.png
index 896c9be304..896c9be304 100644
--- a/swat/images/icons/crystalsvg/32/ktalkd.png
+++ b/swat2/images/icons/crystalsvg/32/ktalkd.png
diff --git a/swat/images/icons/crystalsvg/32/ktip.png b/swat2/images/icons/crystalsvg/32/ktip.png
index ee1b839ab3..ee1b839ab3 100644
--- a/swat/images/icons/crystalsvg/32/ktip.png
+++ b/swat2/images/icons/crystalsvg/32/ktip.png
diff --git a/swat/images/icons/crystalsvg/32/kuser.png b/swat2/images/icons/crystalsvg/32/kuser.png
index a5cbf22d3e..a5cbf22d3e 100644
--- a/swat/images/icons/crystalsvg/32/kuser.png
+++ b/swat2/images/icons/crystalsvg/32/kuser.png
diff --git a/swat/images/icons/crystalsvg/32/kview.png b/swat2/images/icons/crystalsvg/32/kview.png
index 31186ed72e..31186ed72e 100644
--- a/swat/images/icons/crystalsvg/32/kview.png
+++ b/swat2/images/icons/crystalsvg/32/kview.png
diff --git a/swat/images/icons/crystalsvg/32/launch.png b/swat2/images/icons/crystalsvg/32/launch.png
index 5f61bea717..5f61bea717 100644
--- a/swat/images/icons/crystalsvg/32/launch.png
+++ b/swat2/images/icons/crystalsvg/32/launch.png
diff --git a/swat/images/icons/crystalsvg/32/linuxconf.png b/swat2/images/icons/crystalsvg/32/linuxconf.png
index 816291cf0c..816291cf0c 100644
--- a/swat/images/icons/crystalsvg/32/linuxconf.png
+++ b/swat2/images/icons/crystalsvg/32/linuxconf.png
diff --git a/swat/images/icons/crystalsvg/32/locale.png b/swat2/images/icons/crystalsvg/32/locale.png
index 96b4201ac9..96b4201ac9 100644
--- a/swat/images/icons/crystalsvg/32/locale.png
+++ b/swat2/images/icons/crystalsvg/32/locale.png
diff --git a/swat/images/icons/crystalsvg/32/looknfeel.png b/swat2/images/icons/crystalsvg/32/looknfeel.png
index 75e29219b0..75e29219b0 100644
--- a/swat/images/icons/crystalsvg/32/looknfeel.png
+++ b/swat2/images/icons/crystalsvg/32/looknfeel.png
diff --git a/swat/images/icons/crystalsvg/32/mac.png b/swat2/images/icons/crystalsvg/32/mac.png
index 68b8b66649..68b8b66649 100644
--- a/swat/images/icons/crystalsvg/32/mac.png
+++ b/swat2/images/icons/crystalsvg/32/mac.png
diff --git a/swat/images/icons/crystalsvg/32/mail.png b/swat2/images/icons/crystalsvg/32/mail.png
index e78a617a3f..e78a617a3f 100644
--- a/swat/images/icons/crystalsvg/32/mail.png
+++ b/swat2/images/icons/crystalsvg/32/mail.png
diff --git a/swat/images/icons/crystalsvg/32/mail_delete.png b/swat2/images/icons/crystalsvg/32/mail_delete.png
index f66cc05954..f66cc05954 100644
--- a/swat/images/icons/crystalsvg/32/mail_delete.png
+++ b/swat2/images/icons/crystalsvg/32/mail_delete.png
diff --git a/swat/images/icons/crystalsvg/32/mail_find.png b/swat2/images/icons/crystalsvg/32/mail_find.png
index 7992c47abe..7992c47abe 100644
--- a/swat/images/icons/crystalsvg/32/mail_find.png
+++ b/swat2/images/icons/crystalsvg/32/mail_find.png
diff --git a/swat/images/icons/crystalsvg/32/mail_generic.png b/swat2/images/icons/crystalsvg/32/mail_generic.png
index 4d9cf72955..4d9cf72955 100644
--- a/swat/images/icons/crystalsvg/32/mail_generic.png
+++ b/swat2/images/icons/crystalsvg/32/mail_generic.png
diff --git a/swat/images/icons/crystalsvg/32/mail_new.png b/swat2/images/icons/crystalsvg/32/mail_new.png
index e8dfc7cb55..e8dfc7cb55 100644
--- a/swat/images/icons/crystalsvg/32/mail_new.png
+++ b/swat2/images/icons/crystalsvg/32/mail_new.png
diff --git a/swat/images/icons/crystalsvg/32/mail_replay.png b/swat2/images/icons/crystalsvg/32/mail_replay.png
index 170f2be45c..170f2be45c 100644
--- a/swat/images/icons/crystalsvg/32/mail_replay.png
+++ b/swat2/images/icons/crystalsvg/32/mail_replay.png
diff --git a/swat/images/icons/crystalsvg/32/mail_send.png b/swat2/images/icons/crystalsvg/32/mail_send.png
index 01bd046552..01bd046552 100644
--- a/swat/images/icons/crystalsvg/32/mail_send.png
+++ b/swat2/images/icons/crystalsvg/32/mail_send.png
diff --git a/swat/images/icons/crystalsvg/32/mimetypes.png b/swat2/images/icons/crystalsvg/32/mimetypes.png
index ec40f8cf80..ec40f8cf80 100644
--- a/swat/images/icons/crystalsvg/32/mimetypes.png
+++ b/swat2/images/icons/crystalsvg/32/mimetypes.png
diff --git a/swat/images/icons/crystalsvg/32/misc.png b/swat2/images/icons/crystalsvg/32/misc.png
index 6d21477035..6d21477035 100644
--- a/swat/images/icons/crystalsvg/32/misc.png
+++ b/swat2/images/icons/crystalsvg/32/misc.png
diff --git a/swat/images/icons/crystalsvg/32/mouse.png b/swat2/images/icons/crystalsvg/32/mouse.png
index c4a2d46033..c4a2d46033 100644
--- a/swat/images/icons/crystalsvg/32/mouse.png
+++ b/swat2/images/icons/crystalsvg/32/mouse.png
diff --git a/swat/images/icons/crystalsvg/32/mozilla.png b/swat2/images/icons/crystalsvg/32/mozilla.png
index e9b48d5e0a..e9b48d5e0a 100644
--- a/swat/images/icons/crystalsvg/32/mozilla.png
+++ b/swat2/images/icons/crystalsvg/32/mozilla.png
diff --git a/swat/images/icons/crystalsvg/32/mycomputer.png b/swat2/images/icons/crystalsvg/32/mycomputer.png
index ac0954880f..ac0954880f 100644
--- a/swat/images/icons/crystalsvg/32/mycomputer.png
+++ b/swat2/images/icons/crystalsvg/32/mycomputer.png
diff --git a/swat/images/icons/crystalsvg/32/mymac.png b/swat2/images/icons/crystalsvg/32/mymac.png
index 5eefb938e3..5eefb938e3 100644
--- a/swat/images/icons/crystalsvg/32/mymac.png
+++ b/swat2/images/icons/crystalsvg/32/mymac.png
diff --git a/swat/images/icons/crystalsvg/32/netscape.png b/swat2/images/icons/crystalsvg/32/netscape.png
index 9167a85051..9167a85051 100644
--- a/swat/images/icons/crystalsvg/32/netscape.png
+++ b/swat2/images/icons/crystalsvg/32/netscape.png
diff --git a/swat/images/icons/crystalsvg/32/network.png b/swat2/images/icons/crystalsvg/32/network.png
index 8175a4aeca..8175a4aeca 100644
--- a/swat/images/icons/crystalsvg/32/network.png
+++ b/swat2/images/icons/crystalsvg/32/network.png
diff --git a/swat/images/icons/crystalsvg/32/opera.png b/swat2/images/icons/crystalsvg/32/opera.png
index 616f3ab6df..616f3ab6df 100644
--- a/swat/images/icons/crystalsvg/32/opera.png
+++ b/swat2/images/icons/crystalsvg/32/opera.png
diff --git a/swat/images/icons/crystalsvg/32/package.png b/swat2/images/icons/crystalsvg/32/package.png
index e13d3d500f..e13d3d500f 100644
--- a/swat/images/icons/crystalsvg/32/package.png
+++ b/swat2/images/icons/crystalsvg/32/package.png
diff --git a/swat/images/icons/crystalsvg/32/password.png b/swat2/images/icons/crystalsvg/32/password.png
index f59040a8e4..f59040a8e4 100644
--- a/swat/images/icons/crystalsvg/32/password.png
+++ b/swat2/images/icons/crystalsvg/32/password.png
diff --git a/swat/images/icons/crystalsvg/32/penguin.png b/swat2/images/icons/crystalsvg/32/penguin.png
index 28f86e3a57..28f86e3a57 100644
--- a/swat/images/icons/crystalsvg/32/penguin.png
+++ b/swat2/images/icons/crystalsvg/32/penguin.png
diff --git a/swat/images/icons/crystalsvg/32/pipe.png b/swat2/images/icons/crystalsvg/32/pipe.png
index b23fad2f25..b23fad2f25 100644
--- a/swat/images/icons/crystalsvg/32/pipe.png
+++ b/swat2/images/icons/crystalsvg/32/pipe.png
diff --git a/swat/images/icons/crystalsvg/32/proxy.png b/swat2/images/icons/crystalsvg/32/proxy.png
index 46f68b2431..46f68b2431 100644
--- a/swat/images/icons/crystalsvg/32/proxy.png
+++ b/swat2/images/icons/crystalsvg/32/proxy.png
diff --git a/swat/images/icons/crystalsvg/32/quicktime.png b/swat2/images/icons/crystalsvg/32/quicktime.png
index 0b56fd25ab..0b56fd25ab 100644
--- a/swat/images/icons/crystalsvg/32/quicktime.png
+++ b/swat2/images/icons/crystalsvg/32/quicktime.png
diff --git a/swat/images/icons/crystalsvg/32/realplayer.png b/swat2/images/icons/crystalsvg/32/realplayer.png
index edb1eef304..edb1eef304 100644
--- a/swat/images/icons/crystalsvg/32/realplayer.png
+++ b/swat2/images/icons/crystalsvg/32/realplayer.png
diff --git a/swat/images/icons/crystalsvg/32/redo.png b/swat2/images/icons/crystalsvg/32/redo.png
index 8a065ddae6..8a065ddae6 100644
--- a/swat/images/icons/crystalsvg/32/redo.png
+++ b/swat2/images/icons/crystalsvg/32/redo.png
diff --git a/swat/images/icons/crystalsvg/32/reload.png b/swat2/images/icons/crystalsvg/32/reload.png
index b6b5cc1ffa..b6b5cc1ffa 100644
--- a/swat/images/icons/crystalsvg/32/reload.png
+++ b/swat2/images/icons/crystalsvg/32/reload.png
diff --git a/swat/images/icons/crystalsvg/32/run.png b/swat2/images/icons/crystalsvg/32/run.png
index 6d21477035..6d21477035 100644
--- a/swat/images/icons/crystalsvg/32/run.png
+++ b/swat2/images/icons/crystalsvg/32/run.png
diff --git a/swat/images/icons/crystalsvg/32/search.png b/swat2/images/icons/crystalsvg/32/search.png
index f507381463..f507381463 100644
--- a/swat/images/icons/crystalsvg/32/search.png
+++ b/swat2/images/icons/crystalsvg/32/search.png
diff --git a/swat/images/icons/crystalsvg/32/services.png b/swat2/images/icons/crystalsvg/32/services.png
index 67d84fb438..67d84fb438 100644
--- a/swat/images/icons/crystalsvg/32/services.png
+++ b/swat2/images/icons/crystalsvg/32/services.png
diff --git a/swat/images/icons/crystalsvg/32/socket.png b/swat2/images/icons/crystalsvg/32/socket.png
index 9118062d94..9118062d94 100644
--- a/swat/images/icons/crystalsvg/32/socket.png
+++ b/swat2/images/icons/crystalsvg/32/socket.png
diff --git a/swat/images/icons/crystalsvg/32/stop.png b/swat2/images/icons/crystalsvg/32/stop.png
index 62823a1cb5..62823a1cb5 100644
--- a/swat/images/icons/crystalsvg/32/stop.png
+++ b/swat2/images/icons/crystalsvg/32/stop.png
diff --git a/swat/images/icons/crystalsvg/32/style.png b/swat2/images/icons/crystalsvg/32/style.png
index 2e29a93a06..2e29a93a06 100644
--- a/swat/images/icons/crystalsvg/32/style.png
+++ b/swat2/images/icons/crystalsvg/32/style.png
diff --git a/swat/images/icons/crystalsvg/32/stylesheet.png b/swat2/images/icons/crystalsvg/32/stylesheet.png
index ab8918c30f..ab8918c30f 100644
--- a/swat/images/icons/crystalsvg/32/stylesheet.png
+++ b/swat2/images/icons/crystalsvg/32/stylesheet.png
diff --git a/swat/images/icons/crystalsvg/32/todo.png b/swat2/images/icons/crystalsvg/32/todo.png
index 7d113f111d..7d113f111d 100644
--- a/swat/images/icons/crystalsvg/32/todo.png
+++ b/swat2/images/icons/crystalsvg/32/todo.png
diff --git a/swat/images/icons/crystalsvg/32/tux.png b/swat2/images/icons/crystalsvg/32/tux.png
index c0c562ed80..c0c562ed80 100644
--- a/swat/images/icons/crystalsvg/32/tux.png
+++ b/swat2/images/icons/crystalsvg/32/tux.png
diff --git a/swat/images/icons/crystalsvg/32/up.png b/swat2/images/icons/crystalsvg/32/up.png
index 4c06a24b26..4c06a24b26 100644
--- a/swat/images/icons/crystalsvg/32/up.png
+++ b/swat2/images/icons/crystalsvg/32/up.png
diff --git a/swat/images/icons/crystalsvg/48/access.png b/swat2/images/icons/crystalsvg/48/access.png
index 2b5f2e6542..2b5f2e6542 100644
--- a/swat/images/icons/crystalsvg/48/access.png
+++ b/swat2/images/icons/crystalsvg/48/access.png
diff --git a/swat/images/icons/crystalsvg/48/agent.png b/swat2/images/icons/crystalsvg/48/agent.png
index 50864ebc14..50864ebc14 100644
--- a/swat/images/icons/crystalsvg/48/agent.png
+++ b/swat2/images/icons/crystalsvg/48/agent.png
diff --git a/swat/images/icons/crystalsvg/48/antivirus.png b/swat2/images/icons/crystalsvg/48/antivirus.png
index 2218bf15b5..2218bf15b5 100644
--- a/swat/images/icons/crystalsvg/48/antivirus.png
+++ b/swat2/images/icons/crystalsvg/48/antivirus.png
diff --git a/swat/images/icons/crystalsvg/48/back.png b/swat2/images/icons/crystalsvg/48/back.png
index fb16850c25..fb16850c25 100644
--- a/swat/images/icons/crystalsvg/48/back.png
+++ b/swat2/images/icons/crystalsvg/48/back.png
diff --git a/swat/images/icons/crystalsvg/48/background.png b/swat2/images/icons/crystalsvg/48/background.png
index 7b7bf37dd0..7b7bf37dd0 100644
--- a/swat/images/icons/crystalsvg/48/background.png
+++ b/swat2/images/icons/crystalsvg/48/background.png
diff --git a/swat/images/icons/crystalsvg/48/bell.png b/swat2/images/icons/crystalsvg/48/bell.png
index 0c4b6c5e30..0c4b6c5e30 100644
--- a/swat/images/icons/crystalsvg/48/bell.png
+++ b/swat2/images/icons/crystalsvg/48/bell.png
diff --git a/swat/images/icons/crystalsvg/48/blockdevice.png b/swat2/images/icons/crystalsvg/48/blockdevice.png
index 894d1485ea..894d1485ea 100644
--- a/swat/images/icons/crystalsvg/48/blockdevice.png
+++ b/swat2/images/icons/crystalsvg/48/blockdevice.png
diff --git a/swat/images/icons/crystalsvg/48/browser.png b/swat2/images/icons/crystalsvg/48/browser.png
index 5452ee3f09..5452ee3f09 100644
--- a/swat/images/icons/crystalsvg/48/browser.png
+++ b/swat2/images/icons/crystalsvg/48/browser.png
diff --git a/swat/images/icons/crystalsvg/48/cache.png b/swat2/images/icons/crystalsvg/48/cache.png
index df779f4b38..df779f4b38 100644
--- a/swat/images/icons/crystalsvg/48/cache.png
+++ b/swat2/images/icons/crystalsvg/48/cache.png
diff --git a/swat/images/icons/crystalsvg/48/clock.png b/swat2/images/icons/crystalsvg/48/clock.png
index b974797592..b974797592 100644
--- a/swat/images/icons/crystalsvg/48/clock.png
+++ b/swat2/images/icons/crystalsvg/48/clock.png
diff --git a/swat/images/icons/crystalsvg/48/colors.png b/swat2/images/icons/crystalsvg/48/colors.png
index 4be4e3501f..4be4e3501f 100644
--- a/swat/images/icons/crystalsvg/48/colors.png
+++ b/swat2/images/icons/crystalsvg/48/colors.png
diff --git a/swat/images/icons/crystalsvg/48/core.png b/swat2/images/icons/crystalsvg/48/core.png
index 92af81b0df..92af81b0df 100644
--- a/swat/images/icons/crystalsvg/48/core.png
+++ b/swat2/images/icons/crystalsvg/48/core.png
diff --git a/swat/images/icons/crystalsvg/48/date.png b/swat2/images/icons/crystalsvg/48/date.png
index a510951db4..a510951db4 100644
--- a/swat/images/icons/crystalsvg/48/date.png
+++ b/swat2/images/icons/crystalsvg/48/date.png
diff --git a/swat/images/icons/crystalsvg/48/desktop.png b/swat2/images/icons/crystalsvg/48/desktop.png
index 7abb750d40..7abb750d40 100644
--- a/swat/images/icons/crystalsvg/48/desktop.png
+++ b/swat2/images/icons/crystalsvg/48/desktop.png
diff --git a/swat/images/icons/crystalsvg/48/display.png b/swat2/images/icons/crystalsvg/48/display.png
index de7227329e..de7227329e 100644
--- a/swat/images/icons/crystalsvg/48/display.png
+++ b/swat2/images/icons/crystalsvg/48/display.png
diff --git a/swat/images/icons/crystalsvg/48/document.png b/swat2/images/icons/crystalsvg/48/document.png
index 21f079bf42..21f079bf42 100644
--- a/swat/images/icons/crystalsvg/48/document.png
+++ b/swat2/images/icons/crystalsvg/48/document.png
diff --git a/swat/images/icons/crystalsvg/48/email.png b/swat2/images/icons/crystalsvg/48/email.png
index 431e6925fe..431e6925fe 100644
--- a/swat/images/icons/crystalsvg/48/email.png
+++ b/swat2/images/icons/crystalsvg/48/email.png
diff --git a/swat/images/icons/crystalsvg/48/empty.png b/swat2/images/icons/crystalsvg/48/empty.png
index 3cd16fc1db..3cd16fc1db 100644
--- a/swat/images/icons/crystalsvg/48/empty.png
+++ b/swat2/images/icons/crystalsvg/48/empty.png
diff --git a/swat/images/icons/crystalsvg/48/encrypted.png b/swat2/images/icons/crystalsvg/48/encrypted.png
index b4ada7ad5a..b4ada7ad5a 100644
--- a/swat/images/icons/crystalsvg/48/encrypted.png
+++ b/swat2/images/icons/crystalsvg/48/encrypted.png
diff --git a/swat/images/icons/crystalsvg/48/energy.png b/swat2/images/icons/crystalsvg/48/energy.png
index 1e033aba75..1e033aba75 100644
--- a/swat/images/icons/crystalsvg/48/energy.png
+++ b/swat2/images/icons/crystalsvg/48/energy.png
diff --git a/swat/images/icons/crystalsvg/48/error.png b/swat2/images/icons/crystalsvg/48/error.png
index 99579f1320..99579f1320 100644
--- a/swat/images/icons/crystalsvg/48/error.png
+++ b/swat2/images/icons/crystalsvg/48/error.png
diff --git a/swat/images/icons/crystalsvg/48/exec.png b/swat2/images/icons/crystalsvg/48/exec.png
index bb18406bd9..bb18406bd9 100644
--- a/swat/images/icons/crystalsvg/48/exec.png
+++ b/swat2/images/icons/crystalsvg/48/exec.png
diff --git a/swat/images/icons/crystalsvg/48/favorites.png b/swat2/images/icons/crystalsvg/48/favorites.png
index d1f5e91ccd..d1f5e91ccd 100644
--- a/swat/images/icons/crystalsvg/48/favorites.png
+++ b/swat2/images/icons/crystalsvg/48/favorites.png
diff --git a/swat/images/icons/crystalsvg/48/fileprint.png b/swat2/images/icons/crystalsvg/48/fileprint.png
index 2be5baa693..2be5baa693 100644
--- a/swat/images/icons/crystalsvg/48/fileprint.png
+++ b/swat2/images/icons/crystalsvg/48/fileprint.png
diff --git a/swat/images/icons/crystalsvg/48/folder.png b/swat2/images/icons/crystalsvg/48/folder.png
index 4c57fb96a7..4c57fb96a7 100644
--- a/swat/images/icons/crystalsvg/48/folder.png
+++ b/swat2/images/icons/crystalsvg/48/folder.png
diff --git a/swat/images/icons/crystalsvg/48/folder_home.png b/swat2/images/icons/crystalsvg/48/folder_home.png
index d08e6ab000..d08e6ab000 100644
--- a/swat/images/icons/crystalsvg/48/folder_home.png
+++ b/swat2/images/icons/crystalsvg/48/folder_home.png
diff --git a/swat/images/icons/crystalsvg/48/folder_important.png b/swat2/images/icons/crystalsvg/48/folder_important.png
index c8fe646fae..c8fe646fae 100644
--- a/swat/images/icons/crystalsvg/48/folder_important.png
+++ b/swat2/images/icons/crystalsvg/48/folder_important.png
diff --git a/swat/images/icons/crystalsvg/48/folder_locked.png b/swat2/images/icons/crystalsvg/48/folder_locked.png
index 3b24364d4c..3b24364d4c 100644
--- a/swat/images/icons/crystalsvg/48/folder_locked.png
+++ b/swat2/images/icons/crystalsvg/48/folder_locked.png
diff --git a/swat/images/icons/crystalsvg/48/folder_open.png b/swat2/images/icons/crystalsvg/48/folder_open.png
index 3996a2cdba..3996a2cdba 100644
--- a/swat/images/icons/crystalsvg/48/folder_open.png
+++ b/swat2/images/icons/crystalsvg/48/folder_open.png
diff --git a/swat/images/icons/crystalsvg/48/font.png b/swat2/images/icons/crystalsvg/48/font.png
index 21a04810ef..21a04810ef 100644
--- a/swat/images/icons/crystalsvg/48/font.png
+++ b/swat2/images/icons/crystalsvg/48/font.png
diff --git a/swat/images/icons/crystalsvg/48/forward.png b/swat2/images/icons/crystalsvg/48/forward.png
index 69d0e53940..69d0e53940 100644
--- a/swat/images/icons/crystalsvg/48/forward.png
+++ b/swat2/images/icons/crystalsvg/48/forward.png
diff --git a/swat/images/icons/crystalsvg/48/gohome.png b/swat2/images/icons/crystalsvg/48/gohome.png
index d08e6ab000..d08e6ab000 100644
--- a/swat/images/icons/crystalsvg/48/gohome.png
+++ b/swat2/images/icons/crystalsvg/48/gohome.png
diff --git a/swat/images/icons/crystalsvg/48/hwinfo.png b/swat2/images/icons/crystalsvg/48/hwinfo.png
index 67ba0e965b..67ba0e965b 100644
--- a/swat/images/icons/crystalsvg/48/hwinfo.png
+++ b/swat2/images/icons/crystalsvg/48/hwinfo.png
diff --git a/swat/images/icons/crystalsvg/48/icons.png b/swat2/images/icons/crystalsvg/48/icons.png
index a9100e732d..a9100e732d 100644
--- a/swat/images/icons/crystalsvg/48/icons.png
+++ b/swat2/images/icons/crystalsvg/48/icons.png
diff --git a/swat/images/icons/crystalsvg/48/iconthemes.png b/swat2/images/icons/crystalsvg/48/iconthemes.png
index 05c6c4b46c..05c6c4b46c 100644
--- a/swat/images/icons/crystalsvg/48/iconthemes.png
+++ b/swat2/images/icons/crystalsvg/48/iconthemes.png
diff --git a/swat/images/icons/crystalsvg/48/important.png b/swat2/images/icons/crystalsvg/48/important.png
index fc64e63241..fc64e63241 100644
--- a/swat/images/icons/crystalsvg/48/important.png
+++ b/swat2/images/icons/crystalsvg/48/important.png
diff --git a/swat/images/icons/crystalsvg/48/info.png b/swat2/images/icons/crystalsvg/48/info.png
index f21142b518..f21142b518 100644
--- a/swat/images/icons/crystalsvg/48/info.png
+++ b/swat2/images/icons/crystalsvg/48/info.png
diff --git a/swat/images/icons/crystalsvg/48/kcoloredit.png b/swat2/images/icons/crystalsvg/48/kcoloredit.png
index 4be4e3501f..4be4e3501f 100644
--- a/swat/images/icons/crystalsvg/48/kcoloredit.png
+++ b/swat2/images/icons/crystalsvg/48/kcoloredit.png
diff --git a/swat/images/icons/crystalsvg/48/kcontrol.png b/swat2/images/icons/crystalsvg/48/kcontrol.png
index bde85be5fa..bde85be5fa 100644
--- a/swat/images/icons/crystalsvg/48/kcontrol.png
+++ b/swat2/images/icons/crystalsvg/48/kcontrol.png
diff --git a/swat/images/icons/crystalsvg/48/keyboard.png b/swat2/images/icons/crystalsvg/48/keyboard.png
index 04c8211479..04c8211479 100644
--- a/swat/images/icons/crystalsvg/48/keyboard.png
+++ b/swat2/images/icons/crystalsvg/48/keyboard.png
diff --git a/swat/images/icons/crystalsvg/48/khelpcenter.png b/swat2/images/icons/crystalsvg/48/khelpcenter.png
index 970075d939..970075d939 100644
--- a/swat/images/icons/crystalsvg/48/khelpcenter.png
+++ b/swat2/images/icons/crystalsvg/48/khelpcenter.png
diff --git a/swat/images/icons/crystalsvg/48/kmix.png b/swat2/images/icons/crystalsvg/48/kmix.png
index e88e686623..e88e686623 100644
--- a/swat/images/icons/crystalsvg/48/kmix.png
+++ b/swat2/images/icons/crystalsvg/48/kmix.png
diff --git a/swat/images/icons/crystalsvg/48/knotify.png b/swat2/images/icons/crystalsvg/48/knotify.png
index b0aa6e8fa9..b0aa6e8fa9 100644
--- a/swat/images/icons/crystalsvg/48/knotify.png
+++ b/swat2/images/icons/crystalsvg/48/knotify.png
diff --git a/swat/images/icons/crystalsvg/48/konqueror.png b/swat2/images/icons/crystalsvg/48/konqueror.png
index 0edd9b5b6e..0edd9b5b6e 100644
--- a/swat/images/icons/crystalsvg/48/konqueror.png
+++ b/swat2/images/icons/crystalsvg/48/konqueror.png
diff --git a/swat/images/icons/crystalsvg/48/kpackage.png b/swat2/images/icons/crystalsvg/48/kpackage.png
index 4f629eaf36..4f629eaf36 100644
--- a/swat/images/icons/crystalsvg/48/kpackage.png
+++ b/swat2/images/icons/crystalsvg/48/kpackage.png
diff --git a/swat/images/icons/crystalsvg/48/kpaint.png b/swat2/images/icons/crystalsvg/48/kpaint.png
index 2de7bfc90c..2de7bfc90c 100644
--- a/swat/images/icons/crystalsvg/48/kpaint.png
+++ b/swat2/images/icons/crystalsvg/48/kpaint.png
diff --git a/swat/images/icons/crystalsvg/48/krita.png b/swat2/images/icons/crystalsvg/48/krita.png
index b6a47d0bbd..b6a47d0bbd 100644
--- a/swat/images/icons/crystalsvg/48/krita.png
+++ b/swat2/images/icons/crystalsvg/48/krita.png
diff --git a/swat/images/icons/crystalsvg/48/ksmiletris.png b/swat2/images/icons/crystalsvg/48/ksmiletris.png
index 17696b2c1f..17696b2c1f 100644
--- a/swat/images/icons/crystalsvg/48/ksmiletris.png
+++ b/swat2/images/icons/crystalsvg/48/ksmiletris.png
diff --git a/swat/images/icons/crystalsvg/48/ksnapshot.png b/swat2/images/icons/crystalsvg/48/ksnapshot.png
index f962f5a065..f962f5a065 100644
--- a/swat/images/icons/crystalsvg/48/ksnapshot.png
+++ b/swat2/images/icons/crystalsvg/48/ksnapshot.png
diff --git a/swat/images/icons/crystalsvg/48/ktalkd.png b/swat2/images/icons/crystalsvg/48/ktalkd.png
index 0ad792c745..0ad792c745 100644
--- a/swat/images/icons/crystalsvg/48/ktalkd.png
+++ b/swat2/images/icons/crystalsvg/48/ktalkd.png
diff --git a/swat/images/icons/crystalsvg/48/ktip.png b/swat2/images/icons/crystalsvg/48/ktip.png
index de04d3aa7d..de04d3aa7d 100644
--- a/swat/images/icons/crystalsvg/48/ktip.png
+++ b/swat2/images/icons/crystalsvg/48/ktip.png
diff --git a/swat/images/icons/crystalsvg/48/kuser.png b/swat2/images/icons/crystalsvg/48/kuser.png
index d8b241ca96..d8b241ca96 100644
--- a/swat/images/icons/crystalsvg/48/kuser.png
+++ b/swat2/images/icons/crystalsvg/48/kuser.png
diff --git a/swat/images/icons/crystalsvg/48/kview.png b/swat2/images/icons/crystalsvg/48/kview.png
index e225390c34..e225390c34 100644
--- a/swat/images/icons/crystalsvg/48/kview.png
+++ b/swat2/images/icons/crystalsvg/48/kview.png
diff --git a/swat/images/icons/crystalsvg/48/linuxconf.png b/swat2/images/icons/crystalsvg/48/linuxconf.png
index 1ed04dd39a..1ed04dd39a 100644
--- a/swat/images/icons/crystalsvg/48/linuxconf.png
+++ b/swat2/images/icons/crystalsvg/48/linuxconf.png
diff --git a/swat/images/icons/crystalsvg/48/locale.png b/swat2/images/icons/crystalsvg/48/locale.png
index e7defacbc0..e7defacbc0 100644
--- a/swat/images/icons/crystalsvg/48/locale.png
+++ b/swat2/images/icons/crystalsvg/48/locale.png
diff --git a/swat/images/icons/crystalsvg/48/looknfeel.png b/swat2/images/icons/crystalsvg/48/looknfeel.png
index 342ebd7af5..342ebd7af5 100644
--- a/swat/images/icons/crystalsvg/48/looknfeel.png
+++ b/swat2/images/icons/crystalsvg/48/looknfeel.png
diff --git a/swat/images/icons/crystalsvg/48/mac.png b/swat2/images/icons/crystalsvg/48/mac.png
index 40b1613efa..40b1613efa 100644
--- a/swat/images/icons/crystalsvg/48/mac.png
+++ b/swat2/images/icons/crystalsvg/48/mac.png
diff --git a/swat/images/icons/crystalsvg/48/mail.png b/swat2/images/icons/crystalsvg/48/mail.png
index b865fd8533..b865fd8533 100644
--- a/swat/images/icons/crystalsvg/48/mail.png
+++ b/swat2/images/icons/crystalsvg/48/mail.png
diff --git a/swat/images/icons/crystalsvg/48/mouse.png b/swat2/images/icons/crystalsvg/48/mouse.png
index a35c2405ee..a35c2405ee 100644
--- a/swat/images/icons/crystalsvg/48/mouse.png
+++ b/swat2/images/icons/crystalsvg/48/mouse.png
diff --git a/swat/images/icons/crystalsvg/48/mozilla.png b/swat2/images/icons/crystalsvg/48/mozilla.png
index 0655075901..0655075901 100644
--- a/swat/images/icons/crystalsvg/48/mozilla.png
+++ b/swat2/images/icons/crystalsvg/48/mozilla.png
diff --git a/swat/images/icons/crystalsvg/48/mycomputer.png b/swat2/images/icons/crystalsvg/48/mycomputer.png
index abe2119c6c..abe2119c6c 100644
--- a/swat/images/icons/crystalsvg/48/mycomputer.png
+++ b/swat2/images/icons/crystalsvg/48/mycomputer.png
diff --git a/swat/images/icons/crystalsvg/48/mymac.png b/swat2/images/icons/crystalsvg/48/mymac.png
index 7d7eb97c8d..7d7eb97c8d 100644
--- a/swat/images/icons/crystalsvg/48/mymac.png
+++ b/swat2/images/icons/crystalsvg/48/mymac.png
diff --git a/swat/images/icons/crystalsvg/48/netscape.png b/swat2/images/icons/crystalsvg/48/netscape.png
index 795ade4373..795ade4373 100644
--- a/swat/images/icons/crystalsvg/48/netscape.png
+++ b/swat2/images/icons/crystalsvg/48/netscape.png
diff --git a/swat/images/icons/crystalsvg/48/network.png b/swat2/images/icons/crystalsvg/48/network.png
index 1b50abdf9a..1b50abdf9a 100644
--- a/swat/images/icons/crystalsvg/48/network.png
+++ b/swat2/images/icons/crystalsvg/48/network.png
diff --git a/swat/images/icons/crystalsvg/48/opera.png b/swat2/images/icons/crystalsvg/48/opera.png
index f092f4ec27..f092f4ec27 100644
--- a/swat/images/icons/crystalsvg/48/opera.png
+++ b/swat2/images/icons/crystalsvg/48/opera.png
diff --git a/swat/images/icons/crystalsvg/48/package.png b/swat2/images/icons/crystalsvg/48/package.png
index db59aecca6..db59aecca6 100644
--- a/swat/images/icons/crystalsvg/48/package.png
+++ b/swat2/images/icons/crystalsvg/48/package.png
diff --git a/swat/images/icons/crystalsvg/48/password.png b/swat2/images/icons/crystalsvg/48/password.png
index cfe82a9350..cfe82a9350 100644
--- a/swat/images/icons/crystalsvg/48/password.png
+++ b/swat2/images/icons/crystalsvg/48/password.png
diff --git a/swat/images/icons/crystalsvg/48/penguin.png b/swat2/images/icons/crystalsvg/48/penguin.png
index 61c96a2b93..61c96a2b93 100644
--- a/swat/images/icons/crystalsvg/48/penguin.png
+++ b/swat2/images/icons/crystalsvg/48/penguin.png
diff --git a/swat/images/icons/crystalsvg/48/pipe.png b/swat2/images/icons/crystalsvg/48/pipe.png
index 9b75ef8341..9b75ef8341 100644
--- a/swat/images/icons/crystalsvg/48/pipe.png
+++ b/swat2/images/icons/crystalsvg/48/pipe.png
diff --git a/swat/images/icons/crystalsvg/48/proxy.png b/swat2/images/icons/crystalsvg/48/proxy.png
index 3683e298c1..3683e298c1 100644
--- a/swat/images/icons/crystalsvg/48/proxy.png
+++ b/swat2/images/icons/crystalsvg/48/proxy.png
diff --git a/swat/images/icons/crystalsvg/48/quicktime.png b/swat2/images/icons/crystalsvg/48/quicktime.png
index d4f6b2bb9d..d4f6b2bb9d 100644
--- a/swat/images/icons/crystalsvg/48/quicktime.png
+++ b/swat2/images/icons/crystalsvg/48/quicktime.png
diff --git a/swat/images/icons/crystalsvg/48/realplayer.png b/swat2/images/icons/crystalsvg/48/realplayer.png
index 97138086c4..97138086c4 100644
--- a/swat/images/icons/crystalsvg/48/realplayer.png
+++ b/swat2/images/icons/crystalsvg/48/realplayer.png
diff --git a/swat/images/icons/crystalsvg/48/reload.png b/swat2/images/icons/crystalsvg/48/reload.png
index 18304065d1..18304065d1 100644
--- a/swat/images/icons/crystalsvg/48/reload.png
+++ b/swat2/images/icons/crystalsvg/48/reload.png
diff --git a/swat/images/icons/crystalsvg/48/services.png b/swat2/images/icons/crystalsvg/48/services.png
index 38e1e38dc5..38e1e38dc5 100644
--- a/swat/images/icons/crystalsvg/48/services.png
+++ b/swat2/images/icons/crystalsvg/48/services.png
diff --git a/swat/images/icons/crystalsvg/48/socket.png b/swat2/images/icons/crystalsvg/48/socket.png
index 98bfb35fd0..98bfb35fd0 100644
--- a/swat/images/icons/crystalsvg/48/socket.png
+++ b/swat2/images/icons/crystalsvg/48/socket.png
diff --git a/swat/images/icons/crystalsvg/48/style.png b/swat2/images/icons/crystalsvg/48/style.png
index 5d8af7e878..5d8af7e878 100644
--- a/swat/images/icons/crystalsvg/48/style.png
+++ b/swat2/images/icons/crystalsvg/48/style.png
diff --git a/swat/images/icons/crystalsvg/48/stylesheet.png b/swat2/images/icons/crystalsvg/48/stylesheet.png
index f74586b3c1..f74586b3c1 100644
--- a/swat/images/icons/crystalsvg/48/stylesheet.png
+++ b/swat2/images/icons/crystalsvg/48/stylesheet.png
diff --git a/swat/images/icons/crystalsvg/48/tux.png b/swat2/images/icons/crystalsvg/48/tux.png
index d75f61b08e..d75f61b08e 100644
--- a/swat/images/icons/crystalsvg/48/tux.png
+++ b/swat2/images/icons/crystalsvg/48/tux.png
diff --git a/swat/images/icons/crystalsvg/48/up.png b/swat2/images/icons/crystalsvg/48/up.png
index 5231986509..5231986509 100644
--- a/swat/images/icons/crystalsvg/48/up.png
+++ b/swat2/images/icons/crystalsvg/48/up.png
diff --git a/swat/images/icons/crystalsvg/64/antivirus.png b/swat2/images/icons/crystalsvg/64/antivirus.png
index c4aac8acaf..c4aac8acaf 100644
--- a/swat/images/icons/crystalsvg/64/antivirus.png
+++ b/swat2/images/icons/crystalsvg/64/antivirus.png
diff --git a/swat/images/icons/crystalsvg/64/back.png b/swat2/images/icons/crystalsvg/64/back.png
index 1941c2fdee..1941c2fdee 100644
--- a/swat/images/icons/crystalsvg/64/back.png
+++ b/swat2/images/icons/crystalsvg/64/back.png
diff --git a/swat/images/icons/crystalsvg/64/background.png b/swat2/images/icons/crystalsvg/64/background.png
index 617f37ba73..617f37ba73 100644
--- a/swat/images/icons/crystalsvg/64/background.png
+++ b/swat2/images/icons/crystalsvg/64/background.png
diff --git a/swat/images/icons/crystalsvg/64/bell.png b/swat2/images/icons/crystalsvg/64/bell.png
index f83c4092e8..f83c4092e8 100644
--- a/swat/images/icons/crystalsvg/64/bell.png
+++ b/swat2/images/icons/crystalsvg/64/bell.png
diff --git a/swat/images/icons/crystalsvg/64/blockdevice.png b/swat2/images/icons/crystalsvg/64/blockdevice.png
index 656b6e73ac..656b6e73ac 100644
--- a/swat/images/icons/crystalsvg/64/blockdevice.png
+++ b/swat2/images/icons/crystalsvg/64/blockdevice.png
diff --git a/swat/images/icons/crystalsvg/64/browser.png b/swat2/images/icons/crystalsvg/64/browser.png
index 2029384e38..2029384e38 100644
--- a/swat/images/icons/crystalsvg/64/browser.png
+++ b/swat2/images/icons/crystalsvg/64/browser.png
diff --git a/swat/images/icons/crystalsvg/64/cache.png b/swat2/images/icons/crystalsvg/64/cache.png
index a49b55d1dd..a49b55d1dd 100644
--- a/swat/images/icons/crystalsvg/64/cache.png
+++ b/swat2/images/icons/crystalsvg/64/cache.png
diff --git a/swat/images/icons/crystalsvg/64/clock.png b/swat2/images/icons/crystalsvg/64/clock.png
index 5698b5e051..5698b5e051 100644
--- a/swat/images/icons/crystalsvg/64/clock.png
+++ b/swat2/images/icons/crystalsvg/64/clock.png
diff --git a/swat/images/icons/crystalsvg/64/colors.png b/swat2/images/icons/crystalsvg/64/colors.png
index 6c76da0b02..6c76da0b02 100644
--- a/swat/images/icons/crystalsvg/64/colors.png
+++ b/swat2/images/icons/crystalsvg/64/colors.png
diff --git a/swat/images/icons/crystalsvg/64/core.png b/swat2/images/icons/crystalsvg/64/core.png
index 3ea7a37495..3ea7a37495 100644
--- a/swat/images/icons/crystalsvg/64/core.png
+++ b/swat2/images/icons/crystalsvg/64/core.png
diff --git a/swat/images/icons/crystalsvg/64/date.png b/swat2/images/icons/crystalsvg/64/date.png
index 06761d77ea..06761d77ea 100644
--- a/swat/images/icons/crystalsvg/64/date.png
+++ b/swat2/images/icons/crystalsvg/64/date.png
diff --git a/swat/images/icons/crystalsvg/64/desktop.png b/swat2/images/icons/crystalsvg/64/desktop.png
index e0dc3b02e9..e0dc3b02e9 100644
--- a/swat/images/icons/crystalsvg/64/desktop.png
+++ b/swat2/images/icons/crystalsvg/64/desktop.png
diff --git a/swat/images/icons/crystalsvg/64/display.png b/swat2/images/icons/crystalsvg/64/display.png
index 81beb9ad52..81beb9ad52 100644
--- a/swat/images/icons/crystalsvg/64/display.png
+++ b/swat2/images/icons/crystalsvg/64/display.png
diff --git a/swat/images/icons/crystalsvg/64/document.png b/swat2/images/icons/crystalsvg/64/document.png
index ed0799b928..ed0799b928 100644
--- a/swat/images/icons/crystalsvg/64/document.png
+++ b/swat2/images/icons/crystalsvg/64/document.png
diff --git a/swat/images/icons/crystalsvg/64/email.png b/swat2/images/icons/crystalsvg/64/email.png
index 8a2ac80b59..8a2ac80b59 100644
--- a/swat/images/icons/crystalsvg/64/email.png
+++ b/swat2/images/icons/crystalsvg/64/email.png
diff --git a/swat/images/icons/crystalsvg/64/empty.png b/swat2/images/icons/crystalsvg/64/empty.png
index 2ce620f4c2..2ce620f4c2 100644
--- a/swat/images/icons/crystalsvg/64/empty.png
+++ b/swat2/images/icons/crystalsvg/64/empty.png
diff --git a/swat/images/icons/crystalsvg/64/encrypted.png b/swat2/images/icons/crystalsvg/64/encrypted.png
index 867039f9dd..867039f9dd 100644
--- a/swat/images/icons/crystalsvg/64/encrypted.png
+++ b/swat2/images/icons/crystalsvg/64/encrypted.png
diff --git a/swat/images/icons/crystalsvg/64/energy.png b/swat2/images/icons/crystalsvg/64/energy.png
index ef4017f76c..ef4017f76c 100644
--- a/swat/images/icons/crystalsvg/64/energy.png
+++ b/swat2/images/icons/crystalsvg/64/energy.png
diff --git a/swat/images/icons/crystalsvg/64/error.png b/swat2/images/icons/crystalsvg/64/error.png
index c486063304..c486063304 100644
--- a/swat/images/icons/crystalsvg/64/error.png
+++ b/swat2/images/icons/crystalsvg/64/error.png
diff --git a/swat/images/icons/crystalsvg/64/exec.png b/swat2/images/icons/crystalsvg/64/exec.png
index da16a98fd8..da16a98fd8 100644
--- a/swat/images/icons/crystalsvg/64/exec.png
+++ b/swat2/images/icons/crystalsvg/64/exec.png
diff --git a/swat/images/icons/crystalsvg/64/fileprint.png b/swat2/images/icons/crystalsvg/64/fileprint.png
index 758bb8edbf..758bb8edbf 100644
--- a/swat/images/icons/crystalsvg/64/fileprint.png
+++ b/swat2/images/icons/crystalsvg/64/fileprint.png
diff --git a/swat/images/icons/crystalsvg/64/folder.png b/swat2/images/icons/crystalsvg/64/folder.png
index 954d31a884..954d31a884 100644
--- a/swat/images/icons/crystalsvg/64/folder.png
+++ b/swat2/images/icons/crystalsvg/64/folder.png
diff --git a/swat/images/icons/crystalsvg/64/folder_home.png b/swat2/images/icons/crystalsvg/64/folder_home.png
index acf3e4aa84..acf3e4aa84 100644
--- a/swat/images/icons/crystalsvg/64/folder_home.png
+++ b/swat2/images/icons/crystalsvg/64/folder_home.png
diff --git a/swat/images/icons/crystalsvg/64/folder_important.png b/swat2/images/icons/crystalsvg/64/folder_important.png
index a534e6cea5..a534e6cea5 100644
--- a/swat/images/icons/crystalsvg/64/folder_important.png
+++ b/swat2/images/icons/crystalsvg/64/folder_important.png
diff --git a/swat/images/icons/crystalsvg/64/folder_locked.png b/swat2/images/icons/crystalsvg/64/folder_locked.png
index 04d7b74046..04d7b74046 100644
--- a/swat/images/icons/crystalsvg/64/folder_locked.png
+++ b/swat2/images/icons/crystalsvg/64/folder_locked.png
diff --git a/swat/images/icons/crystalsvg/64/folder_open.png b/swat2/images/icons/crystalsvg/64/folder_open.png
index d454d56836..d454d56836 100644
--- a/swat/images/icons/crystalsvg/64/folder_open.png
+++ b/swat2/images/icons/crystalsvg/64/folder_open.png
diff --git a/swat/images/icons/crystalsvg/64/font.png b/swat2/images/icons/crystalsvg/64/font.png
index 7236ba2e29..7236ba2e29 100644
--- a/swat/images/icons/crystalsvg/64/font.png
+++ b/swat2/images/icons/crystalsvg/64/font.png
diff --git a/swat/images/icons/crystalsvg/64/forward.png b/swat2/images/icons/crystalsvg/64/forward.png
index 2776d66255..2776d66255 100644
--- a/swat/images/icons/crystalsvg/64/forward.png
+++ b/swat2/images/icons/crystalsvg/64/forward.png
diff --git a/swat/images/icons/crystalsvg/64/gohome.png b/swat2/images/icons/crystalsvg/64/gohome.png
index acf3e4aa84..acf3e4aa84 100644
--- a/swat/images/icons/crystalsvg/64/gohome.png
+++ b/swat2/images/icons/crystalsvg/64/gohome.png
diff --git a/swat/images/icons/crystalsvg/64/hwinfo.png b/swat2/images/icons/crystalsvg/64/hwinfo.png
index f08a5e58ec..f08a5e58ec 100644
--- a/swat/images/icons/crystalsvg/64/hwinfo.png
+++ b/swat2/images/icons/crystalsvg/64/hwinfo.png
diff --git a/swat/images/icons/crystalsvg/64/icons.png b/swat2/images/icons/crystalsvg/64/icons.png
index 3891bc74db..3891bc74db 100644
--- a/swat/images/icons/crystalsvg/64/icons.png
+++ b/swat2/images/icons/crystalsvg/64/icons.png
diff --git a/swat/images/icons/crystalsvg/64/important.png b/swat2/images/icons/crystalsvg/64/important.png
index 2da725a771..2da725a771 100644
--- a/swat/images/icons/crystalsvg/64/important.png
+++ b/swat2/images/icons/crystalsvg/64/important.png
diff --git a/swat/images/icons/crystalsvg/64/info.png b/swat2/images/icons/crystalsvg/64/info.png
index 3a75f4a78f..3a75f4a78f 100644
--- a/swat/images/icons/crystalsvg/64/info.png
+++ b/swat2/images/icons/crystalsvg/64/info.png
diff --git a/swat/images/icons/crystalsvg/64/kcoloredit.png b/swat2/images/icons/crystalsvg/64/kcoloredit.png
index 6c76da0b02..6c76da0b02 100644
--- a/swat/images/icons/crystalsvg/64/kcoloredit.png
+++ b/swat2/images/icons/crystalsvg/64/kcoloredit.png
diff --git a/swat/images/icons/crystalsvg/64/kcontrol.png b/swat2/images/icons/crystalsvg/64/kcontrol.png
index 4d4db5d657..4d4db5d657 100644
--- a/swat/images/icons/crystalsvg/64/kcontrol.png
+++ b/swat2/images/icons/crystalsvg/64/kcontrol.png
diff --git a/swat/images/icons/crystalsvg/64/keyboard.png b/swat2/images/icons/crystalsvg/64/keyboard.png
index 1a6e50f820..1a6e50f820 100644
--- a/swat/images/icons/crystalsvg/64/keyboard.png
+++ b/swat2/images/icons/crystalsvg/64/keyboard.png
diff --git a/swat/images/icons/crystalsvg/64/khelpcenter.png b/swat2/images/icons/crystalsvg/64/khelpcenter.png
index 44ddf68f4e..44ddf68f4e 100644
--- a/swat/images/icons/crystalsvg/64/khelpcenter.png
+++ b/swat2/images/icons/crystalsvg/64/khelpcenter.png
diff --git a/swat/images/icons/crystalsvg/64/kmix.png b/swat2/images/icons/crystalsvg/64/kmix.png
index fbe8e6d617..fbe8e6d617 100644
--- a/swat/images/icons/crystalsvg/64/kmix.png
+++ b/swat2/images/icons/crystalsvg/64/kmix.png
diff --git a/swat/images/icons/crystalsvg/64/knotify.png b/swat2/images/icons/crystalsvg/64/knotify.png
index 3a4d918ae6..3a4d918ae6 100644
--- a/swat/images/icons/crystalsvg/64/knotify.png
+++ b/swat2/images/icons/crystalsvg/64/knotify.png
diff --git a/swat/images/icons/crystalsvg/64/konqueror.png b/swat2/images/icons/crystalsvg/64/konqueror.png
index 530b3be173..530b3be173 100644
--- a/swat/images/icons/crystalsvg/64/konqueror.png
+++ b/swat2/images/icons/crystalsvg/64/konqueror.png
diff --git a/swat/images/icons/crystalsvg/64/kpackage.png b/swat2/images/icons/crystalsvg/64/kpackage.png
index 2053a1eb63..2053a1eb63 100644
--- a/swat/images/icons/crystalsvg/64/kpackage.png
+++ b/swat2/images/icons/crystalsvg/64/kpackage.png
diff --git a/swat/images/icons/crystalsvg/64/kpaint.png b/swat2/images/icons/crystalsvg/64/kpaint.png
index 8d602ce676..8d602ce676 100644
--- a/swat/images/icons/crystalsvg/64/kpaint.png
+++ b/swat2/images/icons/crystalsvg/64/kpaint.png
diff --git a/swat/images/icons/crystalsvg/64/krita.png b/swat2/images/icons/crystalsvg/64/krita.png
index 1b51da48e5..1b51da48e5 100644
--- a/swat/images/icons/crystalsvg/64/krita.png
+++ b/swat2/images/icons/crystalsvg/64/krita.png
diff --git a/swat/images/icons/crystalsvg/64/ksmiletris.png b/swat2/images/icons/crystalsvg/64/ksmiletris.png
index 6c9b62635d..6c9b62635d 100644
--- a/swat/images/icons/crystalsvg/64/ksmiletris.png
+++ b/swat2/images/icons/crystalsvg/64/ksmiletris.png
diff --git a/swat/images/icons/crystalsvg/64/ksnapshot.png b/swat2/images/icons/crystalsvg/64/ksnapshot.png
index d999dade44..d999dade44 100644
--- a/swat/images/icons/crystalsvg/64/ksnapshot.png
+++ b/swat2/images/icons/crystalsvg/64/ksnapshot.png
diff --git a/swat/images/icons/crystalsvg/64/ktalkd.png b/swat2/images/icons/crystalsvg/64/ktalkd.png
index e3d5be7891..e3d5be7891 100644
--- a/swat/images/icons/crystalsvg/64/ktalkd.png
+++ b/swat2/images/icons/crystalsvg/64/ktalkd.png
diff --git a/swat/images/icons/crystalsvg/64/ktip.png b/swat2/images/icons/crystalsvg/64/ktip.png
index 3741faba63..3741faba63 100644
--- a/swat/images/icons/crystalsvg/64/ktip.png
+++ b/swat2/images/icons/crystalsvg/64/ktip.png
diff --git a/swat/images/icons/crystalsvg/64/kuser.png b/swat2/images/icons/crystalsvg/64/kuser.png
index 57c5726d0a..57c5726d0a 100644
--- a/swat/images/icons/crystalsvg/64/kuser.png
+++ b/swat2/images/icons/crystalsvg/64/kuser.png
diff --git a/swat/images/icons/crystalsvg/64/kview.png b/swat2/images/icons/crystalsvg/64/kview.png
index dbe400a89c..dbe400a89c 100644
--- a/swat/images/icons/crystalsvg/64/kview.png
+++ b/swat2/images/icons/crystalsvg/64/kview.png
diff --git a/swat/images/icons/crystalsvg/64/linuxconf.png b/swat2/images/icons/crystalsvg/64/linuxconf.png
index 684ab96d6e..684ab96d6e 100644
--- a/swat/images/icons/crystalsvg/64/linuxconf.png
+++ b/swat2/images/icons/crystalsvg/64/linuxconf.png
diff --git a/swat/images/icons/crystalsvg/64/locale.png b/swat2/images/icons/crystalsvg/64/locale.png
index 042c0d3458..042c0d3458 100644
--- a/swat/images/icons/crystalsvg/64/locale.png
+++ b/swat2/images/icons/crystalsvg/64/locale.png
diff --git a/swat/images/icons/crystalsvg/64/looknfeel.png b/swat2/images/icons/crystalsvg/64/looknfeel.png
index b73346e44f..b73346e44f 100644
--- a/swat/images/icons/crystalsvg/64/looknfeel.png
+++ b/swat2/images/icons/crystalsvg/64/looknfeel.png
diff --git a/swat/images/icons/crystalsvg/64/mac.png b/swat2/images/icons/crystalsvg/64/mac.png
index 69451090e0..69451090e0 100644
--- a/swat/images/icons/crystalsvg/64/mac.png
+++ b/swat2/images/icons/crystalsvg/64/mac.png
diff --git a/swat/images/icons/crystalsvg/64/mail.png b/swat2/images/icons/crystalsvg/64/mail.png
index 398e62c871..398e62c871 100644
--- a/swat/images/icons/crystalsvg/64/mail.png
+++ b/swat2/images/icons/crystalsvg/64/mail.png
diff --git a/swat/images/icons/crystalsvg/64/mimetypes.png b/swat2/images/icons/crystalsvg/64/mimetypes.png
index 0f6db48faa..0f6db48faa 100644
--- a/swat/images/icons/crystalsvg/64/mimetypes.png
+++ b/swat2/images/icons/crystalsvg/64/mimetypes.png
diff --git a/swat/images/icons/crystalsvg/64/mouse.png b/swat2/images/icons/crystalsvg/64/mouse.png
index 6c9eb18722..6c9eb18722 100644
--- a/swat/images/icons/crystalsvg/64/mouse.png
+++ b/swat2/images/icons/crystalsvg/64/mouse.png
diff --git a/swat/images/icons/crystalsvg/64/mozilla.png b/swat2/images/icons/crystalsvg/64/mozilla.png
index f58ec26cd7..f58ec26cd7 100644
--- a/swat/images/icons/crystalsvg/64/mozilla.png
+++ b/swat2/images/icons/crystalsvg/64/mozilla.png
diff --git a/swat/images/icons/crystalsvg/64/mycomputer.png b/swat2/images/icons/crystalsvg/64/mycomputer.png
index 935e5a1f4c..935e5a1f4c 100644
--- a/swat/images/icons/crystalsvg/64/mycomputer.png
+++ b/swat2/images/icons/crystalsvg/64/mycomputer.png
diff --git a/swat/images/icons/crystalsvg/64/mymac.png b/swat2/images/icons/crystalsvg/64/mymac.png
index d72541db92..d72541db92 100644
--- a/swat/images/icons/crystalsvg/64/mymac.png
+++ b/swat2/images/icons/crystalsvg/64/mymac.png
diff --git a/swat/images/icons/crystalsvg/64/netscape.png b/swat2/images/icons/crystalsvg/64/netscape.png
index ca5c65d99a..ca5c65d99a 100644
--- a/swat/images/icons/crystalsvg/64/netscape.png
+++ b/swat2/images/icons/crystalsvg/64/netscape.png
diff --git a/swat/images/icons/crystalsvg/64/network.png b/swat2/images/icons/crystalsvg/64/network.png
index e032cf17b2..e032cf17b2 100644
--- a/swat/images/icons/crystalsvg/64/network.png
+++ b/swat2/images/icons/crystalsvg/64/network.png
diff --git a/swat/images/icons/crystalsvg/64/package.png b/swat2/images/icons/crystalsvg/64/package.png
index d43ebbd058..d43ebbd058 100644
--- a/swat/images/icons/crystalsvg/64/package.png
+++ b/swat2/images/icons/crystalsvg/64/package.png
diff --git a/swat/images/icons/crystalsvg/64/password.png b/swat2/images/icons/crystalsvg/64/password.png
index 2144538119..2144538119 100644
--- a/swat/images/icons/crystalsvg/64/password.png
+++ b/swat2/images/icons/crystalsvg/64/password.png
diff --git a/swat/images/icons/crystalsvg/64/penguin.png b/swat2/images/icons/crystalsvg/64/penguin.png
index 6c37b8920d..6c37b8920d 100644
--- a/swat/images/icons/crystalsvg/64/penguin.png
+++ b/swat2/images/icons/crystalsvg/64/penguin.png
diff --git a/swat/images/icons/crystalsvg/64/pipe.png b/swat2/images/icons/crystalsvg/64/pipe.png
index a8ab4256f2..a8ab4256f2 100644
--- a/swat/images/icons/crystalsvg/64/pipe.png
+++ b/swat2/images/icons/crystalsvg/64/pipe.png
diff --git a/swat/images/icons/crystalsvg/64/proxy.png b/swat2/images/icons/crystalsvg/64/proxy.png
index 9b5f5b6a8f..9b5f5b6a8f 100644
--- a/swat/images/icons/crystalsvg/64/proxy.png
+++ b/swat2/images/icons/crystalsvg/64/proxy.png
diff --git a/swat/images/icons/crystalsvg/64/quicktime.png b/swat2/images/icons/crystalsvg/64/quicktime.png
index 3922e74787..3922e74787 100644
--- a/swat/images/icons/crystalsvg/64/quicktime.png
+++ b/swat2/images/icons/crystalsvg/64/quicktime.png
diff --git a/swat/images/icons/crystalsvg/64/realplayer.png b/swat2/images/icons/crystalsvg/64/realplayer.png
index 5e12d742e1..5e12d742e1 100644
--- a/swat/images/icons/crystalsvg/64/realplayer.png
+++ b/swat2/images/icons/crystalsvg/64/realplayer.png
diff --git a/swat/images/icons/crystalsvg/64/reload.png b/swat2/images/icons/crystalsvg/64/reload.png
index 8f0e77ac4c..8f0e77ac4c 100644
--- a/swat/images/icons/crystalsvg/64/reload.png
+++ b/swat2/images/icons/crystalsvg/64/reload.png
diff --git a/swat/images/icons/crystalsvg/64/services.png b/swat2/images/icons/crystalsvg/64/services.png
index 90866e8c76..90866e8c76 100644
--- a/swat/images/icons/crystalsvg/64/services.png
+++ b/swat2/images/icons/crystalsvg/64/services.png
diff --git a/swat/images/icons/crystalsvg/64/socket.png b/swat2/images/icons/crystalsvg/64/socket.png
index 44574c8572..44574c8572 100644
--- a/swat/images/icons/crystalsvg/64/socket.png
+++ b/swat2/images/icons/crystalsvg/64/socket.png
diff --git a/swat/images/icons/crystalsvg/64/style.png b/swat2/images/icons/crystalsvg/64/style.png
index d3f70b0cb5..d3f70b0cb5 100644
--- a/swat/images/icons/crystalsvg/64/style.png
+++ b/swat2/images/icons/crystalsvg/64/style.png
diff --git a/swat/images/icons/crystalsvg/64/stylesheet.png b/swat2/images/icons/crystalsvg/64/stylesheet.png
index ac393bc3e9..ac393bc3e9 100644
--- a/swat/images/icons/crystalsvg/64/stylesheet.png
+++ b/swat2/images/icons/crystalsvg/64/stylesheet.png
diff --git a/swat/images/icons/crystalsvg/64/tux.png b/swat2/images/icons/crystalsvg/64/tux.png
index 99f3465e53..99f3465e53 100644
--- a/swat/images/icons/crystalsvg/64/tux.png
+++ b/swat2/images/icons/crystalsvg/64/tux.png
diff --git a/swat/images/icons/crystalsvg/64/up.png b/swat2/images/icons/crystalsvg/64/up.png
index 89f77e6c9e..89f77e6c9e 100644
--- a/swat/images/icons/crystalsvg/64/up.png
+++ b/swat2/images/icons/crystalsvg/64/up.png
diff --git a/swat/images/icons/crystalsvg/README b/swat2/images/icons/crystalsvg/README
index 5bac3d0134..5bac3d0134 100644
--- a/swat/images/icons/crystalsvg/README
+++ b/swat2/images/icons/crystalsvg/README
diff --git a/swat/images/icons/nuvola/128/access.png b/swat2/images/icons/nuvola/128/access.png
index 1ea686899e..1ea686899e 100644
--- a/swat/images/icons/nuvola/128/access.png
+++ b/swat2/images/icons/nuvola/128/access.png
diff --git a/swat/images/icons/nuvola/128/agent.png b/swat2/images/icons/nuvola/128/agent.png
index caa430edea..caa430edea 100644
--- a/swat/images/icons/nuvola/128/agent.png
+++ b/swat2/images/icons/nuvola/128/agent.png
diff --git a/swat/images/icons/nuvola/128/background.png b/swat2/images/icons/nuvola/128/background.png
index a4a92b0056..a4a92b0056 100644
--- a/swat/images/icons/nuvola/128/background.png
+++ b/swat2/images/icons/nuvola/128/background.png
diff --git a/swat/images/icons/nuvola/128/bell.png b/swat2/images/icons/nuvola/128/bell.png
index 5ad1cd49c6..5ad1cd49c6 100644
--- a/swat/images/icons/nuvola/128/bell.png
+++ b/swat2/images/icons/nuvola/128/bell.png
diff --git a/swat/images/icons/nuvola/128/browser.png b/swat2/images/icons/nuvola/128/browser.png
index 99d1fed73a..99d1fed73a 100644
--- a/swat/images/icons/nuvola/128/browser.png
+++ b/swat2/images/icons/nuvola/128/browser.png
diff --git a/swat/images/icons/nuvola/128/cache.png b/swat2/images/icons/nuvola/128/cache.png
index 2ffacacfb7..2ffacacfb7 100644
--- a/swat/images/icons/nuvola/128/cache.png
+++ b/swat2/images/icons/nuvola/128/cache.png
diff --git a/swat/images/icons/nuvola/128/clock.png b/swat2/images/icons/nuvola/128/clock.png
index a4794d8a74..a4794d8a74 100644
--- a/swat/images/icons/nuvola/128/clock.png
+++ b/swat2/images/icons/nuvola/128/clock.png
diff --git a/swat/images/icons/nuvola/128/colors.png b/swat2/images/icons/nuvola/128/colors.png
index e728b66631..e728b66631 100644
--- a/swat/images/icons/nuvola/128/colors.png
+++ b/swat2/images/icons/nuvola/128/colors.png
diff --git a/swat/images/icons/nuvola/128/colorset.png b/swat2/images/icons/nuvola/128/colorset.png
index e520674a8c..e520674a8c 100644
--- a/swat/images/icons/nuvola/128/colorset.png
+++ b/swat2/images/icons/nuvola/128/colorset.png
diff --git a/swat/images/icons/nuvola/128/cookie.png b/swat2/images/icons/nuvola/128/cookie.png
index 2ef2521f91..2ef2521f91 100644
--- a/swat/images/icons/nuvola/128/cookie.png
+++ b/swat2/images/icons/nuvola/128/cookie.png
diff --git a/swat/images/icons/nuvola/128/core.png b/swat2/images/icons/nuvola/128/core.png
index aa28471677..aa28471677 100644
--- a/swat/images/icons/nuvola/128/core.png
+++ b/swat2/images/icons/nuvola/128/core.png
diff --git a/swat/images/icons/nuvola/128/date.png b/swat2/images/icons/nuvola/128/date.png
index 532d4d3643..532d4d3643 100644
--- a/swat/images/icons/nuvola/128/date.png
+++ b/swat2/images/icons/nuvola/128/date.png
diff --git a/swat/images/icons/nuvola/128/desktop.png b/swat2/images/icons/nuvola/128/desktop.png
index 91d7bd53a7..91d7bd53a7 100644
--- a/swat/images/icons/nuvola/128/desktop.png
+++ b/swat2/images/icons/nuvola/128/desktop.png
diff --git a/swat/images/icons/nuvola/128/display.png b/swat2/images/icons/nuvola/128/display.png
index fc0da13ab8..fc0da13ab8 100644
--- a/swat/images/icons/nuvola/128/display.png
+++ b/swat2/images/icons/nuvola/128/display.png
diff --git a/swat/images/icons/nuvola/128/document.png b/swat2/images/icons/nuvola/128/document.png
index 6283f854bd..6283f854bd 100644
--- a/swat/images/icons/nuvola/128/document.png
+++ b/swat2/images/icons/nuvola/128/document.png
diff --git a/swat/images/icons/nuvola/128/email.png b/swat2/images/icons/nuvola/128/email.png
index 7bca49ae0e..7bca49ae0e 100644
--- a/swat/images/icons/nuvola/128/email.png
+++ b/swat2/images/icons/nuvola/128/email.png
diff --git a/swat/images/icons/nuvola/128/empty.png b/swat2/images/icons/nuvola/128/empty.png
index eca5fc4b07..eca5fc4b07 100644
--- a/swat/images/icons/nuvola/128/empty.png
+++ b/swat2/images/icons/nuvola/128/empty.png
diff --git a/swat/images/icons/nuvola/128/encrypted.png b/swat2/images/icons/nuvola/128/encrypted.png
index 07d0603270..07d0603270 100644
--- a/swat/images/icons/nuvola/128/encrypted.png
+++ b/swat2/images/icons/nuvola/128/encrypted.png
diff --git a/swat/images/icons/nuvola/128/energy.png b/swat2/images/icons/nuvola/128/energy.png
index 4b2dbc4f56..4b2dbc4f56 100644
--- a/swat/images/icons/nuvola/128/energy.png
+++ b/swat2/images/icons/nuvola/128/energy.png
diff --git a/swat/images/icons/nuvola/128/error.png b/swat2/images/icons/nuvola/128/error.png
index d0152daaa8..d0152daaa8 100644
--- a/swat/images/icons/nuvola/128/error.png
+++ b/swat2/images/icons/nuvola/128/error.png
diff --git a/swat/images/icons/nuvola/128/exec.png b/swat2/images/icons/nuvola/128/exec.png
index 7354a545e0..7354a545e0 100644
--- a/swat/images/icons/nuvola/128/exec.png
+++ b/swat2/images/icons/nuvola/128/exec.png
diff --git a/swat/images/icons/nuvola/128/folder.png b/swat2/images/icons/nuvola/128/folder.png
index 9b62a3be5d..9b62a3be5d 100644
--- a/swat/images/icons/nuvola/128/folder.png
+++ b/swat2/images/icons/nuvola/128/folder.png
diff --git a/swat/images/icons/nuvola/128/folder_home.png b/swat2/images/icons/nuvola/128/folder_home.png
index d7720a20e7..d7720a20e7 100644
--- a/swat/images/icons/nuvola/128/folder_home.png
+++ b/swat2/images/icons/nuvola/128/folder_home.png
diff --git a/swat/images/icons/nuvola/128/folder_important.png b/swat2/images/icons/nuvola/128/folder_important.png
index 7be7064a67..7be7064a67 100644
--- a/swat/images/icons/nuvola/128/folder_important.png
+++ b/swat2/images/icons/nuvola/128/folder_important.png
diff --git a/swat/images/icons/nuvola/128/folder_locked.png b/swat2/images/icons/nuvola/128/folder_locked.png
index 0cc9cfd971..0cc9cfd971 100644
--- a/swat/images/icons/nuvola/128/folder_locked.png
+++ b/swat2/images/icons/nuvola/128/folder_locked.png
diff --git a/swat/images/icons/nuvola/128/folder_open.png b/swat2/images/icons/nuvola/128/folder_open.png
index 73a193a652..73a193a652 100644
--- a/swat/images/icons/nuvola/128/folder_open.png
+++ b/swat2/images/icons/nuvola/128/folder_open.png
diff --git a/swat/images/icons/nuvola/128/font.png b/swat2/images/icons/nuvola/128/font.png
index 260ed693bd..260ed693bd 100644
--- a/swat/images/icons/nuvola/128/font.png
+++ b/swat2/images/icons/nuvola/128/font.png
diff --git a/swat/images/icons/nuvola/128/hwinfo.png b/swat2/images/icons/nuvola/128/hwinfo.png
index cbfa846b56..cbfa846b56 100644
--- a/swat/images/icons/nuvola/128/hwinfo.png
+++ b/swat2/images/icons/nuvola/128/hwinfo.png
diff --git a/swat/images/icons/nuvola/128/icons.png b/swat2/images/icons/nuvola/128/icons.png
index 300142e5fa..300142e5fa 100644
--- a/swat/images/icons/nuvola/128/icons.png
+++ b/swat2/images/icons/nuvola/128/icons.png
diff --git a/swat/images/icons/nuvola/128/iconthemes.png b/swat2/images/icons/nuvola/128/iconthemes.png
index 71aa8a8018..71aa8a8018 100644
--- a/swat/images/icons/nuvola/128/iconthemes.png
+++ b/swat2/images/icons/nuvola/128/iconthemes.png
diff --git a/swat/images/icons/nuvola/128/important.png b/swat2/images/icons/nuvola/128/important.png
index 83c70568fc..83c70568fc 100644
--- a/swat/images/icons/nuvola/128/important.png
+++ b/swat2/images/icons/nuvola/128/important.png
diff --git a/swat/images/icons/nuvola/128/info.png b/swat2/images/icons/nuvola/128/info.png
index 77ca807b66..77ca807b66 100644
--- a/swat/images/icons/nuvola/128/info.png
+++ b/swat2/images/icons/nuvola/128/info.png
diff --git a/swat/images/icons/nuvola/128/kcoloredit.png b/swat2/images/icons/nuvola/128/kcoloredit.png
index 7e05aeac65..7e05aeac65 100644
--- a/swat/images/icons/nuvola/128/kcoloredit.png
+++ b/swat2/images/icons/nuvola/128/kcoloredit.png
diff --git a/swat/images/icons/nuvola/128/kcontrol.png b/swat2/images/icons/nuvola/128/kcontrol.png
index e79094c4f4..e79094c4f4 100644
--- a/swat/images/icons/nuvola/128/kcontrol.png
+++ b/swat2/images/icons/nuvola/128/kcontrol.png
diff --git a/swat/images/icons/nuvola/128/keyboard.png b/swat2/images/icons/nuvola/128/keyboard.png
index 50744c1997..50744c1997 100644
--- a/swat/images/icons/nuvola/128/keyboard.png
+++ b/swat2/images/icons/nuvola/128/keyboard.png
diff --git a/swat/images/icons/nuvola/128/khelpcenter.png b/swat2/images/icons/nuvola/128/khelpcenter.png
index c767aaffaa..c767aaffaa 100644
--- a/swat/images/icons/nuvola/128/khelpcenter.png
+++ b/swat2/images/icons/nuvola/128/khelpcenter.png
diff --git a/swat/images/icons/nuvola/128/kmix.png b/swat2/images/icons/nuvola/128/kmix.png
index c0992b75aa..c0992b75aa 100644
--- a/swat/images/icons/nuvola/128/kmix.png
+++ b/swat2/images/icons/nuvola/128/kmix.png
diff --git a/swat/images/icons/nuvola/128/knotify.png b/swat2/images/icons/nuvola/128/knotify.png
index d878c4f23e..d878c4f23e 100644
--- a/swat/images/icons/nuvola/128/knotify.png
+++ b/swat2/images/icons/nuvola/128/knotify.png
diff --git a/swat/images/icons/nuvola/128/konqueror.png b/swat2/images/icons/nuvola/128/konqueror.png
index 00e824914b..00e824914b 100644
--- a/swat/images/icons/nuvola/128/konqueror.png
+++ b/swat2/images/icons/nuvola/128/konqueror.png
diff --git a/swat/images/icons/nuvola/128/kpackage.png b/swat2/images/icons/nuvola/128/kpackage.png
index a5aa32968b..a5aa32968b 100644
--- a/swat/images/icons/nuvola/128/kpackage.png
+++ b/swat2/images/icons/nuvola/128/kpackage.png
diff --git a/swat/images/icons/nuvola/128/kpaint.png b/swat2/images/icons/nuvola/128/kpaint.png
index b1ceb3e40f..b1ceb3e40f 100644
--- a/swat/images/icons/nuvola/128/kpaint.png
+++ b/swat2/images/icons/nuvola/128/kpaint.png
diff --git a/swat/images/icons/nuvola/128/krita.png b/swat2/images/icons/nuvola/128/krita.png
index fb1a088cc3..fb1a088cc3 100644
--- a/swat/images/icons/nuvola/128/krita.png
+++ b/swat2/images/icons/nuvola/128/krita.png
diff --git a/swat/images/icons/nuvola/128/ksnapshot.png b/swat2/images/icons/nuvola/128/ksnapshot.png
index 4f19721de4..4f19721de4 100644
--- a/swat/images/icons/nuvola/128/ksnapshot.png
+++ b/swat2/images/icons/nuvola/128/ksnapshot.png
diff --git a/swat/images/icons/nuvola/128/ktip.png b/swat2/images/icons/nuvola/128/ktip.png
index 24c527069e..24c527069e 100644
--- a/swat/images/icons/nuvola/128/ktip.png
+++ b/swat2/images/icons/nuvola/128/ktip.png
diff --git a/swat/images/icons/nuvola/128/kuser.png b/swat2/images/icons/nuvola/128/kuser.png
index 6ed54d43a9..6ed54d43a9 100644
--- a/swat/images/icons/nuvola/128/kuser.png
+++ b/swat2/images/icons/nuvola/128/kuser.png
diff --git a/swat/images/icons/nuvola/128/kview.png b/swat2/images/icons/nuvola/128/kview.png
index 86a385a461..86a385a461 100644
--- a/swat/images/icons/nuvola/128/kview.png
+++ b/swat2/images/icons/nuvola/128/kview.png
diff --git a/swat/images/icons/nuvola/128/locale.png b/swat2/images/icons/nuvola/128/locale.png
index 9b3e233d9e..9b3e233d9e 100644
--- a/swat/images/icons/nuvola/128/locale.png
+++ b/swat2/images/icons/nuvola/128/locale.png
diff --git a/swat/images/icons/nuvola/128/looknfeel.png b/swat2/images/icons/nuvola/128/looknfeel.png
index 197021b62b..197021b62b 100644
--- a/swat/images/icons/nuvola/128/looknfeel.png
+++ b/swat2/images/icons/nuvola/128/looknfeel.png
diff --git a/swat/images/icons/nuvola/128/mozilla.png b/swat2/images/icons/nuvola/128/mozilla.png
index 6ac2de710d..6ac2de710d 100644
--- a/swat/images/icons/nuvola/128/mozilla.png
+++ b/swat2/images/icons/nuvola/128/mozilla.png
diff --git a/swat/images/icons/nuvola/128/mycomputer.png b/swat2/images/icons/nuvola/128/mycomputer.png
index a6736baeef..a6736baeef 100644
--- a/swat/images/icons/nuvola/128/mycomputer.png
+++ b/swat2/images/icons/nuvola/128/mycomputer.png
diff --git a/swat/images/icons/nuvola/128/netscape.png b/swat2/images/icons/nuvola/128/netscape.png
index 26bf224295..26bf224295 100644
--- a/swat/images/icons/nuvola/128/netscape.png
+++ b/swat2/images/icons/nuvola/128/netscape.png
diff --git a/swat/images/icons/nuvola/128/network.png b/swat2/images/icons/nuvola/128/network.png
index 4961ac2750..4961ac2750 100644
--- a/swat/images/icons/nuvola/128/network.png
+++ b/swat2/images/icons/nuvola/128/network.png
diff --git a/swat/images/icons/nuvola/128/opera.png b/swat2/images/icons/nuvola/128/opera.png
index 8f0248118f..8f0248118f 100644
--- a/swat/images/icons/nuvola/128/opera.png
+++ b/swat2/images/icons/nuvola/128/opera.png
diff --git a/swat/images/icons/nuvola/128/package.png b/swat2/images/icons/nuvola/128/package.png
index 25584da28d..25584da28d 100644
--- a/swat/images/icons/nuvola/128/package.png
+++ b/swat2/images/icons/nuvola/128/package.png
diff --git a/swat/images/icons/nuvola/128/password.png b/swat2/images/icons/nuvola/128/password.png
index ffe9b375b2..ffe9b375b2 100644
--- a/swat/images/icons/nuvola/128/password.png
+++ b/swat2/images/icons/nuvola/128/password.png
diff --git a/swat/images/icons/nuvola/128/pipe.png b/swat2/images/icons/nuvola/128/pipe.png
index 644cabb8f2..644cabb8f2 100644
--- a/swat/images/icons/nuvola/128/pipe.png
+++ b/swat2/images/icons/nuvola/128/pipe.png
diff --git a/swat/images/icons/nuvola/128/realplayer.png b/swat2/images/icons/nuvola/128/realplayer.png
index 2c6b725529..2c6b725529 100644
--- a/swat/images/icons/nuvola/128/realplayer.png
+++ b/swat2/images/icons/nuvola/128/realplayer.png
diff --git a/swat/images/icons/nuvola/128/services.png b/swat2/images/icons/nuvola/128/services.png
index 799ebb9bb5..799ebb9bb5 100644
--- a/swat/images/icons/nuvola/128/services.png
+++ b/swat2/images/icons/nuvola/128/services.png
diff --git a/swat/images/icons/nuvola/128/socket.png b/swat2/images/icons/nuvola/128/socket.png
index bb745dc3d7..bb745dc3d7 100644
--- a/swat/images/icons/nuvola/128/socket.png
+++ b/swat2/images/icons/nuvola/128/socket.png
diff --git a/swat/images/icons/nuvola/128/style.png b/swat2/images/icons/nuvola/128/style.png
index fa0314920a..fa0314920a 100644
--- a/swat/images/icons/nuvola/128/style.png
+++ b/swat2/images/icons/nuvola/128/style.png
diff --git a/swat/images/icons/nuvola/128/stylesheet.png b/swat2/images/icons/nuvola/128/stylesheet.png
index 3796d1663c..3796d1663c 100644
--- a/swat/images/icons/nuvola/128/stylesheet.png
+++ b/swat2/images/icons/nuvola/128/stylesheet.png
diff --git a/swat/images/icons/nuvola/16/access.png b/swat2/images/icons/nuvola/16/access.png
index c6a670be53..c6a670be53 100644
--- a/swat/images/icons/nuvola/16/access.png
+++ b/swat2/images/icons/nuvola/16/access.png
diff --git a/swat/images/icons/nuvola/16/agent.png b/swat2/images/icons/nuvola/16/agent.png
index d0e68864d2..d0e68864d2 100644
--- a/swat/images/icons/nuvola/16/agent.png
+++ b/swat2/images/icons/nuvola/16/agent.png
diff --git a/swat/images/icons/nuvola/16/apply.png b/swat2/images/icons/nuvola/16/apply.png
index 5b0f6a6174..5b0f6a6174 100644
--- a/swat/images/icons/nuvola/16/apply.png
+++ b/swat2/images/icons/nuvola/16/apply.png
diff --git a/swat/images/icons/nuvola/16/back.png b/swat2/images/icons/nuvola/16/back.png
index 3fe8b178ec..3fe8b178ec 100644
--- a/swat/images/icons/nuvola/16/back.png
+++ b/swat2/images/icons/nuvola/16/back.png
diff --git a/swat/images/icons/nuvola/16/background.png b/swat2/images/icons/nuvola/16/background.png
index 14ea3e47fd..14ea3e47fd 100644
--- a/swat/images/icons/nuvola/16/background.png
+++ b/swat2/images/icons/nuvola/16/background.png
diff --git a/swat/images/icons/nuvola/16/bell.png b/swat2/images/icons/nuvola/16/bell.png
index 6a10c01e85..6a10c01e85 100644
--- a/swat/images/icons/nuvola/16/bell.png
+++ b/swat2/images/icons/nuvola/16/bell.png
diff --git a/swat/images/icons/nuvola/16/bookmark.png b/swat2/images/icons/nuvola/16/bookmark.png
index 2cd69471de..2cd69471de 100644
--- a/swat/images/icons/nuvola/16/bookmark.png
+++ b/swat2/images/icons/nuvola/16/bookmark.png
diff --git a/swat/images/icons/nuvola/16/browser.png b/swat2/images/icons/nuvola/16/browser.png
index 03ef9a5700..03ef9a5700 100644
--- a/swat/images/icons/nuvola/16/browser.png
+++ b/swat2/images/icons/nuvola/16/browser.png
diff --git a/swat/images/icons/nuvola/16/button_cancel.png b/swat2/images/icons/nuvola/16/button_cancel.png
index a432b492c4..a432b492c4 100644
--- a/swat/images/icons/nuvola/16/button_cancel.png
+++ b/swat2/images/icons/nuvola/16/button_cancel.png
diff --git a/swat/images/icons/nuvola/16/button_ok.png b/swat2/images/icons/nuvola/16/button_ok.png
index 5b0f6a6174..5b0f6a6174 100644
--- a/swat/images/icons/nuvola/16/button_ok.png
+++ b/swat2/images/icons/nuvola/16/button_ok.png
diff --git a/swat/images/icons/nuvola/16/cache.png b/swat2/images/icons/nuvola/16/cache.png
index b789c54462..b789c54462 100644
--- a/swat/images/icons/nuvola/16/cache.png
+++ b/swat2/images/icons/nuvola/16/cache.png
diff --git a/swat/images/icons/nuvola/16/clock.png b/swat2/images/icons/nuvola/16/clock.png
index 7c622a0999..7c622a0999 100644
--- a/swat/images/icons/nuvola/16/clock.png
+++ b/swat2/images/icons/nuvola/16/clock.png
diff --git a/swat/images/icons/nuvola/16/colorize.png b/swat2/images/icons/nuvola/16/colorize.png
index bdc03f7cb6..bdc03f7cb6 100644
--- a/swat/images/icons/nuvola/16/colorize.png
+++ b/swat2/images/icons/nuvola/16/colorize.png
diff --git a/swat/images/icons/nuvola/16/colors.png b/swat2/images/icons/nuvola/16/colors.png
index fc6a1953bf..fc6a1953bf 100644
--- a/swat/images/icons/nuvola/16/colors.png
+++ b/swat2/images/icons/nuvola/16/colors.png
diff --git a/swat/images/icons/nuvola/16/colorset.png b/swat2/images/icons/nuvola/16/colorset.png
index 9c12b3c76a..9c12b3c76a 100644
--- a/swat/images/icons/nuvola/16/colorset.png
+++ b/swat2/images/icons/nuvola/16/colorset.png
diff --git a/swat/images/icons/nuvola/16/configure.png b/swat2/images/icons/nuvola/16/configure.png
index a4a3834abc..a4a3834abc 100644
--- a/swat/images/icons/nuvola/16/configure.png
+++ b/swat2/images/icons/nuvola/16/configure.png
diff --git a/swat/images/icons/nuvola/16/cookie.png b/swat2/images/icons/nuvola/16/cookie.png
index 5c1ca3c0f0..5c1ca3c0f0 100644
--- a/swat/images/icons/nuvola/16/cookie.png
+++ b/swat2/images/icons/nuvola/16/cookie.png
diff --git a/swat/images/icons/nuvola/16/core.png b/swat2/images/icons/nuvola/16/core.png
index f82088a5e7..f82088a5e7 100644
--- a/swat/images/icons/nuvola/16/core.png
+++ b/swat2/images/icons/nuvola/16/core.png
diff --git a/swat/images/icons/nuvola/16/date.png b/swat2/images/icons/nuvola/16/date.png
index bd4b4c6c16..bd4b4c6c16 100644
--- a/swat/images/icons/nuvola/16/date.png
+++ b/swat2/images/icons/nuvola/16/date.png
diff --git a/swat/images/icons/nuvola/16/decrypted.png b/swat2/images/icons/nuvola/16/decrypted.png
index 42dd93e266..42dd93e266 100644
--- a/swat/images/icons/nuvola/16/decrypted.png
+++ b/swat2/images/icons/nuvola/16/decrypted.png
diff --git a/swat/images/icons/nuvola/16/desktop.png b/swat2/images/icons/nuvola/16/desktop.png
index 291f8a4ac9..291f8a4ac9 100644
--- a/swat/images/icons/nuvola/16/desktop.png
+++ b/swat2/images/icons/nuvola/16/desktop.png
diff --git a/swat/images/icons/nuvola/16/display.png b/swat2/images/icons/nuvola/16/display.png
index ededc0bd34..ededc0bd34 100644
--- a/swat/images/icons/nuvola/16/display.png
+++ b/swat2/images/icons/nuvola/16/display.png
diff --git a/swat/images/icons/nuvola/16/document.png b/swat2/images/icons/nuvola/16/document.png
index 24c9c5757e..24c9c5757e 100644
--- a/swat/images/icons/nuvola/16/document.png
+++ b/swat2/images/icons/nuvola/16/document.png
diff --git a/swat/images/icons/nuvola/16/down.png b/swat2/images/icons/nuvola/16/down.png
index f3bc4cd093..f3bc4cd093 100644
--- a/swat/images/icons/nuvola/16/down.png
+++ b/swat2/images/icons/nuvola/16/down.png
diff --git a/swat/images/icons/nuvola/16/edit.png b/swat2/images/icons/nuvola/16/edit.png
index 423187c2c3..423187c2c3 100644
--- a/swat/images/icons/nuvola/16/edit.png
+++ b/swat2/images/icons/nuvola/16/edit.png
diff --git a/swat/images/icons/nuvola/16/editcopy.png b/swat2/images/icons/nuvola/16/editcopy.png
index b7c938a999..b7c938a999 100644
--- a/swat/images/icons/nuvola/16/editcopy.png
+++ b/swat2/images/icons/nuvola/16/editcopy.png
diff --git a/swat/images/icons/nuvola/16/editcut.png b/swat2/images/icons/nuvola/16/editcut.png
index 49f359147a..49f359147a 100644
--- a/swat/images/icons/nuvola/16/editcut.png
+++ b/swat2/images/icons/nuvola/16/editcut.png
diff --git a/swat/images/icons/nuvola/16/editdelete.png b/swat2/images/icons/nuvola/16/editdelete.png
index d33c344545..d33c344545 100644
--- a/swat/images/icons/nuvola/16/editdelete.png
+++ b/swat2/images/icons/nuvola/16/editdelete.png
diff --git a/swat/images/icons/nuvola/16/editpaste.png b/swat2/images/icons/nuvola/16/editpaste.png
index 4c43ddfd76..4c43ddfd76 100644
--- a/swat/images/icons/nuvola/16/editpaste.png
+++ b/swat2/images/icons/nuvola/16/editpaste.png
diff --git a/swat/images/icons/nuvola/16/edittrash.png b/swat2/images/icons/nuvola/16/edittrash.png
index b0bde007ed..b0bde007ed 100644
--- a/swat/images/icons/nuvola/16/edittrash.png
+++ b/swat2/images/icons/nuvola/16/edittrash.png
diff --git a/swat/images/icons/nuvola/16/email.png b/swat2/images/icons/nuvola/16/email.png
index 694a8e068b..694a8e068b 100644
--- a/swat/images/icons/nuvola/16/email.png
+++ b/swat2/images/icons/nuvola/16/email.png
diff --git a/swat/images/icons/nuvola/16/empty.png b/swat2/images/icons/nuvola/16/empty.png
index 55ace49b68..55ace49b68 100644
--- a/swat/images/icons/nuvola/16/empty.png
+++ b/swat2/images/icons/nuvola/16/empty.png
diff --git a/swat/images/icons/nuvola/16/encrypted.png b/swat2/images/icons/nuvola/16/encrypted.png
index 6df8ea6d8a..6df8ea6d8a 100644
--- a/swat/images/icons/nuvola/16/encrypted.png
+++ b/swat2/images/icons/nuvola/16/encrypted.png
diff --git a/swat/images/icons/nuvola/16/energy.png b/swat2/images/icons/nuvola/16/energy.png
index 733dfcf8b9..733dfcf8b9 100644
--- a/swat/images/icons/nuvola/16/energy.png
+++ b/swat2/images/icons/nuvola/16/energy.png
diff --git a/swat/images/icons/nuvola/16/error.png b/swat2/images/icons/nuvola/16/error.png
index 2997461b21..2997461b21 100644
--- a/swat/images/icons/nuvola/16/error.png
+++ b/swat2/images/icons/nuvola/16/error.png
diff --git a/swat/images/icons/nuvola/16/exec.png b/swat2/images/icons/nuvola/16/exec.png
index 4e7fc432db..4e7fc432db 100644
--- a/swat/images/icons/nuvola/16/exec.png
+++ b/swat2/images/icons/nuvola/16/exec.png
diff --git a/swat/images/icons/nuvola/16/filenew.png b/swat2/images/icons/nuvola/16/filenew.png
index f38d02ee59..f38d02ee59 100644
--- a/swat/images/icons/nuvola/16/filenew.png
+++ b/swat2/images/icons/nuvola/16/filenew.png
diff --git a/swat/images/icons/nuvola/16/fileopen.png b/swat2/images/icons/nuvola/16/fileopen.png
index 2d8e3ba2ba..2d8e3ba2ba 100644
--- a/swat/images/icons/nuvola/16/fileopen.png
+++ b/swat2/images/icons/nuvola/16/fileopen.png
diff --git a/swat/images/icons/nuvola/16/fileprint.png b/swat2/images/icons/nuvola/16/fileprint.png
index 3a87543224..3a87543224 100644
--- a/swat/images/icons/nuvola/16/fileprint.png
+++ b/swat2/images/icons/nuvola/16/fileprint.png
diff --git a/swat/images/icons/nuvola/16/filesave.png b/swat2/images/icons/nuvola/16/filesave.png
index fd0048ded9..fd0048ded9 100644
--- a/swat/images/icons/nuvola/16/filesave.png
+++ b/swat2/images/icons/nuvola/16/filesave.png
diff --git a/swat/images/icons/nuvola/16/filesaveas.png b/swat2/images/icons/nuvola/16/filesaveas.png
index 71602bc361..71602bc361 100644
--- a/swat/images/icons/nuvola/16/filesaveas.png
+++ b/swat2/images/icons/nuvola/16/filesaveas.png
diff --git a/swat/images/icons/nuvola/16/find.png b/swat2/images/icons/nuvola/16/find.png
index e912de2885..e912de2885 100644
--- a/swat/images/icons/nuvola/16/find.png
+++ b/swat2/images/icons/nuvola/16/find.png
diff --git a/swat/images/icons/nuvola/16/folder.png b/swat2/images/icons/nuvola/16/folder.png
index 9232553fcd..9232553fcd 100644
--- a/swat/images/icons/nuvola/16/folder.png
+++ b/swat2/images/icons/nuvola/16/folder.png
diff --git a/swat/images/icons/nuvola/16/folder_home.png b/swat2/images/icons/nuvola/16/folder_home.png
index 3525b0b737..3525b0b737 100644
--- a/swat/images/icons/nuvola/16/folder_home.png
+++ b/swat2/images/icons/nuvola/16/folder_home.png
diff --git a/swat/images/icons/nuvola/16/folder_important.png b/swat2/images/icons/nuvola/16/folder_important.png
index 5cadf9d963..5cadf9d963 100644
--- a/swat/images/icons/nuvola/16/folder_important.png
+++ b/swat2/images/icons/nuvola/16/folder_important.png
diff --git a/swat/images/icons/nuvola/16/folder_locked.png b/swat2/images/icons/nuvola/16/folder_locked.png
index e9c5bfd081..e9c5bfd081 100644
--- a/swat/images/icons/nuvola/16/folder_locked.png
+++ b/swat2/images/icons/nuvola/16/folder_locked.png
diff --git a/swat/images/icons/nuvola/16/folder_open.png b/swat2/images/icons/nuvola/16/folder_open.png
index 2c55c5636e..2c55c5636e 100644
--- a/swat/images/icons/nuvola/16/folder_open.png
+++ b/swat2/images/icons/nuvola/16/folder_open.png
diff --git a/swat/images/icons/nuvola/16/font.png b/swat2/images/icons/nuvola/16/font.png
index 3f6f3ac411..3f6f3ac411 100644
--- a/swat/images/icons/nuvola/16/font.png
+++ b/swat2/images/icons/nuvola/16/font.png
diff --git a/swat/images/icons/nuvola/16/forward.png b/swat2/images/icons/nuvola/16/forward.png
index 3e9562c4a7..3e9562c4a7 100644
--- a/swat/images/icons/nuvola/16/forward.png
+++ b/swat2/images/icons/nuvola/16/forward.png
diff --git a/swat/images/icons/nuvola/16/gohome.png b/swat2/images/icons/nuvola/16/gohome.png
index a93612f174..a93612f174 100644
--- a/swat/images/icons/nuvola/16/gohome.png
+++ b/swat2/images/icons/nuvola/16/gohome.png
diff --git a/swat/images/icons/nuvola/16/help.png b/swat2/images/icons/nuvola/16/help.png
index 28a0f9e5e6..28a0f9e5e6 100644
--- a/swat/images/icons/nuvola/16/help.png
+++ b/swat2/images/icons/nuvola/16/help.png
diff --git a/swat/images/icons/nuvola/16/history.png b/swat2/images/icons/nuvola/16/history.png
index 8d658e0de0..8d658e0de0 100644
--- a/swat/images/icons/nuvola/16/history.png
+++ b/swat2/images/icons/nuvola/16/history.png
diff --git a/swat/images/icons/nuvola/16/hwinfo.png b/swat2/images/icons/nuvola/16/hwinfo.png
index 1f49a9ff2a..1f49a9ff2a 100644
--- a/swat/images/icons/nuvola/16/hwinfo.png
+++ b/swat2/images/icons/nuvola/16/hwinfo.png
diff --git a/swat/images/icons/nuvola/16/icons.png b/swat2/images/icons/nuvola/16/icons.png
index df51f18f96..df51f18f96 100644
--- a/swat/images/icons/nuvola/16/icons.png
+++ b/swat2/images/icons/nuvola/16/icons.png
diff --git a/swat/images/icons/nuvola/16/iconthemes.png b/swat2/images/icons/nuvola/16/iconthemes.png
index a5dcbe0898..a5dcbe0898 100644
--- a/swat/images/icons/nuvola/16/iconthemes.png
+++ b/swat2/images/icons/nuvola/16/iconthemes.png
diff --git a/swat/images/icons/nuvola/16/important.png b/swat2/images/icons/nuvola/16/important.png
index 2b3d4f05ba..2b3d4f05ba 100644
--- a/swat/images/icons/nuvola/16/important.png
+++ b/swat2/images/icons/nuvola/16/important.png
diff --git a/swat/images/icons/nuvola/16/info.png b/swat2/images/icons/nuvola/16/info.png
index cfc3089867..cfc3089867 100644
--- a/swat/images/icons/nuvola/16/info.png
+++ b/swat2/images/icons/nuvola/16/info.png
diff --git a/swat/images/icons/nuvola/16/kcoloredit.png b/swat2/images/icons/nuvola/16/kcoloredit.png
index b2731f6173..b2731f6173 100644
--- a/swat/images/icons/nuvola/16/kcoloredit.png
+++ b/swat2/images/icons/nuvola/16/kcoloredit.png
diff --git a/swat/images/icons/nuvola/16/kcontrol.png b/swat2/images/icons/nuvola/16/kcontrol.png
index f9c503e817..f9c503e817 100644
--- a/swat/images/icons/nuvola/16/kcontrol.png
+++ b/swat2/images/icons/nuvola/16/kcontrol.png
diff --git a/swat/images/icons/nuvola/16/keyboard.png b/swat2/images/icons/nuvola/16/keyboard.png
index 726dbe1634..726dbe1634 100644
--- a/swat/images/icons/nuvola/16/keyboard.png
+++ b/swat2/images/icons/nuvola/16/keyboard.png
diff --git a/swat/images/icons/nuvola/16/khelpcenter.png b/swat2/images/icons/nuvola/16/khelpcenter.png
index 096b00c4e8..096b00c4e8 100644
--- a/swat/images/icons/nuvola/16/khelpcenter.png
+++ b/swat2/images/icons/nuvola/16/khelpcenter.png
diff --git a/swat/images/icons/nuvola/16/kmix.png b/swat2/images/icons/nuvola/16/kmix.png
index 5e84e63be7..5e84e63be7 100644
--- a/swat/images/icons/nuvola/16/kmix.png
+++ b/swat2/images/icons/nuvola/16/kmix.png
diff --git a/swat/images/icons/nuvola/16/knotify.png b/swat2/images/icons/nuvola/16/knotify.png
index e9897eff92..e9897eff92 100644
--- a/swat/images/icons/nuvola/16/knotify.png
+++ b/swat2/images/icons/nuvola/16/knotify.png
diff --git a/swat/images/icons/nuvola/16/konqueror.png b/swat2/images/icons/nuvola/16/konqueror.png
index 9baca42751..9baca42751 100644
--- a/swat/images/icons/nuvola/16/konqueror.png
+++ b/swat2/images/icons/nuvola/16/konqueror.png
diff --git a/swat/images/icons/nuvola/16/kpackage.png b/swat2/images/icons/nuvola/16/kpackage.png
index fdb3644c6c..fdb3644c6c 100644
--- a/swat/images/icons/nuvola/16/kpackage.png
+++ b/swat2/images/icons/nuvola/16/kpackage.png
diff --git a/swat/images/icons/nuvola/16/kpaint.png b/swat2/images/icons/nuvola/16/kpaint.png
index dd0b147ff6..dd0b147ff6 100644
--- a/swat/images/icons/nuvola/16/kpaint.png
+++ b/swat2/images/icons/nuvola/16/kpaint.png
diff --git a/swat/images/icons/nuvola/16/krita.png b/swat2/images/icons/nuvola/16/krita.png
index b13dbea1ed..b13dbea1ed 100644
--- a/swat/images/icons/nuvola/16/krita.png
+++ b/swat2/images/icons/nuvola/16/krita.png
diff --git a/swat/images/icons/nuvola/16/ksnapshot.png b/swat2/images/icons/nuvola/16/ksnapshot.png
index 35394c45b9..35394c45b9 100644
--- a/swat/images/icons/nuvola/16/ksnapshot.png
+++ b/swat2/images/icons/nuvola/16/ksnapshot.png
diff --git a/swat/images/icons/nuvola/16/ktip.png b/swat2/images/icons/nuvola/16/ktip.png
index 4d63112132..4d63112132 100644
--- a/swat/images/icons/nuvola/16/ktip.png
+++ b/swat2/images/icons/nuvola/16/ktip.png
diff --git a/swat/images/icons/nuvola/16/kuser.png b/swat2/images/icons/nuvola/16/kuser.png
index 8e649a80b1..8e649a80b1 100644
--- a/swat/images/icons/nuvola/16/kuser.png
+++ b/swat2/images/icons/nuvola/16/kuser.png
diff --git a/swat/images/icons/nuvola/16/kview.png b/swat2/images/icons/nuvola/16/kview.png
index 1a5d577431..1a5d577431 100644
--- a/swat/images/icons/nuvola/16/kview.png
+++ b/swat2/images/icons/nuvola/16/kview.png
diff --git a/swat/images/icons/nuvola/16/locale.png b/swat2/images/icons/nuvola/16/locale.png
index a79df4eb5b..a79df4eb5b 100644
--- a/swat/images/icons/nuvola/16/locale.png
+++ b/swat2/images/icons/nuvola/16/locale.png
diff --git a/swat/images/icons/nuvola/16/looknfeel.png b/swat2/images/icons/nuvola/16/looknfeel.png
index 7d7da74d28..7d7da74d28 100644
--- a/swat/images/icons/nuvola/16/looknfeel.png
+++ b/swat2/images/icons/nuvola/16/looknfeel.png
diff --git a/swat/images/icons/nuvola/16/mail_delete.png b/swat2/images/icons/nuvola/16/mail_delete.png
index dc9c020f7e..dc9c020f7e 100644
--- a/swat/images/icons/nuvola/16/mail_delete.png
+++ b/swat2/images/icons/nuvola/16/mail_delete.png
diff --git a/swat/images/icons/nuvola/16/mail_find.png b/swat2/images/icons/nuvola/16/mail_find.png
index 1e230e2e40..1e230e2e40 100644
--- a/swat/images/icons/nuvola/16/mail_find.png
+++ b/swat2/images/icons/nuvola/16/mail_find.png
diff --git a/swat/images/icons/nuvola/16/mail_forward.png b/swat2/images/icons/nuvola/16/mail_forward.png
index 0bb1ee287e..0bb1ee287e 100644
--- a/swat/images/icons/nuvola/16/mail_forward.png
+++ b/swat2/images/icons/nuvola/16/mail_forward.png
diff --git a/swat/images/icons/nuvola/16/mail_generic.png b/swat2/images/icons/nuvola/16/mail_generic.png
index 2de442b800..2de442b800 100644
--- a/swat/images/icons/nuvola/16/mail_generic.png
+++ b/swat2/images/icons/nuvola/16/mail_generic.png
diff --git a/swat/images/icons/nuvola/16/mail_new.png b/swat2/images/icons/nuvola/16/mail_new.png
index 7656cbc114..7656cbc114 100644
--- a/swat/images/icons/nuvola/16/mail_new.png
+++ b/swat2/images/icons/nuvola/16/mail_new.png
diff --git a/swat/images/icons/nuvola/16/mail_replyall.png b/swat2/images/icons/nuvola/16/mail_replyall.png
index 6e825cc500..6e825cc500 100644
--- a/swat/images/icons/nuvola/16/mail_replyall.png
+++ b/swat2/images/icons/nuvola/16/mail_replyall.png
diff --git a/swat/images/icons/nuvola/16/mail_send.png b/swat2/images/icons/nuvola/16/mail_send.png
index 2113017921..2113017921 100644
--- a/swat/images/icons/nuvola/16/mail_send.png
+++ b/swat2/images/icons/nuvola/16/mail_send.png
diff --git a/swat/images/icons/nuvola/16/misc.png b/swat2/images/icons/nuvola/16/misc.png
index 98d4b9969e..98d4b9969e 100644
--- a/swat/images/icons/nuvola/16/misc.png
+++ b/swat2/images/icons/nuvola/16/misc.png
diff --git a/swat/images/icons/nuvola/16/mozilla.png b/swat2/images/icons/nuvola/16/mozilla.png
index 8e43442adf..8e43442adf 100644
--- a/swat/images/icons/nuvola/16/mozilla.png
+++ b/swat2/images/icons/nuvola/16/mozilla.png
diff --git a/swat/images/icons/nuvola/16/mycomputer.png b/swat2/images/icons/nuvola/16/mycomputer.png
index 0a929f0383..0a929f0383 100644
--- a/swat/images/icons/nuvola/16/mycomputer.png
+++ b/swat2/images/icons/nuvola/16/mycomputer.png
diff --git a/swat/images/icons/nuvola/16/netscape.png b/swat2/images/icons/nuvola/16/netscape.png
index 4734d0ccdc..4734d0ccdc 100644
--- a/swat/images/icons/nuvola/16/netscape.png
+++ b/swat2/images/icons/nuvola/16/netscape.png
diff --git a/swat/images/icons/nuvola/16/network.png b/swat2/images/icons/nuvola/16/network.png
index dd5ba69e52..dd5ba69e52 100644
--- a/swat/images/icons/nuvola/16/network.png
+++ b/swat2/images/icons/nuvola/16/network.png
diff --git a/swat/images/icons/nuvola/16/next.png b/swat2/images/icons/nuvola/16/next.png
index 24a89b5434..24a89b5434 100644
--- a/swat/images/icons/nuvola/16/next.png
+++ b/swat2/images/icons/nuvola/16/next.png
diff --git a/swat/images/icons/nuvola/16/no.png b/swat2/images/icons/nuvola/16/no.png
index 37a7c74977..37a7c74977 100644
--- a/swat/images/icons/nuvola/16/no.png
+++ b/swat2/images/icons/nuvola/16/no.png
diff --git a/swat/images/icons/nuvola/16/ok.png b/swat2/images/icons/nuvola/16/ok.png
index 5b0f6a6174..5b0f6a6174 100644
--- a/swat/images/icons/nuvola/16/ok.png
+++ b/swat2/images/icons/nuvola/16/ok.png
diff --git a/swat/images/icons/nuvola/16/opera.png b/swat2/images/icons/nuvola/16/opera.png
index 963449bb90..963449bb90 100644
--- a/swat/images/icons/nuvola/16/opera.png
+++ b/swat2/images/icons/nuvola/16/opera.png
diff --git a/swat/images/icons/nuvola/16/package.png b/swat2/images/icons/nuvola/16/package.png
index 618d744c28..618d744c28 100644
--- a/swat/images/icons/nuvola/16/package.png
+++ b/swat2/images/icons/nuvola/16/package.png
diff --git a/swat/images/icons/nuvola/16/password.png b/swat2/images/icons/nuvola/16/password.png
index 5656824986..5656824986 100644
--- a/swat/images/icons/nuvola/16/password.png
+++ b/swat2/images/icons/nuvola/16/password.png
diff --git a/swat/images/icons/nuvola/16/pipe.png b/swat2/images/icons/nuvola/16/pipe.png
index 5fe640131e..5fe640131e 100644
--- a/swat/images/icons/nuvola/16/pipe.png
+++ b/swat2/images/icons/nuvola/16/pipe.png
diff --git a/swat/images/icons/nuvola/16/previous.png b/swat2/images/icons/nuvola/16/previous.png
index 6992aa7edc..6992aa7edc 100644
--- a/swat/images/icons/nuvola/16/previous.png
+++ b/swat2/images/icons/nuvola/16/previous.png
diff --git a/swat/images/icons/nuvola/16/realplayer.png b/swat2/images/icons/nuvola/16/realplayer.png
index 07b1e86482..07b1e86482 100644
--- a/swat/images/icons/nuvola/16/realplayer.png
+++ b/swat2/images/icons/nuvola/16/realplayer.png
diff --git a/swat/images/icons/nuvola/16/redo.png b/swat2/images/icons/nuvola/16/redo.png
index f1e45cff93..f1e45cff93 100644
--- a/swat/images/icons/nuvola/16/redo.png
+++ b/swat2/images/icons/nuvola/16/redo.png
diff --git a/swat/images/icons/nuvola/16/reload.png b/swat2/images/icons/nuvola/16/reload.png
index 1c026d32c3..1c026d32c3 100644
--- a/swat/images/icons/nuvola/16/reload.png
+++ b/swat2/images/icons/nuvola/16/reload.png
diff --git a/swat/images/icons/nuvola/16/run.png b/swat2/images/icons/nuvola/16/run.png
index 751424557e..751424557e 100644
--- a/swat/images/icons/nuvola/16/run.png
+++ b/swat2/images/icons/nuvola/16/run.png
diff --git a/swat/images/icons/nuvola/16/services.png b/swat2/images/icons/nuvola/16/services.png
index 2a24b7e7f6..2a24b7e7f6 100644
--- a/swat/images/icons/nuvola/16/services.png
+++ b/swat2/images/icons/nuvola/16/services.png
diff --git a/swat/images/icons/nuvola/16/socket.png b/swat2/images/icons/nuvola/16/socket.png
index 3125ef8049..3125ef8049 100644
--- a/swat/images/icons/nuvola/16/socket.png
+++ b/swat2/images/icons/nuvola/16/socket.png
diff --git a/swat/images/icons/nuvola/16/spellcheck.png b/swat2/images/icons/nuvola/16/spellcheck.png
index b044b8cfb0..b044b8cfb0 100644
--- a/swat/images/icons/nuvola/16/spellcheck.png
+++ b/swat2/images/icons/nuvola/16/spellcheck.png
diff --git a/swat/images/icons/nuvola/16/stop.png b/swat2/images/icons/nuvola/16/stop.png
index dfb80b2e58..dfb80b2e58 100644
--- a/swat/images/icons/nuvola/16/stop.png
+++ b/swat2/images/icons/nuvola/16/stop.png
diff --git a/swat/images/icons/nuvola/16/style.png b/swat2/images/icons/nuvola/16/style.png
index d5210b4981..d5210b4981 100644
--- a/swat/images/icons/nuvola/16/style.png
+++ b/swat2/images/icons/nuvola/16/style.png
diff --git a/swat/images/icons/nuvola/16/stylesheet.png b/swat2/images/icons/nuvola/16/stylesheet.png
index f7f905706a..f7f905706a 100644
--- a/swat/images/icons/nuvola/16/stylesheet.png
+++ b/swat2/images/icons/nuvola/16/stylesheet.png
diff --git a/swat/images/icons/nuvola/16/thumbnail.png b/swat2/images/icons/nuvola/16/thumbnail.png
index 91adff8dee..91adff8dee 100644
--- a/swat/images/icons/nuvola/16/thumbnail.png
+++ b/swat2/images/icons/nuvola/16/thumbnail.png
diff --git a/swat/images/icons/nuvola/16/up.png b/swat2/images/icons/nuvola/16/up.png
index 184c118b63..184c118b63 100644
--- a/swat/images/icons/nuvola/16/up.png
+++ b/swat2/images/icons/nuvola/16/up.png
diff --git a/swat/images/icons/nuvola/16/wizard.png b/swat2/images/icons/nuvola/16/wizard.png
index c37091c035..c37091c035 100644
--- a/swat/images/icons/nuvola/16/wizard.png
+++ b/swat2/images/icons/nuvola/16/wizard.png
diff --git a/swat/images/icons/nuvola/22/access.png b/swat2/images/icons/nuvola/22/access.png
index 7ad09d5491..7ad09d5491 100644
--- a/swat/images/icons/nuvola/22/access.png
+++ b/swat2/images/icons/nuvola/22/access.png
diff --git a/swat/images/icons/nuvola/22/agent.png b/swat2/images/icons/nuvola/22/agent.png
index ac34011bbe..ac34011bbe 100644
--- a/swat/images/icons/nuvola/22/agent.png
+++ b/swat2/images/icons/nuvola/22/agent.png
diff --git a/swat/images/icons/nuvola/22/apply.png b/swat2/images/icons/nuvola/22/apply.png
index 2166fdffdf..2166fdffdf 100644
--- a/swat/images/icons/nuvola/22/apply.png
+++ b/swat2/images/icons/nuvola/22/apply.png
diff --git a/swat/images/icons/nuvola/22/back.png b/swat2/images/icons/nuvola/22/back.png
index f3925962f4..f3925962f4 100644
--- a/swat/images/icons/nuvola/22/back.png
+++ b/swat2/images/icons/nuvola/22/back.png
diff --git a/swat/images/icons/nuvola/22/background.png b/swat2/images/icons/nuvola/22/background.png
index da010da0a9..da010da0a9 100644
--- a/swat/images/icons/nuvola/22/background.png
+++ b/swat2/images/icons/nuvola/22/background.png
diff --git a/swat/images/icons/nuvola/22/bell.png b/swat2/images/icons/nuvola/22/bell.png
index 3fddea5464..3fddea5464 100644
--- a/swat/images/icons/nuvola/22/bell.png
+++ b/swat2/images/icons/nuvola/22/bell.png
diff --git a/swat/images/icons/nuvola/22/bookmark.png b/swat2/images/icons/nuvola/22/bookmark.png
index 51fb06bf20..51fb06bf20 100644
--- a/swat/images/icons/nuvola/22/bookmark.png
+++ b/swat2/images/icons/nuvola/22/bookmark.png
diff --git a/swat/images/icons/nuvola/22/browser.png b/swat2/images/icons/nuvola/22/browser.png
index 88d8e31ea6..88d8e31ea6 100644
--- a/swat/images/icons/nuvola/22/browser.png
+++ b/swat2/images/icons/nuvola/22/browser.png
diff --git a/swat/images/icons/nuvola/22/button_cancel.png b/swat2/images/icons/nuvola/22/button_cancel.png
index 816e06ace8..816e06ace8 100644
--- a/swat/images/icons/nuvola/22/button_cancel.png
+++ b/swat2/images/icons/nuvola/22/button_cancel.png
diff --git a/swat/images/icons/nuvola/22/button_ok.png b/swat2/images/icons/nuvola/22/button_ok.png
index 2166fdffdf..2166fdffdf 100644
--- a/swat/images/icons/nuvola/22/button_ok.png
+++ b/swat2/images/icons/nuvola/22/button_ok.png
diff --git a/swat/images/icons/nuvola/22/cache.png b/swat2/images/icons/nuvola/22/cache.png
index f83e9b70f5..f83e9b70f5 100644
--- a/swat/images/icons/nuvola/22/cache.png
+++ b/swat2/images/icons/nuvola/22/cache.png
diff --git a/swat/images/icons/nuvola/22/clock.png b/swat2/images/icons/nuvola/22/clock.png
index 885715309f..885715309f 100644
--- a/swat/images/icons/nuvola/22/clock.png
+++ b/swat2/images/icons/nuvola/22/clock.png
diff --git a/swat/images/icons/nuvola/22/colorize.png b/swat2/images/icons/nuvola/22/colorize.png
index ed4ad654f2..ed4ad654f2 100644
--- a/swat/images/icons/nuvola/22/colorize.png
+++ b/swat2/images/icons/nuvola/22/colorize.png
diff --git a/swat/images/icons/nuvola/22/colors.png b/swat2/images/icons/nuvola/22/colors.png
index 4b925cd294..4b925cd294 100644
--- a/swat/images/icons/nuvola/22/colors.png
+++ b/swat2/images/icons/nuvola/22/colors.png
diff --git a/swat/images/icons/nuvola/22/colorset.png b/swat2/images/icons/nuvola/22/colorset.png
index 24cec5aa6f..24cec5aa6f 100644
--- a/swat/images/icons/nuvola/22/colorset.png
+++ b/swat2/images/icons/nuvola/22/colorset.png
diff --git a/swat/images/icons/nuvola/22/configure.png b/swat2/images/icons/nuvola/22/configure.png
index 9e205a0e7a..9e205a0e7a 100644
--- a/swat/images/icons/nuvola/22/configure.png
+++ b/swat2/images/icons/nuvola/22/configure.png
diff --git a/swat/images/icons/nuvola/22/cookie.png b/swat2/images/icons/nuvola/22/cookie.png
index f9897b7031..f9897b7031 100644
--- a/swat/images/icons/nuvola/22/cookie.png
+++ b/swat2/images/icons/nuvola/22/cookie.png
diff --git a/swat/images/icons/nuvola/22/core.png b/swat2/images/icons/nuvola/22/core.png
index f444ab76c4..f444ab76c4 100644
--- a/swat/images/icons/nuvola/22/core.png
+++ b/swat2/images/icons/nuvola/22/core.png
diff --git a/swat/images/icons/nuvola/22/date.png b/swat2/images/icons/nuvola/22/date.png
index 1b7fd5c4d3..1b7fd5c4d3 100644
--- a/swat/images/icons/nuvola/22/date.png
+++ b/swat2/images/icons/nuvola/22/date.png
diff --git a/swat/images/icons/nuvola/22/decrypted.png b/swat2/images/icons/nuvola/22/decrypted.png
index bdac7c1a52..bdac7c1a52 100644
--- a/swat/images/icons/nuvola/22/decrypted.png
+++ b/swat2/images/icons/nuvola/22/decrypted.png
diff --git a/swat/images/icons/nuvola/22/desktop.png b/swat2/images/icons/nuvola/22/desktop.png
index c78e07ebee..c78e07ebee 100644
--- a/swat/images/icons/nuvola/22/desktop.png
+++ b/swat2/images/icons/nuvola/22/desktop.png
diff --git a/swat/images/icons/nuvola/22/display.png b/swat2/images/icons/nuvola/22/display.png
index 2e64d1821a..2e64d1821a 100644
--- a/swat/images/icons/nuvola/22/display.png
+++ b/swat2/images/icons/nuvola/22/display.png
diff --git a/swat/images/icons/nuvola/22/document.png b/swat2/images/icons/nuvola/22/document.png
index 1a81ef642c..1a81ef642c 100644
--- a/swat/images/icons/nuvola/22/document.png
+++ b/swat2/images/icons/nuvola/22/document.png
diff --git a/swat/images/icons/nuvola/22/down.png b/swat2/images/icons/nuvola/22/down.png
index 0733092bdd..0733092bdd 100644
--- a/swat/images/icons/nuvola/22/down.png
+++ b/swat2/images/icons/nuvola/22/down.png
diff --git a/swat/images/icons/nuvola/22/edit.png b/swat2/images/icons/nuvola/22/edit.png
index de1659ef22..de1659ef22 100644
--- a/swat/images/icons/nuvola/22/edit.png
+++ b/swat2/images/icons/nuvola/22/edit.png
diff --git a/swat/images/icons/nuvola/22/editcopy.png b/swat2/images/icons/nuvola/22/editcopy.png
index df03cf3f39..df03cf3f39 100644
--- a/swat/images/icons/nuvola/22/editcopy.png
+++ b/swat2/images/icons/nuvola/22/editcopy.png
diff --git a/swat/images/icons/nuvola/22/editcut.png b/swat2/images/icons/nuvola/22/editcut.png
index 9845a4268f..9845a4268f 100644
--- a/swat/images/icons/nuvola/22/editcut.png
+++ b/swat2/images/icons/nuvola/22/editcut.png
diff --git a/swat/images/icons/nuvola/22/editdelete.png b/swat2/images/icons/nuvola/22/editdelete.png
index 51839a2f44..51839a2f44 100644
--- a/swat/images/icons/nuvola/22/editdelete.png
+++ b/swat2/images/icons/nuvola/22/editdelete.png
diff --git a/swat/images/icons/nuvola/22/editpaste.png b/swat2/images/icons/nuvola/22/editpaste.png
index 8b7c30068c..8b7c30068c 100644
--- a/swat/images/icons/nuvola/22/editpaste.png
+++ b/swat2/images/icons/nuvola/22/editpaste.png
diff --git a/swat/images/icons/nuvola/22/edittrash.png b/swat2/images/icons/nuvola/22/edittrash.png
index 600a9a93cd..600a9a93cd 100644
--- a/swat/images/icons/nuvola/22/edittrash.png
+++ b/swat2/images/icons/nuvola/22/edittrash.png
diff --git a/swat/images/icons/nuvola/22/email.png b/swat2/images/icons/nuvola/22/email.png
index 789a5ea3c1..789a5ea3c1 100644
--- a/swat/images/icons/nuvola/22/email.png
+++ b/swat2/images/icons/nuvola/22/email.png
diff --git a/swat/images/icons/nuvola/22/empty.png b/swat2/images/icons/nuvola/22/empty.png
index bcbf0b4da6..bcbf0b4da6 100644
--- a/swat/images/icons/nuvola/22/empty.png
+++ b/swat2/images/icons/nuvola/22/empty.png
diff --git a/swat/images/icons/nuvola/22/encrypted.png b/swat2/images/icons/nuvola/22/encrypted.png
index 4b637f9e31..4b637f9e31 100644
--- a/swat/images/icons/nuvola/22/encrypted.png
+++ b/swat2/images/icons/nuvola/22/encrypted.png
diff --git a/swat/images/icons/nuvola/22/energy.png b/swat2/images/icons/nuvola/22/energy.png
index 06502e25ba..06502e25ba 100644
--- a/swat/images/icons/nuvola/22/energy.png
+++ b/swat2/images/icons/nuvola/22/energy.png
diff --git a/swat/images/icons/nuvola/22/error.png b/swat2/images/icons/nuvola/22/error.png
index f089ffb886..f089ffb886 100644
--- a/swat/images/icons/nuvola/22/error.png
+++ b/swat2/images/icons/nuvola/22/error.png
diff --git a/swat/images/icons/nuvola/22/exec.png b/swat2/images/icons/nuvola/22/exec.png
index a861875719..a861875719 100644
--- a/swat/images/icons/nuvola/22/exec.png
+++ b/swat2/images/icons/nuvola/22/exec.png
diff --git a/swat/images/icons/nuvola/22/filenew.png b/swat2/images/icons/nuvola/22/filenew.png
index 6e2700ad91..6e2700ad91 100644
--- a/swat/images/icons/nuvola/22/filenew.png
+++ b/swat2/images/icons/nuvola/22/filenew.png
diff --git a/swat/images/icons/nuvola/22/fileopen.png b/swat2/images/icons/nuvola/22/fileopen.png
index 61c388cf2d..61c388cf2d 100644
--- a/swat/images/icons/nuvola/22/fileopen.png
+++ b/swat2/images/icons/nuvola/22/fileopen.png
diff --git a/swat/images/icons/nuvola/22/fileprint.png b/swat2/images/icons/nuvola/22/fileprint.png
index 71831093d5..71831093d5 100644
--- a/swat/images/icons/nuvola/22/fileprint.png
+++ b/swat2/images/icons/nuvola/22/fileprint.png
diff --git a/swat/images/icons/nuvola/22/filesave.png b/swat2/images/icons/nuvola/22/filesave.png
index 74b37b0b51..74b37b0b51 100644
--- a/swat/images/icons/nuvola/22/filesave.png
+++ b/swat2/images/icons/nuvola/22/filesave.png
diff --git a/swat/images/icons/nuvola/22/filesaveas.png b/swat2/images/icons/nuvola/22/filesaveas.png
index 4321ca76bd..4321ca76bd 100644
--- a/swat/images/icons/nuvola/22/filesaveas.png
+++ b/swat2/images/icons/nuvola/22/filesaveas.png
diff --git a/swat/images/icons/nuvola/22/find.png b/swat2/images/icons/nuvola/22/find.png
index 12f7ca853e..12f7ca853e 100644
--- a/swat/images/icons/nuvola/22/find.png
+++ b/swat2/images/icons/nuvola/22/find.png
diff --git a/swat/images/icons/nuvola/22/folder.png b/swat2/images/icons/nuvola/22/folder.png
index 8b020e5fd1..8b020e5fd1 100644
--- a/swat/images/icons/nuvola/22/folder.png
+++ b/swat2/images/icons/nuvola/22/folder.png
diff --git a/swat/images/icons/nuvola/22/folder_home.png b/swat2/images/icons/nuvola/22/folder_home.png
index a4b9860f38..a4b9860f38 100644
--- a/swat/images/icons/nuvola/22/folder_home.png
+++ b/swat2/images/icons/nuvola/22/folder_home.png
diff --git a/swat/images/icons/nuvola/22/folder_important.png b/swat2/images/icons/nuvola/22/folder_important.png
index 39e944d61e..39e944d61e 100644
--- a/swat/images/icons/nuvola/22/folder_important.png
+++ b/swat2/images/icons/nuvola/22/folder_important.png
diff --git a/swat/images/icons/nuvola/22/folder_locked.png b/swat2/images/icons/nuvola/22/folder_locked.png
index c15328d21c..c15328d21c 100644
--- a/swat/images/icons/nuvola/22/folder_locked.png
+++ b/swat2/images/icons/nuvola/22/folder_locked.png
diff --git a/swat/images/icons/nuvola/22/folder_open.png b/swat2/images/icons/nuvola/22/folder_open.png
index a801665fd5..a801665fd5 100644
--- a/swat/images/icons/nuvola/22/folder_open.png
+++ b/swat2/images/icons/nuvola/22/folder_open.png
diff --git a/swat/images/icons/nuvola/22/font.png b/swat2/images/icons/nuvola/22/font.png
index 199eb87070..199eb87070 100644
--- a/swat/images/icons/nuvola/22/font.png
+++ b/swat2/images/icons/nuvola/22/font.png
diff --git a/swat/images/icons/nuvola/22/forward.png b/swat2/images/icons/nuvola/22/forward.png
index 96ae3a5f63..96ae3a5f63 100644
--- a/swat/images/icons/nuvola/22/forward.png
+++ b/swat2/images/icons/nuvola/22/forward.png
diff --git a/swat/images/icons/nuvola/22/gohome.png b/swat2/images/icons/nuvola/22/gohome.png
index 74c6933b44..74c6933b44 100644
--- a/swat/images/icons/nuvola/22/gohome.png
+++ b/swat2/images/icons/nuvola/22/gohome.png
diff --git a/swat/images/icons/nuvola/22/help.png b/swat2/images/icons/nuvola/22/help.png
index 8aef08eec3..8aef08eec3 100644
--- a/swat/images/icons/nuvola/22/help.png
+++ b/swat2/images/icons/nuvola/22/help.png
diff --git a/swat/images/icons/nuvola/22/history.png b/swat2/images/icons/nuvola/22/history.png
index d7b86ef2a5..d7b86ef2a5 100644
--- a/swat/images/icons/nuvola/22/history.png
+++ b/swat2/images/icons/nuvola/22/history.png
diff --git a/swat/images/icons/nuvola/22/hwinfo.png b/swat2/images/icons/nuvola/22/hwinfo.png
index 312a4ea1b4..312a4ea1b4 100644
--- a/swat/images/icons/nuvola/22/hwinfo.png
+++ b/swat2/images/icons/nuvola/22/hwinfo.png
diff --git a/swat/images/icons/nuvola/22/icons.png b/swat2/images/icons/nuvola/22/icons.png
index 2ac2076e49..2ac2076e49 100644
--- a/swat/images/icons/nuvola/22/icons.png
+++ b/swat2/images/icons/nuvola/22/icons.png
diff --git a/swat/images/icons/nuvola/22/iconthemes.png b/swat2/images/icons/nuvola/22/iconthemes.png
index 9c5b717106..9c5b717106 100644
--- a/swat/images/icons/nuvola/22/iconthemes.png
+++ b/swat2/images/icons/nuvola/22/iconthemes.png
diff --git a/swat/images/icons/nuvola/22/important.png b/swat2/images/icons/nuvola/22/important.png
index cc240aa515..cc240aa515 100644
--- a/swat/images/icons/nuvola/22/important.png
+++ b/swat2/images/icons/nuvola/22/important.png
diff --git a/swat/images/icons/nuvola/22/info.png b/swat2/images/icons/nuvola/22/info.png
index c337112a81..c337112a81 100644
--- a/swat/images/icons/nuvola/22/info.png
+++ b/swat2/images/icons/nuvola/22/info.png
diff --git a/swat/images/icons/nuvola/22/kcoloredit.png b/swat2/images/icons/nuvola/22/kcoloredit.png
index b6b692afcf..b6b692afcf 100644
--- a/swat/images/icons/nuvola/22/kcoloredit.png
+++ b/swat2/images/icons/nuvola/22/kcoloredit.png
diff --git a/swat/images/icons/nuvola/22/kcontrol.png b/swat2/images/icons/nuvola/22/kcontrol.png
index e4d376d853..e4d376d853 100644
--- a/swat/images/icons/nuvola/22/kcontrol.png
+++ b/swat2/images/icons/nuvola/22/kcontrol.png
diff --git a/swat/images/icons/nuvola/22/keyboard.png b/swat2/images/icons/nuvola/22/keyboard.png
index fc1c3b43fb..fc1c3b43fb 100644
--- a/swat/images/icons/nuvola/22/keyboard.png
+++ b/swat2/images/icons/nuvola/22/keyboard.png
diff --git a/swat/images/icons/nuvola/22/khelpcenter.png b/swat2/images/icons/nuvola/22/khelpcenter.png
index 37cdb2777e..37cdb2777e 100644
--- a/swat/images/icons/nuvola/22/khelpcenter.png
+++ b/swat2/images/icons/nuvola/22/khelpcenter.png
diff --git a/swat/images/icons/nuvola/22/kmix.png b/swat2/images/icons/nuvola/22/kmix.png
index a60f1b4d06..a60f1b4d06 100644
--- a/swat/images/icons/nuvola/22/kmix.png
+++ b/swat2/images/icons/nuvola/22/kmix.png
diff --git a/swat/images/icons/nuvola/22/knotify.png b/swat2/images/icons/nuvola/22/knotify.png
index 6c76e4a6ab..6c76e4a6ab 100644
--- a/swat/images/icons/nuvola/22/knotify.png
+++ b/swat2/images/icons/nuvola/22/knotify.png
diff --git a/swat/images/icons/nuvola/22/konqueror.png b/swat2/images/icons/nuvola/22/konqueror.png
index dcc74ecae7..dcc74ecae7 100644
--- a/swat/images/icons/nuvola/22/konqueror.png
+++ b/swat2/images/icons/nuvola/22/konqueror.png
diff --git a/swat/images/icons/nuvola/22/kpackage.png b/swat2/images/icons/nuvola/22/kpackage.png
index 006392c8a9..006392c8a9 100644
--- a/swat/images/icons/nuvola/22/kpackage.png
+++ b/swat2/images/icons/nuvola/22/kpackage.png
diff --git a/swat/images/icons/nuvola/22/kpaint.png b/swat2/images/icons/nuvola/22/kpaint.png
index f20282bf6e..f20282bf6e 100644
--- a/swat/images/icons/nuvola/22/kpaint.png
+++ b/swat2/images/icons/nuvola/22/kpaint.png
diff --git a/swat/images/icons/nuvola/22/krita.png b/swat2/images/icons/nuvola/22/krita.png
index e678d47e7a..e678d47e7a 100644
--- a/swat/images/icons/nuvola/22/krita.png
+++ b/swat2/images/icons/nuvola/22/krita.png
diff --git a/swat/images/icons/nuvola/22/ksnapshot.png b/swat2/images/icons/nuvola/22/ksnapshot.png
index 1fb3e4c922..1fb3e4c922 100644
--- a/swat/images/icons/nuvola/22/ksnapshot.png
+++ b/swat2/images/icons/nuvola/22/ksnapshot.png
diff --git a/swat/images/icons/nuvola/22/ktip.png b/swat2/images/icons/nuvola/22/ktip.png
index d5eac1c587..d5eac1c587 100644
--- a/swat/images/icons/nuvola/22/ktip.png
+++ b/swat2/images/icons/nuvola/22/ktip.png
diff --git a/swat/images/icons/nuvola/22/kuser.png b/swat2/images/icons/nuvola/22/kuser.png
index c5c8dc6d64..c5c8dc6d64 100644
--- a/swat/images/icons/nuvola/22/kuser.png
+++ b/swat2/images/icons/nuvola/22/kuser.png
diff --git a/swat/images/icons/nuvola/22/kview.png b/swat2/images/icons/nuvola/22/kview.png
index 9d7aeb86a5..9d7aeb86a5 100644
--- a/swat/images/icons/nuvola/22/kview.png
+++ b/swat2/images/icons/nuvola/22/kview.png
diff --git a/swat/images/icons/nuvola/22/locale.png b/swat2/images/icons/nuvola/22/locale.png
index bee7d4064a..bee7d4064a 100644
--- a/swat/images/icons/nuvola/22/locale.png
+++ b/swat2/images/icons/nuvola/22/locale.png
diff --git a/swat/images/icons/nuvola/22/mail_delete.png b/swat2/images/icons/nuvola/22/mail_delete.png
index 035a9f062c..035a9f062c 100644
--- a/swat/images/icons/nuvola/22/mail_delete.png
+++ b/swat2/images/icons/nuvola/22/mail_delete.png
diff --git a/swat/images/icons/nuvola/22/mail_find.png b/swat2/images/icons/nuvola/22/mail_find.png
index 76af932330..76af932330 100644
--- a/swat/images/icons/nuvola/22/mail_find.png
+++ b/swat2/images/icons/nuvola/22/mail_find.png
diff --git a/swat/images/icons/nuvola/22/mail_forward.png b/swat2/images/icons/nuvola/22/mail_forward.png
index 5086ef86ab..5086ef86ab 100644
--- a/swat/images/icons/nuvola/22/mail_forward.png
+++ b/swat2/images/icons/nuvola/22/mail_forward.png
diff --git a/swat/images/icons/nuvola/22/mail_generic.png b/swat2/images/icons/nuvola/22/mail_generic.png
index 512378508b..512378508b 100644
--- a/swat/images/icons/nuvola/22/mail_generic.png
+++ b/swat2/images/icons/nuvola/22/mail_generic.png
diff --git a/swat/images/icons/nuvola/22/mail_new.png b/swat2/images/icons/nuvola/22/mail_new.png
index 969fec5b57..969fec5b57 100644
--- a/swat/images/icons/nuvola/22/mail_new.png
+++ b/swat2/images/icons/nuvola/22/mail_new.png
diff --git a/swat/images/icons/nuvola/22/mail_replyall.png b/swat2/images/icons/nuvola/22/mail_replyall.png
index 6ec45ee840..6ec45ee840 100644
--- a/swat/images/icons/nuvola/22/mail_replyall.png
+++ b/swat2/images/icons/nuvola/22/mail_replyall.png
diff --git a/swat/images/icons/nuvola/22/mail_send.png b/swat2/images/icons/nuvola/22/mail_send.png
index 4b72194e0c..4b72194e0c 100644
--- a/swat/images/icons/nuvola/22/mail_send.png
+++ b/swat2/images/icons/nuvola/22/mail_send.png
diff --git a/swat/images/icons/nuvola/22/misc.png b/swat2/images/icons/nuvola/22/misc.png
index 625285f0bb..625285f0bb 100644
--- a/swat/images/icons/nuvola/22/misc.png
+++ b/swat2/images/icons/nuvola/22/misc.png
diff --git a/swat/images/icons/nuvola/22/mycomputer.png b/swat2/images/icons/nuvola/22/mycomputer.png
index c52d85af68..c52d85af68 100644
--- a/swat/images/icons/nuvola/22/mycomputer.png
+++ b/swat2/images/icons/nuvola/22/mycomputer.png
diff --git a/swat/images/icons/nuvola/22/netscape.png b/swat2/images/icons/nuvola/22/netscape.png
index 00bf497dfb..00bf497dfb 100644
--- a/swat/images/icons/nuvola/22/netscape.png
+++ b/swat2/images/icons/nuvola/22/netscape.png
diff --git a/swat/images/icons/nuvola/22/network.png b/swat2/images/icons/nuvola/22/network.png
index 1929fe17c5..1929fe17c5 100644
--- a/swat/images/icons/nuvola/22/network.png
+++ b/swat2/images/icons/nuvola/22/network.png
diff --git a/swat/images/icons/nuvola/22/next.png b/swat2/images/icons/nuvola/22/next.png
index 95fc56834d..95fc56834d 100644
--- a/swat/images/icons/nuvola/22/next.png
+++ b/swat2/images/icons/nuvola/22/next.png
diff --git a/swat/images/icons/nuvola/22/no.png b/swat2/images/icons/nuvola/22/no.png
index df63d75073..df63d75073 100644
--- a/swat/images/icons/nuvola/22/no.png
+++ b/swat2/images/icons/nuvola/22/no.png
diff --git a/swat/images/icons/nuvola/22/ok.png b/swat2/images/icons/nuvola/22/ok.png
index 2166fdffdf..2166fdffdf 100644
--- a/swat/images/icons/nuvola/22/ok.png
+++ b/swat2/images/icons/nuvola/22/ok.png
diff --git a/swat/images/icons/nuvola/22/opera.png b/swat2/images/icons/nuvola/22/opera.png
index ce74c6d33e..ce74c6d33e 100644
--- a/swat/images/icons/nuvola/22/opera.png
+++ b/swat2/images/icons/nuvola/22/opera.png
diff --git a/swat/images/icons/nuvola/22/password.png b/swat2/images/icons/nuvola/22/password.png
index 96fb4cd564..96fb4cd564 100644
--- a/swat/images/icons/nuvola/22/password.png
+++ b/swat2/images/icons/nuvola/22/password.png
diff --git a/swat/images/icons/nuvola/22/pipe.png b/swat2/images/icons/nuvola/22/pipe.png
index 439e5c5fd7..439e5c5fd7 100644
--- a/swat/images/icons/nuvola/22/pipe.png
+++ b/swat2/images/icons/nuvola/22/pipe.png
diff --git a/swat/images/icons/nuvola/22/previous.png b/swat2/images/icons/nuvola/22/previous.png
index 77d0bec5ca..77d0bec5ca 100644
--- a/swat/images/icons/nuvola/22/previous.png
+++ b/swat2/images/icons/nuvola/22/previous.png
diff --git a/swat/images/icons/nuvola/22/realplayer.png b/swat2/images/icons/nuvola/22/realplayer.png
index 162136f922..162136f922 100644
--- a/swat/images/icons/nuvola/22/realplayer.png
+++ b/swat2/images/icons/nuvola/22/realplayer.png
diff --git a/swat/images/icons/nuvola/22/redo.png b/swat2/images/icons/nuvola/22/redo.png
index 7067f582e0..7067f582e0 100644
--- a/swat/images/icons/nuvola/22/redo.png
+++ b/swat2/images/icons/nuvola/22/redo.png
diff --git a/swat/images/icons/nuvola/22/reload.png b/swat2/images/icons/nuvola/22/reload.png
index 0d1ae45626..0d1ae45626 100644
--- a/swat/images/icons/nuvola/22/reload.png
+++ b/swat2/images/icons/nuvola/22/reload.png
diff --git a/swat/images/icons/nuvola/22/run.png b/swat2/images/icons/nuvola/22/run.png
index d108327435..d108327435 100644
--- a/swat/images/icons/nuvola/22/run.png
+++ b/swat2/images/icons/nuvola/22/run.png
diff --git a/swat/images/icons/nuvola/22/services.png b/swat2/images/icons/nuvola/22/services.png
index d1348ac572..d1348ac572 100644
--- a/swat/images/icons/nuvola/22/services.png
+++ b/swat2/images/icons/nuvola/22/services.png
diff --git a/swat/images/icons/nuvola/22/socket.png b/swat2/images/icons/nuvola/22/socket.png
index ddf5d6a63e..ddf5d6a63e 100644
--- a/swat/images/icons/nuvola/22/socket.png
+++ b/swat2/images/icons/nuvola/22/socket.png
diff --git a/swat/images/icons/nuvola/22/spellcheck.png b/swat2/images/icons/nuvola/22/spellcheck.png
index 45fe909a89..45fe909a89 100644
--- a/swat/images/icons/nuvola/22/spellcheck.png
+++ b/swat2/images/icons/nuvola/22/spellcheck.png
diff --git a/swat/images/icons/nuvola/22/stop.png b/swat2/images/icons/nuvola/22/stop.png
index da1e944263..da1e944263 100644
--- a/swat/images/icons/nuvola/22/stop.png
+++ b/swat2/images/icons/nuvola/22/stop.png
diff --git a/swat/images/icons/nuvola/22/style.png b/swat2/images/icons/nuvola/22/style.png
index 0bef0e59eb..0bef0e59eb 100644
--- a/swat/images/icons/nuvola/22/style.png
+++ b/swat2/images/icons/nuvola/22/style.png
diff --git a/swat/images/icons/nuvola/22/stylesheet.png b/swat2/images/icons/nuvola/22/stylesheet.png
index 5f5a4de57a..5f5a4de57a 100644
--- a/swat/images/icons/nuvola/22/stylesheet.png
+++ b/swat2/images/icons/nuvola/22/stylesheet.png
diff --git a/swat/images/icons/nuvola/22/thumbnail.png b/swat2/images/icons/nuvola/22/thumbnail.png
index e8056ca173..e8056ca173 100644
--- a/swat/images/icons/nuvola/22/thumbnail.png
+++ b/swat2/images/icons/nuvola/22/thumbnail.png
diff --git a/swat/images/icons/nuvola/22/up.png b/swat2/images/icons/nuvola/22/up.png
index 7475f6aafc..7475f6aafc 100644
--- a/swat/images/icons/nuvola/22/up.png
+++ b/swat2/images/icons/nuvola/22/up.png
diff --git a/swat/images/icons/nuvola/22/wizard.png b/swat2/images/icons/nuvola/22/wizard.png
index ad4436d1ed..ad4436d1ed 100644
--- a/swat/images/icons/nuvola/22/wizard.png
+++ b/swat2/images/icons/nuvola/22/wizard.png
diff --git a/swat/images/icons/nuvola/32/access.png b/swat2/images/icons/nuvola/32/access.png
index dfad3c507e..dfad3c507e 100644
--- a/swat/images/icons/nuvola/32/access.png
+++ b/swat2/images/icons/nuvola/32/access.png
diff --git a/swat/images/icons/nuvola/32/agent.png b/swat2/images/icons/nuvola/32/agent.png
index 80e060dbf6..80e060dbf6 100644
--- a/swat/images/icons/nuvola/32/agent.png
+++ b/swat2/images/icons/nuvola/32/agent.png
diff --git a/swat/images/icons/nuvola/32/apply.png b/swat2/images/icons/nuvola/32/apply.png
index 592ce6f4a5..592ce6f4a5 100644
--- a/swat/images/icons/nuvola/32/apply.png
+++ b/swat2/images/icons/nuvola/32/apply.png
diff --git a/swat/images/icons/nuvola/32/back.png b/swat2/images/icons/nuvola/32/back.png
index 2568b59b32..2568b59b32 100644
--- a/swat/images/icons/nuvola/32/back.png
+++ b/swat2/images/icons/nuvola/32/back.png
diff --git a/swat/images/icons/nuvola/32/background.png b/swat2/images/icons/nuvola/32/background.png
index e292b875d2..e292b875d2 100644
--- a/swat/images/icons/nuvola/32/background.png
+++ b/swat2/images/icons/nuvola/32/background.png
diff --git a/swat/images/icons/nuvola/32/bell.png b/swat2/images/icons/nuvola/32/bell.png
index 32b6d89521..32b6d89521 100644
--- a/swat/images/icons/nuvola/32/bell.png
+++ b/swat2/images/icons/nuvola/32/bell.png
diff --git a/swat/images/icons/nuvola/32/bookmark.png b/swat2/images/icons/nuvola/32/bookmark.png
index 6cccfd986b..6cccfd986b 100644
--- a/swat/images/icons/nuvola/32/bookmark.png
+++ b/swat2/images/icons/nuvola/32/bookmark.png
diff --git a/swat/images/icons/nuvola/32/browser.png b/swat2/images/icons/nuvola/32/browser.png
index e164a9f332..e164a9f332 100644
--- a/swat/images/icons/nuvola/32/browser.png
+++ b/swat2/images/icons/nuvola/32/browser.png
diff --git a/swat/images/icons/nuvola/32/button_cancel.png b/swat2/images/icons/nuvola/32/button_cancel.png
index 2d5e260a5f..2d5e260a5f 100644
--- a/swat/images/icons/nuvola/32/button_cancel.png
+++ b/swat2/images/icons/nuvola/32/button_cancel.png
diff --git a/swat/images/icons/nuvola/32/button_ok.png b/swat2/images/icons/nuvola/32/button_ok.png
index 592ce6f4a5..592ce6f4a5 100644
--- a/swat/images/icons/nuvola/32/button_ok.png
+++ b/swat2/images/icons/nuvola/32/button_ok.png
diff --git a/swat/images/icons/nuvola/32/cache.png b/swat2/images/icons/nuvola/32/cache.png
index ff4298bdf1..ff4298bdf1 100644
--- a/swat/images/icons/nuvola/32/cache.png
+++ b/swat2/images/icons/nuvola/32/cache.png
diff --git a/swat/images/icons/nuvola/32/clock.png b/swat2/images/icons/nuvola/32/clock.png
index 1836149e80..1836149e80 100644
--- a/swat/images/icons/nuvola/32/clock.png
+++ b/swat2/images/icons/nuvola/32/clock.png
diff --git a/swat/images/icons/nuvola/32/colorize.png b/swat2/images/icons/nuvola/32/colorize.png
index 38cb497923..38cb497923 100644
--- a/swat/images/icons/nuvola/32/colorize.png
+++ b/swat2/images/icons/nuvola/32/colorize.png
diff --git a/swat/images/icons/nuvola/32/colors.png b/swat2/images/icons/nuvola/32/colors.png
index 212adb0b41..212adb0b41 100644
--- a/swat/images/icons/nuvola/32/colors.png
+++ b/swat2/images/icons/nuvola/32/colors.png
diff --git a/swat/images/icons/nuvola/32/colorset.png b/swat2/images/icons/nuvola/32/colorset.png
index bab142f19f..bab142f19f 100644
--- a/swat/images/icons/nuvola/32/colorset.png
+++ b/swat2/images/icons/nuvola/32/colorset.png
diff --git a/swat/images/icons/nuvola/32/configure.png b/swat2/images/icons/nuvola/32/configure.png
index feebf2bdbe..feebf2bdbe 100644
--- a/swat/images/icons/nuvola/32/configure.png
+++ b/swat2/images/icons/nuvola/32/configure.png
diff --git a/swat/images/icons/nuvola/32/contents.png b/swat2/images/icons/nuvola/32/contents.png
index d3ba528bd0..d3ba528bd0 100644
--- a/swat/images/icons/nuvola/32/contents.png
+++ b/swat2/images/icons/nuvola/32/contents.png
diff --git a/swat/images/icons/nuvola/32/cookie.png b/swat2/images/icons/nuvola/32/cookie.png
index db4bd615ec..db4bd615ec 100644
--- a/swat/images/icons/nuvola/32/cookie.png
+++ b/swat2/images/icons/nuvola/32/cookie.png
diff --git a/swat/images/icons/nuvola/32/core.png b/swat2/images/icons/nuvola/32/core.png
index d8471dc06e..d8471dc06e 100644
--- a/swat/images/icons/nuvola/32/core.png
+++ b/swat2/images/icons/nuvola/32/core.png
diff --git a/swat/images/icons/nuvola/32/date.png b/swat2/images/icons/nuvola/32/date.png
index 41fa2acf77..41fa2acf77 100644
--- a/swat/images/icons/nuvola/32/date.png
+++ b/swat2/images/icons/nuvola/32/date.png
diff --git a/swat/images/icons/nuvola/32/decrypted.png b/swat2/images/icons/nuvola/32/decrypted.png
index 2b49969a53..2b49969a53 100644
--- a/swat/images/icons/nuvola/32/decrypted.png
+++ b/swat2/images/icons/nuvola/32/decrypted.png
diff --git a/swat/images/icons/nuvola/32/desktop.png b/swat2/images/icons/nuvola/32/desktop.png
index 9b993a5ebb..9b993a5ebb 100644
--- a/swat/images/icons/nuvola/32/desktop.png
+++ b/swat2/images/icons/nuvola/32/desktop.png
diff --git a/swat/images/icons/nuvola/32/display.png b/swat2/images/icons/nuvola/32/display.png
index 30f1dfa03d..30f1dfa03d 100644
--- a/swat/images/icons/nuvola/32/display.png
+++ b/swat2/images/icons/nuvola/32/display.png
diff --git a/swat/images/icons/nuvola/32/document.png b/swat2/images/icons/nuvola/32/document.png
index ac2ff05c76..ac2ff05c76 100644
--- a/swat/images/icons/nuvola/32/document.png
+++ b/swat2/images/icons/nuvola/32/document.png
diff --git a/swat/images/icons/nuvola/32/down.png b/swat2/images/icons/nuvola/32/down.png
index 5cbe6bb695..5cbe6bb695 100644
--- a/swat/images/icons/nuvola/32/down.png
+++ b/swat2/images/icons/nuvola/32/down.png
diff --git a/swat/images/icons/nuvola/32/edit.png b/swat2/images/icons/nuvola/32/edit.png
index f3ec32ed82..f3ec32ed82 100644
--- a/swat/images/icons/nuvola/32/edit.png
+++ b/swat2/images/icons/nuvola/32/edit.png
diff --git a/swat/images/icons/nuvola/32/editcopy.png b/swat2/images/icons/nuvola/32/editcopy.png
index 18627b7480..18627b7480 100644
--- a/swat/images/icons/nuvola/32/editcopy.png
+++ b/swat2/images/icons/nuvola/32/editcopy.png
diff --git a/swat/images/icons/nuvola/32/editcut.png b/swat2/images/icons/nuvola/32/editcut.png
index ad6fbb15e4..ad6fbb15e4 100644
--- a/swat/images/icons/nuvola/32/editcut.png
+++ b/swat2/images/icons/nuvola/32/editcut.png
diff --git a/swat/images/icons/nuvola/32/editdelete.png b/swat2/images/icons/nuvola/32/editdelete.png
index ab71fae93f..ab71fae93f 100644
--- a/swat/images/icons/nuvola/32/editdelete.png
+++ b/swat2/images/icons/nuvola/32/editdelete.png
diff --git a/swat/images/icons/nuvola/32/editpaste.png b/swat2/images/icons/nuvola/32/editpaste.png
index 9e224a9ec4..9e224a9ec4 100644
--- a/swat/images/icons/nuvola/32/editpaste.png
+++ b/swat2/images/icons/nuvola/32/editpaste.png
diff --git a/swat/images/icons/nuvola/32/edittrash.png b/swat2/images/icons/nuvola/32/edittrash.png
index 6170d86cbb..6170d86cbb 100644
--- a/swat/images/icons/nuvola/32/edittrash.png
+++ b/swat2/images/icons/nuvola/32/edittrash.png
diff --git a/swat/images/icons/nuvola/32/email.png b/swat2/images/icons/nuvola/32/email.png
index 637920745e..637920745e 100644
--- a/swat/images/icons/nuvola/32/email.png
+++ b/swat2/images/icons/nuvola/32/email.png
diff --git a/swat/images/icons/nuvola/32/empty.png b/swat2/images/icons/nuvola/32/empty.png
index b5cb3ae95c..b5cb3ae95c 100644
--- a/swat/images/icons/nuvola/32/empty.png
+++ b/swat2/images/icons/nuvola/32/empty.png
diff --git a/swat/images/icons/nuvola/32/encrypted.png b/swat2/images/icons/nuvola/32/encrypted.png
index 4ae41eeef4..4ae41eeef4 100644
--- a/swat/images/icons/nuvola/32/encrypted.png
+++ b/swat2/images/icons/nuvola/32/encrypted.png
diff --git a/swat/images/icons/nuvola/32/energy.png b/swat2/images/icons/nuvola/32/energy.png
index a530b1ba7c..a530b1ba7c 100644
--- a/swat/images/icons/nuvola/32/energy.png
+++ b/swat2/images/icons/nuvola/32/energy.png
diff --git a/swat/images/icons/nuvola/32/error.png b/swat2/images/icons/nuvola/32/error.png
index 538cb9039f..538cb9039f 100644
--- a/swat/images/icons/nuvola/32/error.png
+++ b/swat2/images/icons/nuvola/32/error.png
diff --git a/swat/images/icons/nuvola/32/exec.png b/swat2/images/icons/nuvola/32/exec.png
index 1780eafc6c..1780eafc6c 100644
--- a/swat/images/icons/nuvola/32/exec.png
+++ b/swat2/images/icons/nuvola/32/exec.png
diff --git a/swat/images/icons/nuvola/32/filenew.png b/swat2/images/icons/nuvola/32/filenew.png
index a71c1a254e..a71c1a254e 100644
--- a/swat/images/icons/nuvola/32/filenew.png
+++ b/swat2/images/icons/nuvola/32/filenew.png
diff --git a/swat/images/icons/nuvola/32/fileopen.png b/swat2/images/icons/nuvola/32/fileopen.png
index 77c992f5aa..77c992f5aa 100644
--- a/swat/images/icons/nuvola/32/fileopen.png
+++ b/swat2/images/icons/nuvola/32/fileopen.png
diff --git a/swat/images/icons/nuvola/32/fileprint.png b/swat2/images/icons/nuvola/32/fileprint.png
index a510ec6558..a510ec6558 100644
--- a/swat/images/icons/nuvola/32/fileprint.png
+++ b/swat2/images/icons/nuvola/32/fileprint.png
diff --git a/swat/images/icons/nuvola/32/filesave.png b/swat2/images/icons/nuvola/32/filesave.png
index ae13a151d5..ae13a151d5 100644
--- a/swat/images/icons/nuvola/32/filesave.png
+++ b/swat2/images/icons/nuvola/32/filesave.png
diff --git a/swat/images/icons/nuvola/32/filesaveas.png b/swat2/images/icons/nuvola/32/filesaveas.png
index 55ca1ec25e..55ca1ec25e 100644
--- a/swat/images/icons/nuvola/32/filesaveas.png
+++ b/swat2/images/icons/nuvola/32/filesaveas.png
diff --git a/swat/images/icons/nuvola/32/find.png b/swat2/images/icons/nuvola/32/find.png
index f1ad60c860..f1ad60c860 100644
--- a/swat/images/icons/nuvola/32/find.png
+++ b/swat2/images/icons/nuvola/32/find.png
diff --git a/swat/images/icons/nuvola/32/folder.png b/swat2/images/icons/nuvola/32/folder.png
index bd433f4bfd..bd433f4bfd 100644
--- a/swat/images/icons/nuvola/32/folder.png
+++ b/swat2/images/icons/nuvola/32/folder.png
diff --git a/swat/images/icons/nuvola/32/folder_home.png b/swat2/images/icons/nuvola/32/folder_home.png
index 0094f836cd..0094f836cd 100644
--- a/swat/images/icons/nuvola/32/folder_home.png
+++ b/swat2/images/icons/nuvola/32/folder_home.png
diff --git a/swat/images/icons/nuvola/32/folder_important.png b/swat2/images/icons/nuvola/32/folder_important.png
index 3f104626a6..3f104626a6 100644
--- a/swat/images/icons/nuvola/32/folder_important.png
+++ b/swat2/images/icons/nuvola/32/folder_important.png
diff --git a/swat/images/icons/nuvola/32/folder_locked.png b/swat2/images/icons/nuvola/32/folder_locked.png
index e540a90261..e540a90261 100644
--- a/swat/images/icons/nuvola/32/folder_locked.png
+++ b/swat2/images/icons/nuvola/32/folder_locked.png
diff --git a/swat/images/icons/nuvola/32/folder_open.png b/swat2/images/icons/nuvola/32/folder_open.png
index 376aa6ec18..376aa6ec18 100644
--- a/swat/images/icons/nuvola/32/folder_open.png
+++ b/swat2/images/icons/nuvola/32/folder_open.png
diff --git a/swat/images/icons/nuvola/32/font.png b/swat2/images/icons/nuvola/32/font.png
index 2cf6665245..2cf6665245 100644
--- a/swat/images/icons/nuvola/32/font.png
+++ b/swat2/images/icons/nuvola/32/font.png
diff --git a/swat/images/icons/nuvola/32/forward.png b/swat2/images/icons/nuvola/32/forward.png
index 3453bde583..3453bde583 100644
--- a/swat/images/icons/nuvola/32/forward.png
+++ b/swat2/images/icons/nuvola/32/forward.png
diff --git a/swat/images/icons/nuvola/32/gohome.png b/swat2/images/icons/nuvola/32/gohome.png
index 86ea229cfd..86ea229cfd 100644
--- a/swat/images/icons/nuvola/32/gohome.png
+++ b/swat2/images/icons/nuvola/32/gohome.png
diff --git a/swat/images/icons/nuvola/32/help.png b/swat2/images/icons/nuvola/32/help.png
index d56ba2c244..d56ba2c244 100644
--- a/swat/images/icons/nuvola/32/help.png
+++ b/swat2/images/icons/nuvola/32/help.png
diff --git a/swat/images/icons/nuvola/32/history.png b/swat2/images/icons/nuvola/32/history.png
index 1f36acaa16..1f36acaa16 100644
--- a/swat/images/icons/nuvola/32/history.png
+++ b/swat2/images/icons/nuvola/32/history.png
diff --git a/swat/images/icons/nuvola/32/hwinfo.png b/swat2/images/icons/nuvola/32/hwinfo.png
index 41d50b7a96..41d50b7a96 100644
--- a/swat/images/icons/nuvola/32/hwinfo.png
+++ b/swat2/images/icons/nuvola/32/hwinfo.png
diff --git a/swat/images/icons/nuvola/32/icons.png b/swat2/images/icons/nuvola/32/icons.png
index 86cd87bde4..86cd87bde4 100644
--- a/swat/images/icons/nuvola/32/icons.png
+++ b/swat2/images/icons/nuvola/32/icons.png
diff --git a/swat/images/icons/nuvola/32/iconthemes.png b/swat2/images/icons/nuvola/32/iconthemes.png
index 6345beab59..6345beab59 100644
--- a/swat/images/icons/nuvola/32/iconthemes.png
+++ b/swat2/images/icons/nuvola/32/iconthemes.png
diff --git a/swat/images/icons/nuvola/32/important.png b/swat2/images/icons/nuvola/32/important.png
index 284e5e32b8..284e5e32b8 100644
--- a/swat/images/icons/nuvola/32/important.png
+++ b/swat2/images/icons/nuvola/32/important.png
diff --git a/swat/images/icons/nuvola/32/info.png b/swat2/images/icons/nuvola/32/info.png
index a4e834f867..a4e834f867 100644
--- a/swat/images/icons/nuvola/32/info.png
+++ b/swat2/images/icons/nuvola/32/info.png
diff --git a/swat/images/icons/nuvola/32/kcoloredit.png b/swat2/images/icons/nuvola/32/kcoloredit.png
index 48102de844..48102de844 100644
--- a/swat/images/icons/nuvola/32/kcoloredit.png
+++ b/swat2/images/icons/nuvola/32/kcoloredit.png
diff --git a/swat/images/icons/nuvola/32/kcontrol.png b/swat2/images/icons/nuvola/32/kcontrol.png
index 6f3b1f49d7..6f3b1f49d7 100644
--- a/swat/images/icons/nuvola/32/kcontrol.png
+++ b/swat2/images/icons/nuvola/32/kcontrol.png
diff --git a/swat/images/icons/nuvola/32/keyboard.png b/swat2/images/icons/nuvola/32/keyboard.png
index 686964f4a6..686964f4a6 100644
--- a/swat/images/icons/nuvola/32/keyboard.png
+++ b/swat2/images/icons/nuvola/32/keyboard.png
diff --git a/swat/images/icons/nuvola/32/khelpcenter.png b/swat2/images/icons/nuvola/32/khelpcenter.png
index c59d5a0035..c59d5a0035 100644
--- a/swat/images/icons/nuvola/32/khelpcenter.png
+++ b/swat2/images/icons/nuvola/32/khelpcenter.png
diff --git a/swat/images/icons/nuvola/32/kmix.png b/swat2/images/icons/nuvola/32/kmix.png
index 2c8b5be9a0..2c8b5be9a0 100644
--- a/swat/images/icons/nuvola/32/kmix.png
+++ b/swat2/images/icons/nuvola/32/kmix.png
diff --git a/swat/images/icons/nuvola/32/knotify.png b/swat2/images/icons/nuvola/32/knotify.png
index bfbc795861..bfbc795861 100644
--- a/swat/images/icons/nuvola/32/knotify.png
+++ b/swat2/images/icons/nuvola/32/knotify.png
diff --git a/swat/images/icons/nuvola/32/konqueror.png b/swat2/images/icons/nuvola/32/konqueror.png
index 14f3235794..14f3235794 100644
--- a/swat/images/icons/nuvola/32/konqueror.png
+++ b/swat2/images/icons/nuvola/32/konqueror.png
diff --git a/swat/images/icons/nuvola/32/kpackage.png b/swat2/images/icons/nuvola/32/kpackage.png
index 2aabd0a24a..2aabd0a24a 100644
--- a/swat/images/icons/nuvola/32/kpackage.png
+++ b/swat2/images/icons/nuvola/32/kpackage.png
diff --git a/swat/images/icons/nuvola/32/kpaint.png b/swat2/images/icons/nuvola/32/kpaint.png
index 9ec1a85d8d..9ec1a85d8d 100644
--- a/swat/images/icons/nuvola/32/kpaint.png
+++ b/swat2/images/icons/nuvola/32/kpaint.png
diff --git a/swat/images/icons/nuvola/32/krita.png b/swat2/images/icons/nuvola/32/krita.png
index 455018c086..455018c086 100644
--- a/swat/images/icons/nuvola/32/krita.png
+++ b/swat2/images/icons/nuvola/32/krita.png
diff --git a/swat/images/icons/nuvola/32/ksnapshot.png b/swat2/images/icons/nuvola/32/ksnapshot.png
index 267add622c..267add622c 100644
--- a/swat/images/icons/nuvola/32/ksnapshot.png
+++ b/swat2/images/icons/nuvola/32/ksnapshot.png
diff --git a/swat/images/icons/nuvola/32/ktip.png b/swat2/images/icons/nuvola/32/ktip.png
index 9261b963cd..9261b963cd 100644
--- a/swat/images/icons/nuvola/32/ktip.png
+++ b/swat2/images/icons/nuvola/32/ktip.png
diff --git a/swat/images/icons/nuvola/32/kuser.png b/swat2/images/icons/nuvola/32/kuser.png
index b368c3d82f..b368c3d82f 100644
--- a/swat/images/icons/nuvola/32/kuser.png
+++ b/swat2/images/icons/nuvola/32/kuser.png
diff --git a/swat/images/icons/nuvola/32/kview.png b/swat2/images/icons/nuvola/32/kview.png
index 341752c820..341752c820 100644
--- a/swat/images/icons/nuvola/32/kview.png
+++ b/swat2/images/icons/nuvola/32/kview.png
diff --git a/swat/images/icons/nuvola/32/locale.png b/swat2/images/icons/nuvola/32/locale.png
index 91817460fd..91817460fd 100644
--- a/swat/images/icons/nuvola/32/locale.png
+++ b/swat2/images/icons/nuvola/32/locale.png
diff --git a/swat/images/icons/nuvola/32/looknfeel.png b/swat2/images/icons/nuvola/32/looknfeel.png
index 377440b075..377440b075 100644
--- a/swat/images/icons/nuvola/32/looknfeel.png
+++ b/swat2/images/icons/nuvola/32/looknfeel.png
diff --git a/swat/images/icons/nuvola/32/mail_delete.png b/swat2/images/icons/nuvola/32/mail_delete.png
index 7014f9f803..7014f9f803 100644
--- a/swat/images/icons/nuvola/32/mail_delete.png
+++ b/swat2/images/icons/nuvola/32/mail_delete.png
diff --git a/swat/images/icons/nuvola/32/mail_find.png b/swat2/images/icons/nuvola/32/mail_find.png
index 81d608855e..81d608855e 100644
--- a/swat/images/icons/nuvola/32/mail_find.png
+++ b/swat2/images/icons/nuvola/32/mail_find.png
diff --git a/swat/images/icons/nuvola/32/mail_forward.png b/swat2/images/icons/nuvola/32/mail_forward.png
index 6d27c215b3..6d27c215b3 100644
--- a/swat/images/icons/nuvola/32/mail_forward.png
+++ b/swat2/images/icons/nuvola/32/mail_forward.png
diff --git a/swat/images/icons/nuvola/32/mail_generic.png b/swat2/images/icons/nuvola/32/mail_generic.png
index 356a2e7b6a..356a2e7b6a 100644
--- a/swat/images/icons/nuvola/32/mail_generic.png
+++ b/swat2/images/icons/nuvola/32/mail_generic.png
diff --git a/swat/images/icons/nuvola/32/mail_new.png b/swat2/images/icons/nuvola/32/mail_new.png
index 825459fdbb..825459fdbb 100644
--- a/swat/images/icons/nuvola/32/mail_new.png
+++ b/swat2/images/icons/nuvola/32/mail_new.png
diff --git a/swat/images/icons/nuvola/32/mail_replyall.png b/swat2/images/icons/nuvola/32/mail_replyall.png
index 5cc855dadf..5cc855dadf 100644
--- a/swat/images/icons/nuvola/32/mail_replyall.png
+++ b/swat2/images/icons/nuvola/32/mail_replyall.png
diff --git a/swat/images/icons/nuvola/32/mail_send.png b/swat2/images/icons/nuvola/32/mail_send.png
index 241544b1dd..241544b1dd 100644
--- a/swat/images/icons/nuvola/32/mail_send.png
+++ b/swat2/images/icons/nuvola/32/mail_send.png
diff --git a/swat/images/icons/nuvola/32/misc.png b/swat2/images/icons/nuvola/32/misc.png
index 135fd11b9f..135fd11b9f 100644
--- a/swat/images/icons/nuvola/32/misc.png
+++ b/swat2/images/icons/nuvola/32/misc.png
diff --git a/swat/images/icons/nuvola/32/mozilla.png b/swat2/images/icons/nuvola/32/mozilla.png
index fec3008cfb..fec3008cfb 100644
--- a/swat/images/icons/nuvola/32/mozilla.png
+++ b/swat2/images/icons/nuvola/32/mozilla.png
diff --git a/swat/images/icons/nuvola/32/mycomputer.png b/swat2/images/icons/nuvola/32/mycomputer.png
index de11b2be1e..de11b2be1e 100644
--- a/swat/images/icons/nuvola/32/mycomputer.png
+++ b/swat2/images/icons/nuvola/32/mycomputer.png
diff --git a/swat/images/icons/nuvola/32/netscape.png b/swat2/images/icons/nuvola/32/netscape.png
index 5b6775b0aa..5b6775b0aa 100644
--- a/swat/images/icons/nuvola/32/netscape.png
+++ b/swat2/images/icons/nuvola/32/netscape.png
diff --git a/swat/images/icons/nuvola/32/network.png b/swat2/images/icons/nuvola/32/network.png
index ac4c6ea2aa..ac4c6ea2aa 100644
--- a/swat/images/icons/nuvola/32/network.png
+++ b/swat2/images/icons/nuvola/32/network.png
diff --git a/swat/images/icons/nuvola/32/next.png b/swat2/images/icons/nuvola/32/next.png
index cd1be0cb74..cd1be0cb74 100644
--- a/swat/images/icons/nuvola/32/next.png
+++ b/swat2/images/icons/nuvola/32/next.png
diff --git a/swat/images/icons/nuvola/32/no.png b/swat2/images/icons/nuvola/32/no.png
index 03448225a9..03448225a9 100644
--- a/swat/images/icons/nuvola/32/no.png
+++ b/swat2/images/icons/nuvola/32/no.png
diff --git a/swat/images/icons/nuvola/32/ok.png b/swat2/images/icons/nuvola/32/ok.png
index 592ce6f4a5..592ce6f4a5 100644
--- a/swat/images/icons/nuvola/32/ok.png
+++ b/swat2/images/icons/nuvola/32/ok.png
diff --git a/swat/images/icons/nuvola/32/opera.png b/swat2/images/icons/nuvola/32/opera.png
index c3a0ee46c1..c3a0ee46c1 100644
--- a/swat/images/icons/nuvola/32/opera.png
+++ b/swat2/images/icons/nuvola/32/opera.png
diff --git a/swat/images/icons/nuvola/32/package.png b/swat2/images/icons/nuvola/32/package.png
index 3757bfa6b0..3757bfa6b0 100644
--- a/swat/images/icons/nuvola/32/package.png
+++ b/swat2/images/icons/nuvola/32/package.png
diff --git a/swat/images/icons/nuvola/32/password.png b/swat2/images/icons/nuvola/32/password.png
index b74e831fe3..b74e831fe3 100644
--- a/swat/images/icons/nuvola/32/password.png
+++ b/swat2/images/icons/nuvola/32/password.png
diff --git a/swat/images/icons/nuvola/32/pipe.png b/swat2/images/icons/nuvola/32/pipe.png
index 5df1cc4fa7..5df1cc4fa7 100644
--- a/swat/images/icons/nuvola/32/pipe.png
+++ b/swat2/images/icons/nuvola/32/pipe.png
diff --git a/swat/images/icons/nuvola/32/previous.png b/swat2/images/icons/nuvola/32/previous.png
index b3eb405316..b3eb405316 100644
--- a/swat/images/icons/nuvola/32/previous.png
+++ b/swat2/images/icons/nuvola/32/previous.png
diff --git a/swat/images/icons/nuvola/32/realplayer.png b/swat2/images/icons/nuvola/32/realplayer.png
index 2d1954e082..2d1954e082 100644
--- a/swat/images/icons/nuvola/32/realplayer.png
+++ b/swat2/images/icons/nuvola/32/realplayer.png
diff --git a/swat/images/icons/nuvola/32/redo.png b/swat2/images/icons/nuvola/32/redo.png
index 36bf9b6118..36bf9b6118 100644
--- a/swat/images/icons/nuvola/32/redo.png
+++ b/swat2/images/icons/nuvola/32/redo.png
diff --git a/swat/images/icons/nuvola/32/reload.png b/swat2/images/icons/nuvola/32/reload.png
index 4b0e37a11c..4b0e37a11c 100644
--- a/swat/images/icons/nuvola/32/reload.png
+++ b/swat2/images/icons/nuvola/32/reload.png
diff --git a/swat/images/icons/nuvola/32/run.png b/swat2/images/icons/nuvola/32/run.png
index db5111a9af..db5111a9af 100644
--- a/swat/images/icons/nuvola/32/run.png
+++ b/swat2/images/icons/nuvola/32/run.png
diff --git a/swat/images/icons/nuvola/32/services.png b/swat2/images/icons/nuvola/32/services.png
index fcee6c9cf2..fcee6c9cf2 100644
--- a/swat/images/icons/nuvola/32/services.png
+++ b/swat2/images/icons/nuvola/32/services.png
diff --git a/swat/images/icons/nuvola/32/socket.png b/swat2/images/icons/nuvola/32/socket.png
index cb5f8f0a3c..cb5f8f0a3c 100644
--- a/swat/images/icons/nuvola/32/socket.png
+++ b/swat2/images/icons/nuvola/32/socket.png
diff --git a/swat/images/icons/nuvola/32/spellcheck.png b/swat2/images/icons/nuvola/32/spellcheck.png
index c012684fb3..c012684fb3 100644
--- a/swat/images/icons/nuvola/32/spellcheck.png
+++ b/swat2/images/icons/nuvola/32/spellcheck.png
diff --git a/swat/images/icons/nuvola/32/stop.png b/swat2/images/icons/nuvola/32/stop.png
index b953dd7e3e..b953dd7e3e 100644
--- a/swat/images/icons/nuvola/32/stop.png
+++ b/swat2/images/icons/nuvola/32/stop.png
diff --git a/swat/images/icons/nuvola/32/style.png b/swat2/images/icons/nuvola/32/style.png
index 0788864116..0788864116 100644
--- a/swat/images/icons/nuvola/32/style.png
+++ b/swat2/images/icons/nuvola/32/style.png
diff --git a/swat/images/icons/nuvola/32/stylesheet.png b/swat2/images/icons/nuvola/32/stylesheet.png
index 35bdb05377..35bdb05377 100644
--- a/swat/images/icons/nuvola/32/stylesheet.png
+++ b/swat2/images/icons/nuvola/32/stylesheet.png
diff --git a/swat/images/icons/nuvola/32/thumbnail.png b/swat2/images/icons/nuvola/32/thumbnail.png
index 69e55a1d5d..69e55a1d5d 100644
--- a/swat/images/icons/nuvola/32/thumbnail.png
+++ b/swat2/images/icons/nuvola/32/thumbnail.png
diff --git a/swat/images/icons/nuvola/32/up.png b/swat2/images/icons/nuvola/32/up.png
index 899ad4fc9e..899ad4fc9e 100644
--- a/swat/images/icons/nuvola/32/up.png
+++ b/swat2/images/icons/nuvola/32/up.png
diff --git a/swat/images/icons/nuvola/32/wizard.png b/swat2/images/icons/nuvola/32/wizard.png
index 807d9c4a65..807d9c4a65 100644
--- a/swat/images/icons/nuvola/32/wizard.png
+++ b/swat2/images/icons/nuvola/32/wizard.png
diff --git a/swat/images/icons/nuvola/48/access.png b/swat2/images/icons/nuvola/48/access.png
index 39745787fb..39745787fb 100644
--- a/swat/images/icons/nuvola/48/access.png
+++ b/swat2/images/icons/nuvola/48/access.png
diff --git a/swat/images/icons/nuvola/48/agent.png b/swat2/images/icons/nuvola/48/agent.png
index 0ea9d236fc..0ea9d236fc 100644
--- a/swat/images/icons/nuvola/48/agent.png
+++ b/swat2/images/icons/nuvola/48/agent.png
diff --git a/swat/images/icons/nuvola/48/apply.png b/swat2/images/icons/nuvola/48/apply.png
index 3b7a6907ee..3b7a6907ee 100644
--- a/swat/images/icons/nuvola/48/apply.png
+++ b/swat2/images/icons/nuvola/48/apply.png
diff --git a/swat/images/icons/nuvola/48/back.png b/swat2/images/icons/nuvola/48/back.png
index 753b14f468..753b14f468 100644
--- a/swat/images/icons/nuvola/48/back.png
+++ b/swat2/images/icons/nuvola/48/back.png
diff --git a/swat/images/icons/nuvola/48/background.png b/swat2/images/icons/nuvola/48/background.png
index 50a848f3bb..50a848f3bb 100644
--- a/swat/images/icons/nuvola/48/background.png
+++ b/swat2/images/icons/nuvola/48/background.png
diff --git a/swat/images/icons/nuvola/48/bell.png b/swat2/images/icons/nuvola/48/bell.png
index be0c6e69f0..be0c6e69f0 100644
--- a/swat/images/icons/nuvola/48/bell.png
+++ b/swat2/images/icons/nuvola/48/bell.png
diff --git a/swat/images/icons/nuvola/48/bookmark.png b/swat2/images/icons/nuvola/48/bookmark.png
index dcadad79ce..dcadad79ce 100644
--- a/swat/images/icons/nuvola/48/bookmark.png
+++ b/swat2/images/icons/nuvola/48/bookmark.png
diff --git a/swat/images/icons/nuvola/48/browser.png b/swat2/images/icons/nuvola/48/browser.png
index b5f28c4777..b5f28c4777 100644
--- a/swat/images/icons/nuvola/48/browser.png
+++ b/swat2/images/icons/nuvola/48/browser.png
diff --git a/swat/images/icons/nuvola/48/button_cancel.png b/swat2/images/icons/nuvola/48/button_cancel.png
index 75980de008..75980de008 100644
--- a/swat/images/icons/nuvola/48/button_cancel.png
+++ b/swat2/images/icons/nuvola/48/button_cancel.png
diff --git a/swat/images/icons/nuvola/48/button_ok.png b/swat2/images/icons/nuvola/48/button_ok.png
index 94aac4b2b8..94aac4b2b8 100644
--- a/swat/images/icons/nuvola/48/button_ok.png
+++ b/swat2/images/icons/nuvola/48/button_ok.png
diff --git a/swat/images/icons/nuvola/48/cache.png b/swat2/images/icons/nuvola/48/cache.png
index 321e8241b0..321e8241b0 100644
--- a/swat/images/icons/nuvola/48/cache.png
+++ b/swat2/images/icons/nuvola/48/cache.png
diff --git a/swat/images/icons/nuvola/48/clock.png b/swat2/images/icons/nuvola/48/clock.png
index 17e760a3fc..17e760a3fc 100644
--- a/swat/images/icons/nuvola/48/clock.png
+++ b/swat2/images/icons/nuvola/48/clock.png
diff --git a/swat/images/icons/nuvola/48/colorize.png b/swat2/images/icons/nuvola/48/colorize.png
index 61a6f6302d..61a6f6302d 100644
--- a/swat/images/icons/nuvola/48/colorize.png
+++ b/swat2/images/icons/nuvola/48/colorize.png
diff --git a/swat/images/icons/nuvola/48/colors.png b/swat2/images/icons/nuvola/48/colors.png
index 641c9d8d30..641c9d8d30 100644
--- a/swat/images/icons/nuvola/48/colors.png
+++ b/swat2/images/icons/nuvola/48/colors.png
diff --git a/swat/images/icons/nuvola/48/colorset.png b/swat2/images/icons/nuvola/48/colorset.png
index 0a7e28ca16..0a7e28ca16 100644
--- a/swat/images/icons/nuvola/48/colorset.png
+++ b/swat2/images/icons/nuvola/48/colorset.png
diff --git a/swat/images/icons/nuvola/48/configure.png b/swat2/images/icons/nuvola/48/configure.png
index 2bf463be33..2bf463be33 100644
--- a/swat/images/icons/nuvola/48/configure.png
+++ b/swat2/images/icons/nuvola/48/configure.png
diff --git a/swat/images/icons/nuvola/48/cookie.png b/swat2/images/icons/nuvola/48/cookie.png
index 8cbb309962..8cbb309962 100644
--- a/swat/images/icons/nuvola/48/cookie.png
+++ b/swat2/images/icons/nuvola/48/cookie.png
diff --git a/swat/images/icons/nuvola/48/core.png b/swat2/images/icons/nuvola/48/core.png
index 03855c9135..03855c9135 100644
--- a/swat/images/icons/nuvola/48/core.png
+++ b/swat2/images/icons/nuvola/48/core.png
diff --git a/swat/images/icons/nuvola/48/date.png b/swat2/images/icons/nuvola/48/date.png
index d3b8f47621..d3b8f47621 100644
--- a/swat/images/icons/nuvola/48/date.png
+++ b/swat2/images/icons/nuvola/48/date.png
diff --git a/swat/images/icons/nuvola/48/decrypted.png b/swat2/images/icons/nuvola/48/decrypted.png
index c532f17e3d..c532f17e3d 100644
--- a/swat/images/icons/nuvola/48/decrypted.png
+++ b/swat2/images/icons/nuvola/48/decrypted.png
diff --git a/swat/images/icons/nuvola/48/desktop.png b/swat2/images/icons/nuvola/48/desktop.png
index 9a0cf87f05..9a0cf87f05 100644
--- a/swat/images/icons/nuvola/48/desktop.png
+++ b/swat2/images/icons/nuvola/48/desktop.png
diff --git a/swat/images/icons/nuvola/48/display.png b/swat2/images/icons/nuvola/48/display.png
index 6b9ab9e130..6b9ab9e130 100644
--- a/swat/images/icons/nuvola/48/display.png
+++ b/swat2/images/icons/nuvola/48/display.png
diff --git a/swat/images/icons/nuvola/48/document.png b/swat2/images/icons/nuvola/48/document.png
index b545d96758..b545d96758 100644
--- a/swat/images/icons/nuvola/48/document.png
+++ b/swat2/images/icons/nuvola/48/document.png
diff --git a/swat/images/icons/nuvola/48/down.png b/swat2/images/icons/nuvola/48/down.png
index 5648bf19fa..5648bf19fa 100644
--- a/swat/images/icons/nuvola/48/down.png
+++ b/swat2/images/icons/nuvola/48/down.png
diff --git a/swat/images/icons/nuvola/48/edit.png b/swat2/images/icons/nuvola/48/edit.png
index bee264546b..bee264546b 100644
--- a/swat/images/icons/nuvola/48/edit.png
+++ b/swat2/images/icons/nuvola/48/edit.png
diff --git a/swat/images/icons/nuvola/48/editcopy.png b/swat2/images/icons/nuvola/48/editcopy.png
index a04d2f7fce..a04d2f7fce 100644
--- a/swat/images/icons/nuvola/48/editcopy.png
+++ b/swat2/images/icons/nuvola/48/editcopy.png
diff --git a/swat/images/icons/nuvola/48/editcut.png b/swat2/images/icons/nuvola/48/editcut.png
index a1b20f4beb..a1b20f4beb 100644
--- a/swat/images/icons/nuvola/48/editcut.png
+++ b/swat2/images/icons/nuvola/48/editcut.png
diff --git a/swat/images/icons/nuvola/48/editdelete.png b/swat2/images/icons/nuvola/48/editdelete.png
index f748cbe88a..f748cbe88a 100644
--- a/swat/images/icons/nuvola/48/editdelete.png
+++ b/swat2/images/icons/nuvola/48/editdelete.png
diff --git a/swat/images/icons/nuvola/48/editpaste.png b/swat2/images/icons/nuvola/48/editpaste.png
index 099c51ff90..099c51ff90 100644
--- a/swat/images/icons/nuvola/48/editpaste.png
+++ b/swat2/images/icons/nuvola/48/editpaste.png
diff --git a/swat/images/icons/nuvola/48/edittrash.png b/swat2/images/icons/nuvola/48/edittrash.png
index 906608fbae..906608fbae 100644
--- a/swat/images/icons/nuvola/48/edittrash.png
+++ b/swat2/images/icons/nuvola/48/edittrash.png
diff --git a/swat/images/icons/nuvola/48/email.png b/swat2/images/icons/nuvola/48/email.png
index 19c7cfd2f5..19c7cfd2f5 100644
--- a/swat/images/icons/nuvola/48/email.png
+++ b/swat2/images/icons/nuvola/48/email.png
diff --git a/swat/images/icons/nuvola/48/empty.png b/swat2/images/icons/nuvola/48/empty.png
index 78851f3619..78851f3619 100644
--- a/swat/images/icons/nuvola/48/empty.png
+++ b/swat2/images/icons/nuvola/48/empty.png
diff --git a/swat/images/icons/nuvola/48/encrypted.png b/swat2/images/icons/nuvola/48/encrypted.png
index 7d3e1ef2a5..7d3e1ef2a5 100644
--- a/swat/images/icons/nuvola/48/encrypted.png
+++ b/swat2/images/icons/nuvola/48/encrypted.png
diff --git a/swat/images/icons/nuvola/48/energy.png b/swat2/images/icons/nuvola/48/energy.png
index 94ce36b11f..94ce36b11f 100644
--- a/swat/images/icons/nuvola/48/energy.png
+++ b/swat2/images/icons/nuvola/48/energy.png
diff --git a/swat/images/icons/nuvola/48/error.png b/swat2/images/icons/nuvola/48/error.png
index e1841e408c..e1841e408c 100644
--- a/swat/images/icons/nuvola/48/error.png
+++ b/swat2/images/icons/nuvola/48/error.png
diff --git a/swat/images/icons/nuvola/48/exec.png b/swat2/images/icons/nuvola/48/exec.png
index 8467ec1ac2..8467ec1ac2 100644
--- a/swat/images/icons/nuvola/48/exec.png
+++ b/swat2/images/icons/nuvola/48/exec.png
diff --git a/swat/images/icons/nuvola/48/filenew.png b/swat2/images/icons/nuvola/48/filenew.png
index bc10ac0c22..bc10ac0c22 100644
--- a/swat/images/icons/nuvola/48/filenew.png
+++ b/swat2/images/icons/nuvola/48/filenew.png
diff --git a/swat/images/icons/nuvola/48/fileopen.png b/swat2/images/icons/nuvola/48/fileopen.png
index 7341929638..7341929638 100644
--- a/swat/images/icons/nuvola/48/fileopen.png
+++ b/swat2/images/icons/nuvola/48/fileopen.png
diff --git a/swat/images/icons/nuvola/48/fileprint.png b/swat2/images/icons/nuvola/48/fileprint.png
index 05e1598703..05e1598703 100644
--- a/swat/images/icons/nuvola/48/fileprint.png
+++ b/swat2/images/icons/nuvola/48/fileprint.png
diff --git a/swat/images/icons/nuvola/48/filesave.png b/swat2/images/icons/nuvola/48/filesave.png
index 0006ad4294..0006ad4294 100644
--- a/swat/images/icons/nuvola/48/filesave.png
+++ b/swat2/images/icons/nuvola/48/filesave.png
diff --git a/swat/images/icons/nuvola/48/filesaveas.png b/swat2/images/icons/nuvola/48/filesaveas.png
index 2be6df257a..2be6df257a 100644
--- a/swat/images/icons/nuvola/48/filesaveas.png
+++ b/swat2/images/icons/nuvola/48/filesaveas.png
diff --git a/swat/images/icons/nuvola/48/find.png b/swat2/images/icons/nuvola/48/find.png
index e03a26dbc7..e03a26dbc7 100644
--- a/swat/images/icons/nuvola/48/find.png
+++ b/swat2/images/icons/nuvola/48/find.png
diff --git a/swat/images/icons/nuvola/48/folder.png b/swat2/images/icons/nuvola/48/folder.png
index 31c8a7ede1..31c8a7ede1 100644
--- a/swat/images/icons/nuvola/48/folder.png
+++ b/swat2/images/icons/nuvola/48/folder.png
diff --git a/swat/images/icons/nuvola/48/folder_home.png b/swat2/images/icons/nuvola/48/folder_home.png
index 74f8aea85a..74f8aea85a 100644
--- a/swat/images/icons/nuvola/48/folder_home.png
+++ b/swat2/images/icons/nuvola/48/folder_home.png
diff --git a/swat/images/icons/nuvola/48/folder_important.png b/swat2/images/icons/nuvola/48/folder_important.png
index d91b77c39a..d91b77c39a 100644
--- a/swat/images/icons/nuvola/48/folder_important.png
+++ b/swat2/images/icons/nuvola/48/folder_important.png
diff --git a/swat/images/icons/nuvola/48/folder_locked.png b/swat2/images/icons/nuvola/48/folder_locked.png
index f16584669f..f16584669f 100644
--- a/swat/images/icons/nuvola/48/folder_locked.png
+++ b/swat2/images/icons/nuvola/48/folder_locked.png
diff --git a/swat/images/icons/nuvola/48/folder_open.png b/swat2/images/icons/nuvola/48/folder_open.png
index f7314b3494..f7314b3494 100644
--- a/swat/images/icons/nuvola/48/folder_open.png
+++ b/swat2/images/icons/nuvola/48/folder_open.png
diff --git a/swat/images/icons/nuvola/48/font.png b/swat2/images/icons/nuvola/48/font.png
index 80f56a886b..80f56a886b 100644
--- a/swat/images/icons/nuvola/48/font.png
+++ b/swat2/images/icons/nuvola/48/font.png
diff --git a/swat/images/icons/nuvola/48/forward.png b/swat2/images/icons/nuvola/48/forward.png
index 88eb4cfc6e..88eb4cfc6e 100644
--- a/swat/images/icons/nuvola/48/forward.png
+++ b/swat2/images/icons/nuvola/48/forward.png
diff --git a/swat/images/icons/nuvola/48/gohome.png b/swat2/images/icons/nuvola/48/gohome.png
index d2b3dfc614..d2b3dfc614 100644
--- a/swat/images/icons/nuvola/48/gohome.png
+++ b/swat2/images/icons/nuvola/48/gohome.png
diff --git a/swat/images/icons/nuvola/48/help.png b/swat2/images/icons/nuvola/48/help.png
index 915f9fd6d4..915f9fd6d4 100644
--- a/swat/images/icons/nuvola/48/help.png
+++ b/swat2/images/icons/nuvola/48/help.png
diff --git a/swat/images/icons/nuvola/48/history.png b/swat2/images/icons/nuvola/48/history.png
index 7907787f3c..7907787f3c 100644
--- a/swat/images/icons/nuvola/48/history.png
+++ b/swat2/images/icons/nuvola/48/history.png
diff --git a/swat/images/icons/nuvola/48/hwinfo.png b/swat2/images/icons/nuvola/48/hwinfo.png
index 2c7b76033e..2c7b76033e 100644
--- a/swat/images/icons/nuvola/48/hwinfo.png
+++ b/swat2/images/icons/nuvola/48/hwinfo.png
diff --git a/swat/images/icons/nuvola/48/icons.png b/swat2/images/icons/nuvola/48/icons.png
index 5aaece3e8c..5aaece3e8c 100644
--- a/swat/images/icons/nuvola/48/icons.png
+++ b/swat2/images/icons/nuvola/48/icons.png
diff --git a/swat/images/icons/nuvola/48/iconthemes.png b/swat2/images/icons/nuvola/48/iconthemes.png
index ba4744f980..ba4744f980 100644
--- a/swat/images/icons/nuvola/48/iconthemes.png
+++ b/swat2/images/icons/nuvola/48/iconthemes.png
diff --git a/swat/images/icons/nuvola/48/important.png b/swat2/images/icons/nuvola/48/important.png
index a763d82bf9..a763d82bf9 100644
--- a/swat/images/icons/nuvola/48/important.png
+++ b/swat2/images/icons/nuvola/48/important.png
diff --git a/swat/images/icons/nuvola/48/info.png b/swat2/images/icons/nuvola/48/info.png
index d2051a8901..d2051a8901 100644
--- a/swat/images/icons/nuvola/48/info.png
+++ b/swat2/images/icons/nuvola/48/info.png
diff --git a/swat/images/icons/nuvola/48/kcoloredit.png b/swat2/images/icons/nuvola/48/kcoloredit.png
index adb7216b06..adb7216b06 100644
--- a/swat/images/icons/nuvola/48/kcoloredit.png
+++ b/swat2/images/icons/nuvola/48/kcoloredit.png
diff --git a/swat/images/icons/nuvola/48/kcontrol.png b/swat2/images/icons/nuvola/48/kcontrol.png
index a359543e30..a359543e30 100644
--- a/swat/images/icons/nuvola/48/kcontrol.png
+++ b/swat2/images/icons/nuvola/48/kcontrol.png
diff --git a/swat/images/icons/nuvola/48/keyboard.png b/swat2/images/icons/nuvola/48/keyboard.png
index d911c7f314..d911c7f314 100644
--- a/swat/images/icons/nuvola/48/keyboard.png
+++ b/swat2/images/icons/nuvola/48/keyboard.png
diff --git a/swat/images/icons/nuvola/48/khelpcenter.png b/swat2/images/icons/nuvola/48/khelpcenter.png
index 614b0f9131..614b0f9131 100644
--- a/swat/images/icons/nuvola/48/khelpcenter.png
+++ b/swat2/images/icons/nuvola/48/khelpcenter.png
diff --git a/swat/images/icons/nuvola/48/kmix.png b/swat2/images/icons/nuvola/48/kmix.png
index fb5ca5292d..fb5ca5292d 100644
--- a/swat/images/icons/nuvola/48/kmix.png
+++ b/swat2/images/icons/nuvola/48/kmix.png
diff --git a/swat/images/icons/nuvola/48/knotify.png b/swat2/images/icons/nuvola/48/knotify.png
index 40205ad933..40205ad933 100644
--- a/swat/images/icons/nuvola/48/knotify.png
+++ b/swat2/images/icons/nuvola/48/knotify.png
diff --git a/swat/images/icons/nuvola/48/konqueror.png b/swat2/images/icons/nuvola/48/konqueror.png
index ef5d9a24c4..ef5d9a24c4 100644
--- a/swat/images/icons/nuvola/48/konqueror.png
+++ b/swat2/images/icons/nuvola/48/konqueror.png
diff --git a/swat/images/icons/nuvola/48/kpackage.png b/swat2/images/icons/nuvola/48/kpackage.png
index c8a65a759f..c8a65a759f 100644
--- a/swat/images/icons/nuvola/48/kpackage.png
+++ b/swat2/images/icons/nuvola/48/kpackage.png
diff --git a/swat/images/icons/nuvola/48/kpaint.png b/swat2/images/icons/nuvola/48/kpaint.png
index 6e9fdc73c0..6e9fdc73c0 100644
--- a/swat/images/icons/nuvola/48/kpaint.png
+++ b/swat2/images/icons/nuvola/48/kpaint.png
diff --git a/swat/images/icons/nuvola/48/krita.png b/swat2/images/icons/nuvola/48/krita.png
index 1c16253c05..1c16253c05 100644
--- a/swat/images/icons/nuvola/48/krita.png
+++ b/swat2/images/icons/nuvola/48/krita.png
diff --git a/swat/images/icons/nuvola/48/ksnapshot.png b/swat2/images/icons/nuvola/48/ksnapshot.png
index 5972080f1c..5972080f1c 100644
--- a/swat/images/icons/nuvola/48/ksnapshot.png
+++ b/swat2/images/icons/nuvola/48/ksnapshot.png
diff --git a/swat/images/icons/nuvola/48/ktip.png b/swat2/images/icons/nuvola/48/ktip.png
index 8b8756181d..8b8756181d 100644
--- a/swat/images/icons/nuvola/48/ktip.png
+++ b/swat2/images/icons/nuvola/48/ktip.png
diff --git a/swat/images/icons/nuvola/48/kuser.png b/swat2/images/icons/nuvola/48/kuser.png
index fe74c0056a..fe74c0056a 100644
--- a/swat/images/icons/nuvola/48/kuser.png
+++ b/swat2/images/icons/nuvola/48/kuser.png
diff --git a/swat/images/icons/nuvola/48/kview.png b/swat2/images/icons/nuvola/48/kview.png
index 56901e0e3e..56901e0e3e 100644
--- a/swat/images/icons/nuvola/48/kview.png
+++ b/swat2/images/icons/nuvola/48/kview.png
diff --git a/swat/images/icons/nuvola/48/locale.png b/swat2/images/icons/nuvola/48/locale.png
index a784df52fc..a784df52fc 100644
--- a/swat/images/icons/nuvola/48/locale.png
+++ b/swat2/images/icons/nuvola/48/locale.png
diff --git a/swat/images/icons/nuvola/48/looknfeel.png b/swat2/images/icons/nuvola/48/looknfeel.png
index 69f5db940e..69f5db940e 100644
--- a/swat/images/icons/nuvola/48/looknfeel.png
+++ b/swat2/images/icons/nuvola/48/looknfeel.png
diff --git a/swat/images/icons/nuvola/48/mail_delete.png b/swat2/images/icons/nuvola/48/mail_delete.png
index 3d0941c7d2..3d0941c7d2 100644
--- a/swat/images/icons/nuvola/48/mail_delete.png
+++ b/swat2/images/icons/nuvola/48/mail_delete.png
diff --git a/swat/images/icons/nuvola/48/mail_find.png b/swat2/images/icons/nuvola/48/mail_find.png
index 56b68ee3be..56b68ee3be 100644
--- a/swat/images/icons/nuvola/48/mail_find.png
+++ b/swat2/images/icons/nuvola/48/mail_find.png
diff --git a/swat/images/icons/nuvola/48/mail_forward.png b/swat2/images/icons/nuvola/48/mail_forward.png
index 88be810222..88be810222 100644
--- a/swat/images/icons/nuvola/48/mail_forward.png
+++ b/swat2/images/icons/nuvola/48/mail_forward.png
diff --git a/swat/images/icons/nuvola/48/mail_generic.png b/swat2/images/icons/nuvola/48/mail_generic.png
index 79699c828d..79699c828d 100644
--- a/swat/images/icons/nuvola/48/mail_generic.png
+++ b/swat2/images/icons/nuvola/48/mail_generic.png
diff --git a/swat/images/icons/nuvola/48/mail_new.png b/swat2/images/icons/nuvola/48/mail_new.png
index e09387c1b5..e09387c1b5 100644
--- a/swat/images/icons/nuvola/48/mail_new.png
+++ b/swat2/images/icons/nuvola/48/mail_new.png
diff --git a/swat/images/icons/nuvola/48/mail_replyall.png b/swat2/images/icons/nuvola/48/mail_replyall.png
index 8c845a0db2..8c845a0db2 100644
--- a/swat/images/icons/nuvola/48/mail_replyall.png
+++ b/swat2/images/icons/nuvola/48/mail_replyall.png
diff --git a/swat/images/icons/nuvola/48/mail_send.png b/swat2/images/icons/nuvola/48/mail_send.png
index 971fb090d5..971fb090d5 100644
--- a/swat/images/icons/nuvola/48/mail_send.png
+++ b/swat2/images/icons/nuvola/48/mail_send.png
diff --git a/swat/images/icons/nuvola/48/misc.png b/swat2/images/icons/nuvola/48/misc.png
index 0c17cd9a59..0c17cd9a59 100644
--- a/swat/images/icons/nuvola/48/misc.png
+++ b/swat2/images/icons/nuvola/48/misc.png
diff --git a/swat/images/icons/nuvola/48/mozilla.png b/swat2/images/icons/nuvola/48/mozilla.png
index 2fd15db78b..2fd15db78b 100644
--- a/swat/images/icons/nuvola/48/mozilla.png
+++ b/swat2/images/icons/nuvola/48/mozilla.png
diff --git a/swat/images/icons/nuvola/48/mycomputer.png b/swat2/images/icons/nuvola/48/mycomputer.png
index 8f07fa9570..8f07fa9570 100644
--- a/swat/images/icons/nuvola/48/mycomputer.png
+++ b/swat2/images/icons/nuvola/48/mycomputer.png
diff --git a/swat/images/icons/nuvola/48/netscape.png b/swat2/images/icons/nuvola/48/netscape.png
index 4ff1a20107..4ff1a20107 100644
--- a/swat/images/icons/nuvola/48/netscape.png
+++ b/swat2/images/icons/nuvola/48/netscape.png
diff --git a/swat/images/icons/nuvola/48/network.png b/swat2/images/icons/nuvola/48/network.png
index 5bac4066c7..5bac4066c7 100644
--- a/swat/images/icons/nuvola/48/network.png
+++ b/swat2/images/icons/nuvola/48/network.png
diff --git a/swat/images/icons/nuvola/48/next.png b/swat2/images/icons/nuvola/48/next.png
index fbce893e78..fbce893e78 100644
--- a/swat/images/icons/nuvola/48/next.png
+++ b/swat2/images/icons/nuvola/48/next.png
diff --git a/swat/images/icons/nuvola/48/no.png b/swat2/images/icons/nuvola/48/no.png
index b7e2f90a33..b7e2f90a33 100644
--- a/swat/images/icons/nuvola/48/no.png
+++ b/swat2/images/icons/nuvola/48/no.png
diff --git a/swat/images/icons/nuvola/48/ok.png b/swat2/images/icons/nuvola/48/ok.png
index 3b7a6907ee..3b7a6907ee 100644
--- a/swat/images/icons/nuvola/48/ok.png
+++ b/swat2/images/icons/nuvola/48/ok.png
diff --git a/swat/images/icons/nuvola/48/opera.png b/swat2/images/icons/nuvola/48/opera.png
index 6fb9136b21..6fb9136b21 100644
--- a/swat/images/icons/nuvola/48/opera.png
+++ b/swat2/images/icons/nuvola/48/opera.png
diff --git a/swat/images/icons/nuvola/48/package.png b/swat2/images/icons/nuvola/48/package.png
index 7cf1b96d6f..7cf1b96d6f 100644
--- a/swat/images/icons/nuvola/48/package.png
+++ b/swat2/images/icons/nuvola/48/package.png
diff --git a/swat/images/icons/nuvola/48/password.png b/swat2/images/icons/nuvola/48/password.png
index 98d7607e28..98d7607e28 100644
--- a/swat/images/icons/nuvola/48/password.png
+++ b/swat2/images/icons/nuvola/48/password.png
diff --git a/swat/images/icons/nuvola/48/pipe.png b/swat2/images/icons/nuvola/48/pipe.png
index d479c1b385..d479c1b385 100644
--- a/swat/images/icons/nuvola/48/pipe.png
+++ b/swat2/images/icons/nuvola/48/pipe.png
diff --git a/swat/images/icons/nuvola/48/previous.png b/swat2/images/icons/nuvola/48/previous.png
index 3813e818ec..3813e818ec 100644
--- a/swat/images/icons/nuvola/48/previous.png
+++ b/swat2/images/icons/nuvola/48/previous.png
diff --git a/swat/images/icons/nuvola/48/realplayer.png b/swat2/images/icons/nuvola/48/realplayer.png
index dabfe1a77a..dabfe1a77a 100644
--- a/swat/images/icons/nuvola/48/realplayer.png
+++ b/swat2/images/icons/nuvola/48/realplayer.png
diff --git a/swat/images/icons/nuvola/48/redo.png b/swat2/images/icons/nuvola/48/redo.png
index 3da735b6af..3da735b6af 100644
--- a/swat/images/icons/nuvola/48/redo.png
+++ b/swat2/images/icons/nuvola/48/redo.png
diff --git a/swat/images/icons/nuvola/48/reload.png b/swat2/images/icons/nuvola/48/reload.png
index 248f614d29..248f614d29 100644
--- a/swat/images/icons/nuvola/48/reload.png
+++ b/swat2/images/icons/nuvola/48/reload.png
diff --git a/swat/images/icons/nuvola/48/run.png b/swat2/images/icons/nuvola/48/run.png
index d741485f37..d741485f37 100644
--- a/swat/images/icons/nuvola/48/run.png
+++ b/swat2/images/icons/nuvola/48/run.png
diff --git a/swat/images/icons/nuvola/48/services.png b/swat2/images/icons/nuvola/48/services.png
index e4e12439b3..e4e12439b3 100644
--- a/swat/images/icons/nuvola/48/services.png
+++ b/swat2/images/icons/nuvola/48/services.png
diff --git a/swat/images/icons/nuvola/48/socket.png b/swat2/images/icons/nuvola/48/socket.png
index 1bacbaae01..1bacbaae01 100644
--- a/swat/images/icons/nuvola/48/socket.png
+++ b/swat2/images/icons/nuvola/48/socket.png
diff --git a/swat/images/icons/nuvola/48/spellcheck.png b/swat2/images/icons/nuvola/48/spellcheck.png
index 0b32d72e2f..0b32d72e2f 100644
--- a/swat/images/icons/nuvola/48/spellcheck.png
+++ b/swat2/images/icons/nuvola/48/spellcheck.png
diff --git a/swat/images/icons/nuvola/48/stop.png b/swat2/images/icons/nuvola/48/stop.png
index bb4fe64369..bb4fe64369 100644
--- a/swat/images/icons/nuvola/48/stop.png
+++ b/swat2/images/icons/nuvola/48/stop.png
diff --git a/swat/images/icons/nuvola/48/style.png b/swat2/images/icons/nuvola/48/style.png
index c9c4381358..c9c4381358 100644
--- a/swat/images/icons/nuvola/48/style.png
+++ b/swat2/images/icons/nuvola/48/style.png
diff --git a/swat/images/icons/nuvola/48/stylesheet.png b/swat2/images/icons/nuvola/48/stylesheet.png
index 4777cbbf94..4777cbbf94 100644
--- a/swat/images/icons/nuvola/48/stylesheet.png
+++ b/swat2/images/icons/nuvola/48/stylesheet.png
diff --git a/swat/images/icons/nuvola/48/thumbnail.png b/swat2/images/icons/nuvola/48/thumbnail.png
index bcc168145e..bcc168145e 100644
--- a/swat/images/icons/nuvola/48/thumbnail.png
+++ b/swat2/images/icons/nuvola/48/thumbnail.png
diff --git a/swat/images/icons/nuvola/48/up.png b/swat2/images/icons/nuvola/48/up.png
index 6af24949b8..6af24949b8 100644
--- a/swat/images/icons/nuvola/48/up.png
+++ b/swat2/images/icons/nuvola/48/up.png
diff --git a/swat/images/icons/nuvola/48/wizard.png b/swat2/images/icons/nuvola/48/wizard.png
index c117bea3b0..c117bea3b0 100644
--- a/swat/images/icons/nuvola/48/wizard.png
+++ b/swat2/images/icons/nuvola/48/wizard.png
diff --git a/swat/images/icons/nuvola/64/access.png b/swat2/images/icons/nuvola/64/access.png
index 01b023e542..01b023e542 100644
--- a/swat/images/icons/nuvola/64/access.png
+++ b/swat2/images/icons/nuvola/64/access.png
diff --git a/swat/images/icons/nuvola/64/agent.png b/swat2/images/icons/nuvola/64/agent.png
index 8bdbfbc753..8bdbfbc753 100644
--- a/swat/images/icons/nuvola/64/agent.png
+++ b/swat2/images/icons/nuvola/64/agent.png
diff --git a/swat/images/icons/nuvola/64/background.png b/swat2/images/icons/nuvola/64/background.png
index eecc4f45af..eecc4f45af 100644
--- a/swat/images/icons/nuvola/64/background.png
+++ b/swat2/images/icons/nuvola/64/background.png
diff --git a/swat/images/icons/nuvola/64/bell.png b/swat2/images/icons/nuvola/64/bell.png
index d8d7ec712a..d8d7ec712a 100644
--- a/swat/images/icons/nuvola/64/bell.png
+++ b/swat2/images/icons/nuvola/64/bell.png
diff --git a/swat/images/icons/nuvola/64/browser.png b/swat2/images/icons/nuvola/64/browser.png
index 2d0fdf97d0..2d0fdf97d0 100644
--- a/swat/images/icons/nuvola/64/browser.png
+++ b/swat2/images/icons/nuvola/64/browser.png
diff --git a/swat/images/icons/nuvola/64/cache.png b/swat2/images/icons/nuvola/64/cache.png
index c42bf4a3ce..c42bf4a3ce 100644
--- a/swat/images/icons/nuvola/64/cache.png
+++ b/swat2/images/icons/nuvola/64/cache.png
diff --git a/swat/images/icons/nuvola/64/clock.png b/swat2/images/icons/nuvola/64/clock.png
index dda46a5496..dda46a5496 100644
--- a/swat/images/icons/nuvola/64/clock.png
+++ b/swat2/images/icons/nuvola/64/clock.png
diff --git a/swat/images/icons/nuvola/64/colors.png b/swat2/images/icons/nuvola/64/colors.png
index dfe8f950d5..dfe8f950d5 100644
--- a/swat/images/icons/nuvola/64/colors.png
+++ b/swat2/images/icons/nuvola/64/colors.png
diff --git a/swat/images/icons/nuvola/64/colorset.png b/swat2/images/icons/nuvola/64/colorset.png
index 2dbdf9ea8d..2dbdf9ea8d 100644
--- a/swat/images/icons/nuvola/64/colorset.png
+++ b/swat2/images/icons/nuvola/64/colorset.png
diff --git a/swat/images/icons/nuvola/64/cookie.png b/swat2/images/icons/nuvola/64/cookie.png
index 4647c31022..4647c31022 100644
--- a/swat/images/icons/nuvola/64/cookie.png
+++ b/swat2/images/icons/nuvola/64/cookie.png
diff --git a/swat/images/icons/nuvola/64/core.png b/swat2/images/icons/nuvola/64/core.png
index e5a5143c39..e5a5143c39 100644
--- a/swat/images/icons/nuvola/64/core.png
+++ b/swat2/images/icons/nuvola/64/core.png
diff --git a/swat/images/icons/nuvola/64/date.png b/swat2/images/icons/nuvola/64/date.png
index 4746c98012..4746c98012 100644
--- a/swat/images/icons/nuvola/64/date.png
+++ b/swat2/images/icons/nuvola/64/date.png
diff --git a/swat/images/icons/nuvola/64/desktop.png b/swat2/images/icons/nuvola/64/desktop.png
index fd2b4a781f..fd2b4a781f 100644
--- a/swat/images/icons/nuvola/64/desktop.png
+++ b/swat2/images/icons/nuvola/64/desktop.png
diff --git a/swat/images/icons/nuvola/64/display.png b/swat2/images/icons/nuvola/64/display.png
index 5e93201be6..5e93201be6 100644
--- a/swat/images/icons/nuvola/64/display.png
+++ b/swat2/images/icons/nuvola/64/display.png
diff --git a/swat/images/icons/nuvola/64/document.png b/swat2/images/icons/nuvola/64/document.png
index 46b2871277..46b2871277 100644
--- a/swat/images/icons/nuvola/64/document.png
+++ b/swat2/images/icons/nuvola/64/document.png
diff --git a/swat/images/icons/nuvola/64/email.png b/swat2/images/icons/nuvola/64/email.png
index 442141d106..442141d106 100644
--- a/swat/images/icons/nuvola/64/email.png
+++ b/swat2/images/icons/nuvola/64/email.png
diff --git a/swat/images/icons/nuvola/64/empty.png b/swat2/images/icons/nuvola/64/empty.png
index 1e92934834..1e92934834 100644
--- a/swat/images/icons/nuvola/64/empty.png
+++ b/swat2/images/icons/nuvola/64/empty.png
diff --git a/swat/images/icons/nuvola/64/encrypted.png b/swat2/images/icons/nuvola/64/encrypted.png
index 2e06c176c2..2e06c176c2 100644
--- a/swat/images/icons/nuvola/64/encrypted.png
+++ b/swat2/images/icons/nuvola/64/encrypted.png
diff --git a/swat/images/icons/nuvola/64/energy.png b/swat2/images/icons/nuvola/64/energy.png
index 9a829877e3..9a829877e3 100644
--- a/swat/images/icons/nuvola/64/energy.png
+++ b/swat2/images/icons/nuvola/64/energy.png
diff --git a/swat/images/icons/nuvola/64/error.png b/swat2/images/icons/nuvola/64/error.png
index e597c4658b..e597c4658b 100644
--- a/swat/images/icons/nuvola/64/error.png
+++ b/swat2/images/icons/nuvola/64/error.png
diff --git a/swat/images/icons/nuvola/64/exec.png b/swat2/images/icons/nuvola/64/exec.png
index a1b6850041..a1b6850041 100644
--- a/swat/images/icons/nuvola/64/exec.png
+++ b/swat2/images/icons/nuvola/64/exec.png
diff --git a/swat/images/icons/nuvola/64/folder.png b/swat2/images/icons/nuvola/64/folder.png
index 5ef5754e26..5ef5754e26 100644
--- a/swat/images/icons/nuvola/64/folder.png
+++ b/swat2/images/icons/nuvola/64/folder.png
diff --git a/swat/images/icons/nuvola/64/folder_home.png b/swat2/images/icons/nuvola/64/folder_home.png
index 7b20e56631..7b20e56631 100644
--- a/swat/images/icons/nuvola/64/folder_home.png
+++ b/swat2/images/icons/nuvola/64/folder_home.png
diff --git a/swat/images/icons/nuvola/64/folder_important.png b/swat2/images/icons/nuvola/64/folder_important.png
index 1c97defd59..1c97defd59 100644
--- a/swat/images/icons/nuvola/64/folder_important.png
+++ b/swat2/images/icons/nuvola/64/folder_important.png
diff --git a/swat/images/icons/nuvola/64/folder_locked.png b/swat2/images/icons/nuvola/64/folder_locked.png
index 9e9bbd9776..9e9bbd9776 100644
--- a/swat/images/icons/nuvola/64/folder_locked.png
+++ b/swat2/images/icons/nuvola/64/folder_locked.png
diff --git a/swat/images/icons/nuvola/64/folder_open.png b/swat2/images/icons/nuvola/64/folder_open.png
index f5bddaf374..f5bddaf374 100644
--- a/swat/images/icons/nuvola/64/folder_open.png
+++ b/swat2/images/icons/nuvola/64/folder_open.png
diff --git a/swat/images/icons/nuvola/64/font.png b/swat2/images/icons/nuvola/64/font.png
index 3299a64282..3299a64282 100644
--- a/swat/images/icons/nuvola/64/font.png
+++ b/swat2/images/icons/nuvola/64/font.png
diff --git a/swat/images/icons/nuvola/64/hwinfo.png b/swat2/images/icons/nuvola/64/hwinfo.png
index bc015a7ece..bc015a7ece 100644
--- a/swat/images/icons/nuvola/64/hwinfo.png
+++ b/swat2/images/icons/nuvola/64/hwinfo.png
diff --git a/swat/images/icons/nuvola/64/icons.png b/swat2/images/icons/nuvola/64/icons.png
index a591696dad..a591696dad 100644
--- a/swat/images/icons/nuvola/64/icons.png
+++ b/swat2/images/icons/nuvola/64/icons.png
diff --git a/swat/images/icons/nuvola/64/iconthemes.png b/swat2/images/icons/nuvola/64/iconthemes.png
index 5e934b7de7..5e934b7de7 100644
--- a/swat/images/icons/nuvola/64/iconthemes.png
+++ b/swat2/images/icons/nuvola/64/iconthemes.png
diff --git a/swat/images/icons/nuvola/64/important.png b/swat2/images/icons/nuvola/64/important.png
index db52b85a5f..db52b85a5f 100644
--- a/swat/images/icons/nuvola/64/important.png
+++ b/swat2/images/icons/nuvola/64/important.png
diff --git a/swat/images/icons/nuvola/64/info.png b/swat2/images/icons/nuvola/64/info.png
index f8c50e169b..f8c50e169b 100644
--- a/swat/images/icons/nuvola/64/info.png
+++ b/swat2/images/icons/nuvola/64/info.png
diff --git a/swat/images/icons/nuvola/64/kcoloredit.png b/swat2/images/icons/nuvola/64/kcoloredit.png
index 9fe8697e5f..9fe8697e5f 100644
--- a/swat/images/icons/nuvola/64/kcoloredit.png
+++ b/swat2/images/icons/nuvola/64/kcoloredit.png
diff --git a/swat/images/icons/nuvola/64/kcontrol.png b/swat2/images/icons/nuvola/64/kcontrol.png
index 0ecbfe51e7..0ecbfe51e7 100644
--- a/swat/images/icons/nuvola/64/kcontrol.png
+++ b/swat2/images/icons/nuvola/64/kcontrol.png
diff --git a/swat/images/icons/nuvola/64/keyboard.png b/swat2/images/icons/nuvola/64/keyboard.png
index 6b8aee857b..6b8aee857b 100644
--- a/swat/images/icons/nuvola/64/keyboard.png
+++ b/swat2/images/icons/nuvola/64/keyboard.png
diff --git a/swat/images/icons/nuvola/64/khelpcenter.png b/swat2/images/icons/nuvola/64/khelpcenter.png
index ebb8462ced..ebb8462ced 100644
--- a/swat/images/icons/nuvola/64/khelpcenter.png
+++ b/swat2/images/icons/nuvola/64/khelpcenter.png
diff --git a/swat/images/icons/nuvola/64/kmix.png b/swat2/images/icons/nuvola/64/kmix.png
index 67cc062f9e..67cc062f9e 100644
--- a/swat/images/icons/nuvola/64/kmix.png
+++ b/swat2/images/icons/nuvola/64/kmix.png
diff --git a/swat/images/icons/nuvola/64/knotify.png b/swat2/images/icons/nuvola/64/knotify.png
index 3f0d99d55c..3f0d99d55c 100644
--- a/swat/images/icons/nuvola/64/knotify.png
+++ b/swat2/images/icons/nuvola/64/knotify.png
diff --git a/swat/images/icons/nuvola/64/konqueror.png b/swat2/images/icons/nuvola/64/konqueror.png
index 23c5665a89..23c5665a89 100644
--- a/swat/images/icons/nuvola/64/konqueror.png
+++ b/swat2/images/icons/nuvola/64/konqueror.png
diff --git a/swat/images/icons/nuvola/64/kpackage.png b/swat2/images/icons/nuvola/64/kpackage.png
index c09c67ce84..c09c67ce84 100644
--- a/swat/images/icons/nuvola/64/kpackage.png
+++ b/swat2/images/icons/nuvola/64/kpackage.png
diff --git a/swat/images/icons/nuvola/64/kpaint.png b/swat2/images/icons/nuvola/64/kpaint.png
index a08cec3396..a08cec3396 100644
--- a/swat/images/icons/nuvola/64/kpaint.png
+++ b/swat2/images/icons/nuvola/64/kpaint.png
diff --git a/swat/images/icons/nuvola/64/krita.png b/swat2/images/icons/nuvola/64/krita.png
index 68321ff45f..68321ff45f 100644
--- a/swat/images/icons/nuvola/64/krita.png
+++ b/swat2/images/icons/nuvola/64/krita.png
diff --git a/swat/images/icons/nuvola/64/ksnapshot.png b/swat2/images/icons/nuvola/64/ksnapshot.png
index 32b0c82fd6..32b0c82fd6 100644
--- a/swat/images/icons/nuvola/64/ksnapshot.png
+++ b/swat2/images/icons/nuvola/64/ksnapshot.png
diff --git a/swat/images/icons/nuvola/64/ktip.png b/swat2/images/icons/nuvola/64/ktip.png
index e8b4285a22..e8b4285a22 100644
--- a/swat/images/icons/nuvola/64/ktip.png
+++ b/swat2/images/icons/nuvola/64/ktip.png
diff --git a/swat/images/icons/nuvola/64/kuser.png b/swat2/images/icons/nuvola/64/kuser.png
index 3e443c99db..3e443c99db 100644
--- a/swat/images/icons/nuvola/64/kuser.png
+++ b/swat2/images/icons/nuvola/64/kuser.png
diff --git a/swat/images/icons/nuvola/64/kview.png b/swat2/images/icons/nuvola/64/kview.png
index 92635c96e0..92635c96e0 100644
--- a/swat/images/icons/nuvola/64/kview.png
+++ b/swat2/images/icons/nuvola/64/kview.png
diff --git a/swat/images/icons/nuvola/64/locale.png b/swat2/images/icons/nuvola/64/locale.png
index ed5d411645..ed5d411645 100644
--- a/swat/images/icons/nuvola/64/locale.png
+++ b/swat2/images/icons/nuvola/64/locale.png
diff --git a/swat/images/icons/nuvola/64/looknfeel.png b/swat2/images/icons/nuvola/64/looknfeel.png
index dc65d514e1..dc65d514e1 100644
--- a/swat/images/icons/nuvola/64/looknfeel.png
+++ b/swat2/images/icons/nuvola/64/looknfeel.png
diff --git a/swat/images/icons/nuvola/64/mozilla.png b/swat2/images/icons/nuvola/64/mozilla.png
index a5220d14f8..a5220d14f8 100644
--- a/swat/images/icons/nuvola/64/mozilla.png
+++ b/swat2/images/icons/nuvola/64/mozilla.png
diff --git a/swat/images/icons/nuvola/64/mycomputer.png b/swat2/images/icons/nuvola/64/mycomputer.png
index 41a501e940..41a501e940 100644
--- a/swat/images/icons/nuvola/64/mycomputer.png
+++ b/swat2/images/icons/nuvola/64/mycomputer.png
diff --git a/swat/images/icons/nuvola/64/netscape.png b/swat2/images/icons/nuvola/64/netscape.png
index f2e34e902b..f2e34e902b 100644
--- a/swat/images/icons/nuvola/64/netscape.png
+++ b/swat2/images/icons/nuvola/64/netscape.png
diff --git a/swat/images/icons/nuvola/64/network.png b/swat2/images/icons/nuvola/64/network.png
index d3f72be6b5..d3f72be6b5 100644
--- a/swat/images/icons/nuvola/64/network.png
+++ b/swat2/images/icons/nuvola/64/network.png
diff --git a/swat/images/icons/nuvola/64/opera.png b/swat2/images/icons/nuvola/64/opera.png
index 60ded2af2d..60ded2af2d 100644
--- a/swat/images/icons/nuvola/64/opera.png
+++ b/swat2/images/icons/nuvola/64/opera.png
diff --git a/swat/images/icons/nuvola/64/package.png b/swat2/images/icons/nuvola/64/package.png
index 75238db464..75238db464 100644
--- a/swat/images/icons/nuvola/64/package.png
+++ b/swat2/images/icons/nuvola/64/package.png
diff --git a/swat/images/icons/nuvola/64/password.png b/swat2/images/icons/nuvola/64/password.png
index bf8d7e42a1..bf8d7e42a1 100644
--- a/swat/images/icons/nuvola/64/password.png
+++ b/swat2/images/icons/nuvola/64/password.png
diff --git a/swat/images/icons/nuvola/64/pipe.png b/swat2/images/icons/nuvola/64/pipe.png
index 85e7142a7d..85e7142a7d 100644
--- a/swat/images/icons/nuvola/64/pipe.png
+++ b/swat2/images/icons/nuvola/64/pipe.png
diff --git a/swat/images/icons/nuvola/64/realplayer.png b/swat2/images/icons/nuvola/64/realplayer.png
index 9220109f37..9220109f37 100644
--- a/swat/images/icons/nuvola/64/realplayer.png
+++ b/swat2/images/icons/nuvola/64/realplayer.png
diff --git a/swat/images/icons/nuvola/64/services.png b/swat2/images/icons/nuvola/64/services.png
index 0b9ea4dd56..0b9ea4dd56 100644
--- a/swat/images/icons/nuvola/64/services.png
+++ b/swat2/images/icons/nuvola/64/services.png
diff --git a/swat/images/icons/nuvola/64/socket.png b/swat2/images/icons/nuvola/64/socket.png
index 23818bc29d..23818bc29d 100644
--- a/swat/images/icons/nuvola/64/socket.png
+++ b/swat2/images/icons/nuvola/64/socket.png
diff --git a/swat/images/icons/nuvola/64/style.png b/swat2/images/icons/nuvola/64/style.png
index 2d5a61df4b..2d5a61df4b 100644
--- a/swat/images/icons/nuvola/64/style.png
+++ b/swat2/images/icons/nuvola/64/style.png
diff --git a/swat/images/icons/nuvola/64/stylesheet.png b/swat2/images/icons/nuvola/64/stylesheet.png
index 7a4cd1f6f3..7a4cd1f6f3 100644
--- a/swat/images/icons/nuvola/64/stylesheet.png
+++ b/swat2/images/icons/nuvola/64/stylesheet.png
diff --git a/swat/images/icons/nuvola/README b/swat2/images/icons/nuvola/README
index 8b01652cb7..8b01652cb7 100644
--- a/swat/images/icons/nuvola/README
+++ b/swat2/images/icons/nuvola/README
diff --git a/swat/images/icons/nuvola/author b/swat2/images/icons/nuvola/author
index d7e029cca0..d7e029cca0 100644
--- a/swat/images/icons/nuvola/author
+++ b/swat2/images/icons/nuvola/author
diff --git a/swat/images/icons/nuvola/license.txt b/swat2/images/icons/nuvola/license.txt
index b1e3f5a263..b1e3f5a263 100644
--- a/swat/images/icons/nuvola/license.txt
+++ b/swat2/images/icons/nuvola/license.txt
diff --git a/swat/images/icons/nuvola/readme.txt b/swat2/images/icons/nuvola/readme.txt
index 590166ea73..590166ea73 100644
--- a/swat/images/icons/nuvola/readme.txt
+++ b/swat2/images/icons/nuvola/readme.txt
diff --git a/swat/images/icons/nuvola/thanks.to b/swat2/images/icons/nuvola/thanks.to
index bd4d0b131b..bd4d0b131b 100644
--- a/swat/images/icons/nuvola/thanks.to
+++ b/swat2/images/icons/nuvola/thanks.to
diff --git a/swat/images/linkpad.gif b/swat2/images/linkpad.gif
index 613b4f55ef..613b4f55ef 100644
--- a/swat/images/linkpad.gif
+++ b/swat2/images/linkpad.gif
diff --git a/swat/images/logo.png b/swat2/images/logo.png
index 6df4ace659..6df4ace659 100644
--- a/swat/images/logo.png
+++ b/swat2/images/logo.png
diff --git a/swat/images/stripes.png b/swat2/images/stripes.png
index 5c5941ff38..5c5941ff38 100644
--- a/swat/images/stripes.png
+++ b/swat2/images/stripes.png
diff --git a/swat/images/widgets/windows/arrows/down.gif b/swat2/images/widgets/windows/arrows/down.gif
index 7a73f82726..7a73f82726 100644
--- a/swat/images/widgets/windows/arrows/down.gif
+++ b/swat2/images/widgets/windows/arrows/down.gif
diff --git a/swat/images/widgets/windows/arrows/down_small.gif b/swat2/images/widgets/windows/arrows/down_small.gif
index ea60995e1b..ea60995e1b 100644
--- a/swat/images/widgets/windows/arrows/down_small.gif
+++ b/swat2/images/widgets/windows/arrows/down_small.gif
diff --git a/swat/images/widgets/windows/arrows/down_tiny.gif b/swat2/images/widgets/windows/arrows/down_tiny.gif
index 928f52805f..928f52805f 100644
--- a/swat/images/widgets/windows/arrows/down_tiny.gif
+++ b/swat2/images/widgets/windows/arrows/down_tiny.gif
diff --git a/swat/images/widgets/windows/arrows/first.png b/swat2/images/widgets/windows/arrows/first.png
index 89fcc75e13..89fcc75e13 100644
--- a/swat/images/widgets/windows/arrows/first.png
+++ b/swat2/images/widgets/windows/arrows/first.png
diff --git a/swat/images/widgets/windows/arrows/forward.gif b/swat2/images/widgets/windows/arrows/forward.gif
index 809e8fdb90..809e8fdb90 100644
--- a/swat/images/widgets/windows/arrows/forward.gif
+++ b/swat2/images/widgets/windows/arrows/forward.gif
diff --git a/swat/images/widgets/windows/arrows/last.png b/swat2/images/widgets/windows/arrows/last.png
index f7bcbedf99..f7bcbedf99 100644
--- a/swat/images/widgets/windows/arrows/last.png
+++ b/swat2/images/widgets/windows/arrows/last.png
diff --git a/swat/images/widgets/windows/arrows/left.png b/swat2/images/widgets/windows/arrows/left.png
index ace0782dfe..ace0782dfe 100644
--- a/swat/images/widgets/windows/arrows/left.png
+++ b/swat2/images/widgets/windows/arrows/left.png
diff --git a/swat/images/widgets/windows/arrows/minimize.gif b/swat2/images/widgets/windows/arrows/minimize.gif
index c5b586e509..c5b586e509 100644
--- a/swat/images/widgets/windows/arrows/minimize.gif
+++ b/swat2/images/widgets/windows/arrows/minimize.gif
diff --git a/swat/images/widgets/windows/arrows/next.gif b/swat2/images/widgets/windows/arrows/next.gif
index d9c246f1e7..d9c246f1e7 100644
--- a/swat/images/widgets/windows/arrows/next.gif
+++ b/swat2/images/widgets/windows/arrows/next.gif
diff --git a/swat/images/widgets/windows/arrows/previous.gif b/swat2/images/widgets/windows/arrows/previous.gif
index 7189c2306b..7189c2306b 100644
--- a/swat/images/widgets/windows/arrows/previous.gif
+++ b/swat2/images/widgets/windows/arrows/previous.gif
diff --git a/swat/images/widgets/windows/arrows/rewind.gif b/swat2/images/widgets/windows/arrows/rewind.gif
index 2ad09109e9..2ad09109e9 100644
--- a/swat/images/widgets/windows/arrows/rewind.gif
+++ b/swat2/images/widgets/windows/arrows/rewind.gif
diff --git a/swat/images/widgets/windows/arrows/right.png b/swat2/images/widgets/windows/arrows/right.png
index 2c3e8ed109..2c3e8ed109 100644
--- a/swat/images/widgets/windows/arrows/right.png
+++ b/swat2/images/widgets/windows/arrows/right.png
diff --git a/swat/images/widgets/windows/arrows/up.gif b/swat2/images/widgets/windows/arrows/up.gif
index 9452da0543..9452da0543 100644
--- a/swat/images/widgets/windows/arrows/up.gif
+++ b/swat2/images/widgets/windows/arrows/up.gif
diff --git a/swat/images/widgets/windows/arrows/up_small.gif b/swat2/images/widgets/windows/arrows/up_small.gif
index fc815ba417..fc815ba417 100644
--- a/swat/images/widgets/windows/arrows/up_small.gif
+++ b/swat2/images/widgets/windows/arrows/up_small.gif
diff --git a/swat/images/widgets/windows/arrows/up_tiny.gif b/swat2/images/widgets/windows/arrows/up_tiny.gif
index 34dc4e8e3f..34dc4e8e3f 100644
--- a/swat/images/widgets/windows/arrows/up_tiny.gif
+++ b/swat2/images/widgets/windows/arrows/up_tiny.gif
diff --git a/swat/images/widgets/windows/cursors/alias.gif b/swat2/images/widgets/windows/cursors/alias.gif
index 3b46c72422..3b46c72422 100644
--- a/swat/images/widgets/windows/cursors/alias.gif
+++ b/swat2/images/widgets/windows/cursors/alias.gif
diff --git a/swat/images/widgets/windows/cursors/copy.gif b/swat2/images/widgets/windows/cursors/copy.gif
index 2a59a4aef8..2a59a4aef8 100644
--- a/swat/images/widgets/windows/cursors/copy.gif
+++ b/swat2/images/widgets/windows/cursors/copy.gif
diff --git a/swat/images/widgets/windows/cursors/move.gif b/swat2/images/widgets/windows/cursors/move.gif
index adc9a6477d..adc9a6477d 100644
--- a/swat/images/widgets/windows/cursors/move.gif
+++ b/swat2/images/widgets/windows/cursors/move.gif
diff --git a/swat/images/widgets/windows/cursors/nodrop.gif b/swat2/images/widgets/windows/cursors/nodrop.gif
index 3a25866507..3a25866507 100644
--- a/swat/images/widgets/windows/cursors/nodrop.gif
+++ b/swat2/images/widgets/windows/cursors/nodrop.gif
diff --git a/swat/images/widgets/windows/menu/checkbox.gif b/swat2/images/widgets/windows/menu/checkbox.gif
index 767f285b57..767f285b57 100644
--- a/swat/images/widgets/windows/menu/checkbox.gif
+++ b/swat2/images/widgets/windows/menu/checkbox.gif
diff --git a/swat/images/widgets/windows/menu/radiobutton.gif b/swat2/images/widgets/windows/menu/radiobutton.gif
index b6cfa37a8e..b6cfa37a8e 100644
--- a/swat/images/widgets/windows/menu/radiobutton.gif
+++ b/swat2/images/widgets/windows/menu/radiobutton.gif
diff --git a/swat/images/widgets/windows/tree/cross.gif b/swat2/images/widgets/windows/tree/cross.gif
index 4d40453ab4..4d40453ab4 100644
--- a/swat/images/widgets/windows/tree/cross.gif
+++ b/swat2/images/widgets/windows/tree/cross.gif
diff --git a/swat/images/widgets/windows/tree/cross_minus.gif b/swat2/images/widgets/windows/tree/cross_minus.gif
index d69c2d6972..d69c2d6972 100644
--- a/swat/images/widgets/windows/tree/cross_minus.gif
+++ b/swat2/images/widgets/windows/tree/cross_minus.gif
diff --git a/swat/images/widgets/windows/tree/cross_plus.gif b/swat2/images/widgets/windows/tree/cross_plus.gif
index 2102d91978..2102d91978 100644
--- a/swat/images/widgets/windows/tree/cross_plus.gif
+++ b/swat2/images/widgets/windows/tree/cross_plus.gif
diff --git a/swat/images/widgets/windows/tree/end.gif b/swat2/images/widgets/windows/tree/end.gif
index 7cd50aa02f..7cd50aa02f 100644
--- a/swat/images/widgets/windows/tree/end.gif
+++ b/swat2/images/widgets/windows/tree/end.gif
diff --git a/swat/images/widgets/windows/tree/end_minus.gif b/swat2/images/widgets/windows/tree/end_minus.gif
index d53ce116ba..d53ce116ba 100644
--- a/swat/images/widgets/windows/tree/end_minus.gif
+++ b/swat2/images/widgets/windows/tree/end_minus.gif
diff --git a/swat/images/widgets/windows/tree/end_plus.gif b/swat2/images/widgets/windows/tree/end_plus.gif
index 301872a7ef..301872a7ef 100644
--- a/swat/images/widgets/windows/tree/end_plus.gif
+++ b/swat2/images/widgets/windows/tree/end_plus.gif
diff --git a/swat/images/widgets/windows/tree/line.gif b/swat2/images/widgets/windows/tree/line.gif
index b3d88205e7..b3d88205e7 100644
--- a/swat/images/widgets/windows/tree/line.gif
+++ b/swat2/images/widgets/windows/tree/line.gif
diff --git a/swat/images/widgets/windows/tree/minus.gif b/swat2/images/widgets/windows/tree/minus.gif
index b7da5b892d..b7da5b892d 100644
--- a/swat/images/widgets/windows/tree/minus.gif
+++ b/swat2/images/widgets/windows/tree/minus.gif
diff --git a/swat/images/widgets/windows/tree/plus.gif b/swat2/images/widgets/windows/tree/plus.gif
index c006f8514f..c006f8514f 100644
--- a/swat/images/widgets/windows/tree/plus.gif
+++ b/swat2/images/widgets/windows/tree/plus.gif
diff --git a/swat/images/widgets/windows/window/close.gif b/swat2/images/widgets/windows/window/close.gif
index d6b727338d..d6b727338d 100644
--- a/swat/images/widgets/windows/window/close.gif
+++ b/swat2/images/widgets/windows/window/close.gif
diff --git a/swat/images/widgets/windows/window/maximize.gif b/swat2/images/widgets/windows/window/maximize.gif
index ae5e941d4f..ae5e941d4f 100644
--- a/swat/images/widgets/windows/window/maximize.gif
+++ b/swat2/images/widgets/windows/window/maximize.gif
diff --git a/swat/images/widgets/windows/window/minimize.gif b/swat2/images/widgets/windows/window/minimize.gif
index c5b586e509..c5b586e509 100644
--- a/swat/images/widgets/windows/window/minimize.gif
+++ b/swat2/images/widgets/windows/window/minimize.gif
diff --git a/swat/images/widgets/windows/window/restore.gif b/swat2/images/widgets/windows/window/restore.gif
index 2910d37b78..2910d37b78 100644
--- a/swat/images/widgets/windows/window/restore.gif
+++ b/swat2/images/widgets/windows/window/restore.gif
diff --git a/swat/index.esp b/swat2/index.esp
index 1924e40210..1924e40210 100644
--- a/swat/index.esp
+++ b/swat2/index.esp
diff --git a/swat/install/index.esp b/swat2/install/index.esp
index 4ba581c1fd..4ba581c1fd 100644
--- a/swat/install/index.esp
+++ b/swat2/install/index.esp
diff --git a/swat/install/newuser.esp b/swat2/install/newuser.esp
index 1b341ff665..1b341ff665 100644
--- a/swat/install/newuser.esp
+++ b/swat2/install/newuser.esp
diff --git a/swat/install/provision.esp b/swat2/install/provision.esp
index c6511adb66..c6511adb66 100644
--- a/swat/install/provision.esp
+++ b/swat2/install/provision.esp
diff --git a/swat/install/samba3.esp b/swat2/install/samba3.esp
index 4de942f972..4de942f972 100644
--- a/swat/install/samba3.esp
+++ b/swat2/install/samba3.esp
diff --git a/swat/install/vampire.esp b/swat2/install/vampire.esp
index 77e9959de3..77e9959de3 100644
--- a/swat/install/vampire.esp
+++ b/swat2/install/vampire.esp
diff --git a/swat/kdc_server/index.esp b/swat2/kdc_server/index.esp
index 69a8b0736b..69a8b0736b 100644
--- a/swat/kdc_server/index.esp
+++ b/swat2/kdc_server/index.esp
diff --git a/swat/ldap_server/index.esp b/swat2/ldap_server/index.esp
index c4ed146b18..c4ed146b18 100644
--- a/swat/ldap_server/index.esp
+++ b/swat2/ldap_server/index.esp
diff --git a/swat/login.esp b/swat2/login.esp
index 9e9f6f9903..9e9f6f9903 100644
--- a/swat/login.esp
+++ b/swat2/login.esp
diff --git a/swat/logout.esp b/swat2/logout.esp
index d0d971d962..d0d971d962 100644
--- a/swat/logout.esp
+++ b/swat2/logout.esp
diff --git a/swat/menu.js b/swat2/menu.js
index dad11d7360..dad11d7360 100644
--- a/swat/menu.js
+++ b/swat2/menu.js
diff --git a/swat/nbt_server/index.esp b/swat2/nbt_server/index.esp
index 1928f12d1b..1928f12d1b 100644
--- a/swat/nbt_server/index.esp
+++ b/swat2/nbt_server/index.esp
diff --git a/swat/rpc_server/index.esp b/swat2/rpc_server/index.esp
index 46c8c8a7a7..46c8c8a7a7 100644
--- a/swat/rpc_server/index.esp
+++ b/swat2/rpc_server/index.esp
diff --git a/swat/scripting/client/call.js b/swat2/scripting/client/call.js
index 316dec5bb1..316dec5bb1 100644
--- a/swat/scripting/client/call.js
+++ b/swat2/scripting/client/call.js
diff --git a/swat/scripting/client/desktop.js b/swat2/scripting/client/desktop.js
index 8e55cc94ee..8e55cc94ee 100644
--- a/swat/scripting/client/desktop.js
+++ b/swat2/scripting/client/desktop.js
diff --git a/swat/scripting/client/encoder.js b/swat2/scripting/client/encoder.js
index 2a4d174b0e..2a4d174b0e 100644
--- a/swat/scripting/client/encoder.js
+++ b/swat2/scripting/client/encoder.js
diff --git a/swat/scripting/client/js_scripts.js b/swat2/scripting/client/js_scripts.js
index ea87df02c8..ea87df02c8 100644
--- a/swat/scripting/client/js_scripts.js
+++ b/swat2/scripting/client/js_scripts.js
diff --git a/swat/scripting/client/regedit.js b/swat2/scripting/client/regedit.js
index 555ba9fb90..555ba9fb90 100644
--- a/swat/scripting/client/regedit.js
+++ b/swat2/scripting/client/regedit.js
diff --git a/swat/scripting/client/status.js b/swat2/scripting/client/status.js
index a41038d5e9..a41038d5e9 100644
--- a/swat/scripting/client/status.js
+++ b/swat2/scripting/client/status.js
diff --git a/swat/scripting/common.js b/swat2/scripting/common.js
index c111089bd8..c111089bd8 100644
--- a/swat/scripting/common.js
+++ b/swat2/scripting/common.js
diff --git a/swat/scripting/footer_columns.esp b/swat2/scripting/footer_columns.esp
index 7b5baaf0c8..7b5baaf0c8 100644
--- a/swat/scripting/footer_columns.esp
+++ b/swat2/scripting/footer_columns.esp
diff --git a/swat/scripting/footer_desktop.esp b/swat2/scripting/footer_desktop.esp
index 5e563dab88..5e563dab88 100644
--- a/swat/scripting/footer_desktop.esp
+++ b/swat2/scripting/footer_desktop.esp
diff --git a/swat/scripting/footer_plain.esp b/swat2/scripting/footer_plain.esp
index 31ef8dd4ee..31ef8dd4ee 100644
--- a/swat/scripting/footer_plain.esp
+++ b/swat2/scripting/footer_plain.esp
diff --git a/swat/scripting/forms.js b/swat2/scripting/forms.js
index 2de9e34462..2de9e34462 100644
--- a/swat/scripting/forms.js
+++ b/swat2/scripting/forms.js
diff --git a/swat/scripting/general_calls.esp b/swat2/scripting/general_calls.esp
index f17c43205a..f17c43205a 100644
--- a/swat/scripting/general_calls.esp
+++ b/swat2/scripting/general_calls.esp
diff --git a/swat/scripting/header_columns.esp b/swat2/scripting/header_columns.esp
index 593c738bed..593c738bed 100644
--- a/swat/scripting/header_columns.esp
+++ b/swat2/scripting/header_columns.esp
diff --git a/swat/scripting/header_desktop.esp b/swat2/scripting/header_desktop.esp
index 9d02ab323b..9d02ab323b 100644
--- a/swat/scripting/header_desktop.esp
+++ b/swat2/scripting/header_desktop.esp
diff --git a/swat/scripting/header_plain.esp b/swat2/scripting/header_plain.esp
index 8dd378910e..8dd378910e 100644
--- a/swat/scripting/header_plain.esp
+++ b/swat2/scripting/header_plain.esp
diff --git a/swat/scripting/menus.js b/swat2/scripting/menus.js
index ddd97c4ca3..ddd97c4ca3 100644
--- a/swat/scripting/menus.js
+++ b/swat2/scripting/menus.js
diff --git a/swat/scripting/preauth.esp b/swat2/scripting/preauth.esp
index e6d04faf8d..e6d04faf8d 100644
--- a/swat/scripting/preauth.esp
+++ b/swat2/scripting/preauth.esp
diff --git a/swat/scripting/server/regedit.esp b/swat2/scripting/server/regedit.esp
index 58ba695c47..58ba695c47 100644
--- a/swat/scripting/server/regedit.esp
+++ b/swat2/scripting/server/regedit.esp
diff --git a/swat/scripting/server/status.esp b/swat2/scripting/server/status.esp
index 8ca2067d49..8ca2067d49 100644
--- a/swat/scripting/server/status.esp
+++ b/swat2/scripting/server/status.esp
diff --git a/swat/scripting/test.ejs b/swat2/scripting/test.ejs
index 8e7047f51c..8e7047f51c 100644
--- a/swat/scripting/test.ejs
+++ b/swat2/scripting/test.ejs
diff --git a/swat/scripting/test.esp b/swat2/scripting/test.esp
index 614a42410c..614a42410c 100644
--- a/swat/scripting/test.esp
+++ b/swat2/scripting/test.esp
diff --git a/swat/smb_server/index.esp b/swat2/smb_server/index.esp
index f0f4620492..f0f4620492 100644
--- a/swat/smb_server/index.esp
+++ b/swat2/smb_server/index.esp
diff --git a/swat/style/columns.css b/swat2/style/columns.css
index e78da9b3d7..e78da9b3d7 100644
--- a/swat/style/columns.css
+++ b/swat2/style/columns.css
diff --git a/swat/style/common.css b/swat2/style/common.css
index 545ffe930c..545ffe930c 100644
--- a/swat/style/common.css
+++ b/swat2/style/common.css
diff --git a/swat/style/qooxdoo/core.css b/swat2/style/qooxdoo/core.css
index 06dfb64606..06dfb64606 100644
--- a/swat/style/qooxdoo/core.css
+++ b/swat2/style/qooxdoo/core.css
diff --git a/swat/style/qooxdoo/layouts/application.css b/swat2/style/qooxdoo/layouts/application.css
index 70b491874e..70b491874e 100644
--- a/swat/style/qooxdoo/layouts/application.css
+++ b/swat2/style/qooxdoo/layouts/application.css
diff --git a/swat/style/qooxdoo/layouts/page.css b/swat2/style/qooxdoo/layouts/page.css
index 42ed7433fa..42ed7433fa 100644
--- a/swat/style/qooxdoo/layouts/page.css
+++ b/swat2/style/qooxdoo/layouts/page.css
diff --git a/swat/style/qooxdoo/test.css b/swat2/style/qooxdoo/test.css
index 9e490866ab..9e490866ab 100644
--- a/swat/style/qooxdoo/test.css
+++ b/swat2/style/qooxdoo/test.css
diff --git a/swat/style/qooxdoo/themes.css b/swat2/style/qooxdoo/themes.css
index 26ed1e5544..26ed1e5544 100644
--- a/swat/style/qooxdoo/themes.css
+++ b/swat2/style/qooxdoo/themes.css
diff --git a/swat/style/qooxdoo/themes/osx/grad_blue.gif b/swat2/style/qooxdoo/themes/osx/grad_blue.gif
index 751a7a3a24..751a7a3a24 100755
--- a/swat/style/qooxdoo/themes/osx/grad_blue.gif
+++ b/swat2/style/qooxdoo/themes/osx/grad_blue.gif
diff --git a/swat/style/qooxdoo/themes/osx/grad_gray.gif b/swat2/style/qooxdoo/themes/osx/grad_gray.gif
index dc87940d2d..dc87940d2d 100755
--- a/swat/style/qooxdoo/themes/osx/grad_gray.gif
+++ b/swat2/style/qooxdoo/themes/osx/grad_gray.gif
diff --git a/swat/style/qooxdoo/themes/osx/pin_dark.gif b/swat2/style/qooxdoo/themes/osx/pin_dark.gif
index 844277d476..844277d476 100755
--- a/swat/style/qooxdoo/themes/osx/pin_dark.gif
+++ b/swat2/style/qooxdoo/themes/osx/pin_dark.gif
diff --git a/swat/style/qooxdoo/themes/osx/toolbar_bg.gif b/swat2/style/qooxdoo/themes/osx/toolbar_bg.gif
index 9b78191d1a..9b78191d1a 100755
--- a/swat/style/qooxdoo/themes/osx/toolbar_bg.gif
+++ b/swat2/style/qooxdoo/themes/osx/toolbar_bg.gif
diff --git a/swat/style/qooxdoo/themes/win9x/radiobuttonbackground.gif b/swat2/style/qooxdoo/themes/win9x/radiobuttonbackground.gif
index 467da46f25..467da46f25 100644
--- a/swat/style/qooxdoo/themes/win9x/radiobuttonbackground.gif
+++ b/swat2/style/qooxdoo/themes/win9x/radiobuttonbackground.gif
diff --git a/swat/style/qooxdoo/themes/win9x/theme.css b/swat2/style/qooxdoo/themes/win9x/theme.css
index bc51fd8c5e..bc51fd8c5e 100644
--- a/swat/style/qooxdoo/themes/win9x/theme.css
+++ b/swat2/style/qooxdoo/themes/win9x/theme.css
diff --git a/swat/style/qooxdoo/themes/win9x/windowcaption_active.png b/swat2/style/qooxdoo/themes/win9x/windowcaption_active.png
index 02da51f022..02da51f022 100644
--- a/swat/style/qooxdoo/themes/win9x/windowcaption_active.png
+++ b/swat2/style/qooxdoo/themes/win9x/windowcaption_active.png
diff --git a/swat/style/qooxdoo/themes/win9x/windowcaption_inactive.png b/swat2/style/qooxdoo/themes/win9x/windowcaption_inactive.png
index a080239b01..a080239b01 100644
--- a/swat/style/qooxdoo/themes/win9x/windowcaption_inactive.png
+++ b/swat2/style/qooxdoo/themes/win9x/windowcaption_inactive.png
diff --git a/swat/style/qooxdoo/themes/winxp/menubackground.gif b/swat2/style/qooxdoo/themes/winxp/menubackground.gif
index f7c5589e54..f7c5589e54 100644
--- a/swat/style/qooxdoo/themes/winxp/menubackground.gif
+++ b/swat2/style/qooxdoo/themes/winxp/menubackground.gif
diff --git a/swat/style/qooxdoo/themes/winxp/theme.css b/swat2/style/qooxdoo/themes/winxp/theme.css
index 8da8197b84..8da8197b84 100644
--- a/swat/style/qooxdoo/themes/winxp/theme.css
+++ b/swat2/style/qooxdoo/themes/winxp/theme.css
diff --git a/swat/style/qooxdoo/themes/winxp/toolbarparthandle.gif b/swat2/style/qooxdoo/themes/winxp/toolbarparthandle.gif
index 9772d787a1..9772d787a1 100644
--- a/swat/style/qooxdoo/themes/winxp/toolbarparthandle.gif
+++ b/swat2/style/qooxdoo/themes/winxp/toolbarparthandle.gif
diff --git a/swat/style/qooxdoo/widgets.css b/swat2/style/qooxdoo/widgets.css
index 33fa321e14..33fa321e14 100644
--- a/swat/style/qooxdoo/widgets.css
+++ b/swat2/style/qooxdoo/widgets.css
diff --git a/swat/style/qooxdoo/widgets/core/QxApplication.js b/swat2/style/qooxdoo/widgets/core/QxApplication.js
index 3d1dbbafa3..3d1dbbafa3 100644
--- a/swat/style/qooxdoo/widgets/core/QxApplication.js
+++ b/swat2/style/qooxdoo/widgets/core/QxApplication.js
diff --git a/swat/style/qooxdoo/widgets/core/QxBorder.js b/swat2/style/qooxdoo/widgets/core/QxBorder.js
index 007cdd307f..007cdd307f 100644
--- a/swat/style/qooxdoo/widgets/core/QxBorder.js
+++ b/swat2/style/qooxdoo/widgets/core/QxBorder.js
diff --git a/swat/style/qooxdoo/widgets/core/QxBuilder.js b/swat2/style/qooxdoo/widgets/core/QxBuilder.js
index c9b3277493..c9b3277493 100644
--- a/swat/style/qooxdoo/widgets/core/QxBuilder.js
+++ b/swat2/style/qooxdoo/widgets/core/QxBuilder.js
diff --git a/swat/style/qooxdoo/widgets/core/QxClient.js b/swat2/style/qooxdoo/widgets/core/QxClient.js
index 19851a9850..19851a9850 100644
--- a/swat/style/qooxdoo/widgets/core/QxClient.js
+++ b/swat2/style/qooxdoo/widgets/core/QxClient.js
diff --git a/swat/style/qooxdoo/widgets/core/QxClientWindow.js b/swat2/style/qooxdoo/widgets/core/QxClientWindow.js
index 060d637e78..060d637e78 100644
--- a/swat/style/qooxdoo/widgets/core/QxClientWindow.js
+++ b/swat2/style/qooxdoo/widgets/core/QxClientWindow.js
diff --git a/swat/style/qooxdoo/widgets/core/QxCommand.js b/swat2/style/qooxdoo/widgets/core/QxCommand.js
index 488de0dd34..488de0dd34 100644
--- a/swat/style/qooxdoo/widgets/core/QxCommand.js
+++ b/swat2/style/qooxdoo/widgets/core/QxCommand.js
diff --git a/swat/style/qooxdoo/widgets/core/QxData.js b/swat2/style/qooxdoo/widgets/core/QxData.js
index 44b055c85f..44b055c85f 100644
--- a/swat/style/qooxdoo/widgets/core/QxData.js
+++ b/swat2/style/qooxdoo/widgets/core/QxData.js
diff --git a/swat/style/qooxdoo/widgets/core/QxDebug.js b/swat2/style/qooxdoo/widgets/core/QxDebug.js
index 66ac659cfd..66ac659cfd 100644
--- a/swat/style/qooxdoo/widgets/core/QxDebug.js
+++ b/swat2/style/qooxdoo/widgets/core/QxDebug.js
diff --git a/swat/style/qooxdoo/widgets/core/QxDom.js b/swat2/style/qooxdoo/widgets/core/QxDom.js
index 34b35caa77..34b35caa77 100644
--- a/swat/style/qooxdoo/widgets/core/QxDom.js
+++ b/swat2/style/qooxdoo/widgets/core/QxDom.js
diff --git a/swat/style/qooxdoo/widgets/core/QxExtend.js b/swat2/style/qooxdoo/widgets/core/QxExtend.js
index f633368011..f633368011 100644
--- a/swat/style/qooxdoo/widgets/core/QxExtend.js
+++ b/swat2/style/qooxdoo/widgets/core/QxExtend.js
diff --git a/swat/style/qooxdoo/widgets/core/QxNativeWindow.js b/swat2/style/qooxdoo/widgets/core/QxNativeWindow.js
index 3cf927052a..3cf927052a 100644
--- a/swat/style/qooxdoo/widgets/core/QxNativeWindow.js
+++ b/swat2/style/qooxdoo/widgets/core/QxNativeWindow.js
diff --git a/swat/style/qooxdoo/widgets/core/QxObject.js b/swat2/style/qooxdoo/widgets/core/QxObject.js
index 7300612863..7300612863 100644
--- a/swat/style/qooxdoo/widgets/core/QxObject.js
+++ b/swat2/style/qooxdoo/widgets/core/QxObject.js
diff --git a/swat/style/qooxdoo/widgets/core/QxSelectionStorage.js b/swat2/style/qooxdoo/widgets/core/QxSelectionStorage.js
index 07b6aebfb4..07b6aebfb4 100644
--- a/swat/style/qooxdoo/widgets/core/QxSelectionStorage.js
+++ b/swat2/style/qooxdoo/widgets/core/QxSelectionStorage.js
diff --git a/swat/style/qooxdoo/widgets/core/QxTarget.js b/swat2/style/qooxdoo/widgets/core/QxTarget.js
index 34fddfab51..34fddfab51 100644
--- a/swat/style/qooxdoo/widgets/core/QxTarget.js
+++ b/swat2/style/qooxdoo/widgets/core/QxTarget.js
diff --git a/swat/style/qooxdoo/widgets/core/QxTimer.js b/swat2/style/qooxdoo/widgets/core/QxTimer.js
index 6d0794237a..6d0794237a 100644
--- a/swat/style/qooxdoo/widgets/core/QxTimer.js
+++ b/swat2/style/qooxdoo/widgets/core/QxTimer.js
diff --git a/swat/style/qooxdoo/widgets/core/QxUserApplication.js b/swat2/style/qooxdoo/widgets/core/QxUserApplication.js
index 2937cb9c74..2937cb9c74 100644
--- a/swat/style/qooxdoo/widgets/core/QxUserApplication.js
+++ b/swat2/style/qooxdoo/widgets/core/QxUserApplication.js
diff --git a/swat/style/qooxdoo/widgets/core/QxXmlHttpLoader.js b/swat2/style/qooxdoo/widgets/core/QxXmlHttpLoader.js
index fbf514106c..fbf514106c 100644
--- a/swat/style/qooxdoo/widgets/core/QxXmlHttpLoader.js
+++ b/swat2/style/qooxdoo/widgets/core/QxXmlHttpLoader.js
diff --git a/swat/style/qooxdoo/widgets/events/QxDataEvent.js b/swat2/style/qooxdoo/widgets/events/QxDataEvent.js
index 2634ba42a3..2634ba42a3 100644
--- a/swat/style/qooxdoo/widgets/events/QxDataEvent.js
+++ b/swat2/style/qooxdoo/widgets/events/QxDataEvent.js
diff --git a/swat/style/qooxdoo/widgets/events/QxDragEvent.js b/swat2/style/qooxdoo/widgets/events/QxDragEvent.js
index 76db40803e..76db40803e 100644
--- a/swat/style/qooxdoo/widgets/events/QxDragEvent.js
+++ b/swat2/style/qooxdoo/widgets/events/QxDragEvent.js
diff --git a/swat/style/qooxdoo/widgets/events/QxEvent.js b/swat2/style/qooxdoo/widgets/events/QxEvent.js
index 31960eec9c..31960eec9c 100644
--- a/swat/style/qooxdoo/widgets/events/QxEvent.js
+++ b/swat2/style/qooxdoo/widgets/events/QxEvent.js
diff --git a/swat/style/qooxdoo/widgets/events/QxFocusEvent.js b/swat2/style/qooxdoo/widgets/events/QxFocusEvent.js
index 176d59caa2..176d59caa2 100644
--- a/swat/style/qooxdoo/widgets/events/QxFocusEvent.js
+++ b/swat2/style/qooxdoo/widgets/events/QxFocusEvent.js
diff --git a/swat/style/qooxdoo/widgets/events/QxKeyEvent.js b/swat2/style/qooxdoo/widgets/events/QxKeyEvent.js
index cc2808e805..cc2808e805 100644
--- a/swat/style/qooxdoo/widgets/events/QxKeyEvent.js
+++ b/swat2/style/qooxdoo/widgets/events/QxKeyEvent.js
diff --git a/swat/style/qooxdoo/widgets/events/QxMouseEvent.js b/swat2/style/qooxdoo/widgets/events/QxMouseEvent.js
index b1035ef236..b1035ef236 100644
--- a/swat/style/qooxdoo/widgets/events/QxMouseEvent.js
+++ b/swat2/style/qooxdoo/widgets/events/QxMouseEvent.js
diff --git a/swat/style/qooxdoo/widgets/managers/QxDataManager.js b/swat2/style/qooxdoo/widgets/managers/QxDataManager.js
index cb8ba70a89..cb8ba70a89 100644
--- a/swat/style/qooxdoo/widgets/managers/QxDataManager.js
+++ b/swat2/style/qooxdoo/widgets/managers/QxDataManager.js
diff --git a/swat/style/qooxdoo/widgets/managers/QxDomSelectionManager.js b/swat2/style/qooxdoo/widgets/managers/QxDomSelectionManager.js
index 5c94c00abc..5c94c00abc 100644
--- a/swat/style/qooxdoo/widgets/managers/QxDomSelectionManager.js
+++ b/swat2/style/qooxdoo/widgets/managers/QxDomSelectionManager.js
diff --git a/swat/style/qooxdoo/widgets/managers/QxDragAndDropManager.js b/swat2/style/qooxdoo/widgets/managers/QxDragAndDropManager.js
index d1b98ecc21..d1b98ecc21 100644
--- a/swat/style/qooxdoo/widgets/managers/QxDragAndDropManager.js
+++ b/swat2/style/qooxdoo/widgets/managers/QxDragAndDropManager.js
diff --git a/swat/style/qooxdoo/widgets/managers/QxEventManager.js b/swat2/style/qooxdoo/widgets/managers/QxEventManager.js
index 53ef5f26ac..53ef5f26ac 100644
--- a/swat/style/qooxdoo/widgets/managers/QxEventManager.js
+++ b/swat2/style/qooxdoo/widgets/managers/QxEventManager.js
diff --git a/swat/style/qooxdoo/widgets/managers/QxFocusManager.js b/swat2/style/qooxdoo/widgets/managers/QxFocusManager.js
index 13a2c524dc..13a2c524dc 100644
--- a/swat/style/qooxdoo/widgets/managers/QxFocusManager.js
+++ b/swat2/style/qooxdoo/widgets/managers/QxFocusManager.js
diff --git a/swat/style/qooxdoo/widgets/managers/QxImageManager.js b/swat2/style/qooxdoo/widgets/managers/QxImageManager.js
index 233a9017eb..233a9017eb 100644
--- a/swat/style/qooxdoo/widgets/managers/QxImageManager.js
+++ b/swat2/style/qooxdoo/widgets/managers/QxImageManager.js
diff --git a/swat/style/qooxdoo/widgets/managers/QxImagePreloaderManager.js b/swat2/style/qooxdoo/widgets/managers/QxImagePreloaderManager.js
index 1d2549908c..1d2549908c 100644
--- a/swat/style/qooxdoo/widgets/managers/QxImagePreloaderManager.js
+++ b/swat2/style/qooxdoo/widgets/managers/QxImagePreloaderManager.js
diff --git a/swat/style/qooxdoo/widgets/managers/QxManager.js b/swat2/style/qooxdoo/widgets/managers/QxManager.js
index 6fd02f7f6a..6fd02f7f6a 100644
--- a/swat/style/qooxdoo/widgets/managers/QxManager.js
+++ b/swat2/style/qooxdoo/widgets/managers/QxManager.js
diff --git a/swat/style/qooxdoo/widgets/managers/QxMenuManager.js b/swat2/style/qooxdoo/widgets/managers/QxMenuManager.js
index c5ca51809b..c5ca51809b 100644
--- a/swat/style/qooxdoo/widgets/managers/QxMenuManager.js
+++ b/swat2/style/qooxdoo/widgets/managers/QxMenuManager.js
diff --git a/swat/style/qooxdoo/widgets/managers/QxPopupManager.js b/swat2/style/qooxdoo/widgets/managers/QxPopupManager.js
index f7fb74eede..f7fb74eede 100644
--- a/swat/style/qooxdoo/widgets/managers/QxPopupManager.js
+++ b/swat2/style/qooxdoo/widgets/managers/QxPopupManager.js
diff --git a/swat/style/qooxdoo/widgets/managers/QxRadioButtonManager.js b/swat2/style/qooxdoo/widgets/managers/QxRadioButtonManager.js
index a6eef53f50..a6eef53f50 100644
--- a/swat/style/qooxdoo/widgets/managers/QxRadioButtonManager.js
+++ b/swat2/style/qooxdoo/widgets/managers/QxRadioButtonManager.js
diff --git a/swat/style/qooxdoo/widgets/managers/QxRangeManager.js b/swat2/style/qooxdoo/widgets/managers/QxRangeManager.js
index c9757cb3ba..c9757cb3ba 100644
--- a/swat/style/qooxdoo/widgets/managers/QxRangeManager.js
+++ b/swat2/style/qooxdoo/widgets/managers/QxRangeManager.js
diff --git a/swat/style/qooxdoo/widgets/managers/QxSelectionManager.js b/swat2/style/qooxdoo/widgets/managers/QxSelectionManager.js
index 9432d471cd..9432d471cd 100644
--- a/swat/style/qooxdoo/widgets/managers/QxSelectionManager.js
+++ b/swat2/style/qooxdoo/widgets/managers/QxSelectionManager.js
diff --git a/swat/style/qooxdoo/widgets/managers/QxTimerManager.js b/swat2/style/qooxdoo/widgets/managers/QxTimerManager.js
index dfd5fe2326..dfd5fe2326 100644
--- a/swat/style/qooxdoo/widgets/managers/QxTimerManager.js
+++ b/swat2/style/qooxdoo/widgets/managers/QxTimerManager.js
diff --git a/swat/style/qooxdoo/widgets/managers/QxToolTipManager.js b/swat2/style/qooxdoo/widgets/managers/QxToolTipManager.js
index 1515fd337b..1515fd337b 100644
--- a/swat/style/qooxdoo/widgets/managers/QxToolTipManager.js
+++ b/swat2/style/qooxdoo/widgets/managers/QxToolTipManager.js
diff --git a/swat/style/qooxdoo/widgets/managers/QxWindowManager.js b/swat2/style/qooxdoo/widgets/managers/QxWindowManager.js
index c7a0f3bf88..c7a0f3bf88 100644
--- a/swat/style/qooxdoo/widgets/managers/QxWindowManager.js
+++ b/swat2/style/qooxdoo/widgets/managers/QxWindowManager.js
diff --git a/swat/style/qooxdoo/widgets/qooxdoo.js b/swat2/style/qooxdoo/widgets/qooxdoo.js
index 4aee0ad2e5..4aee0ad2e5 100644
--- a/swat/style/qooxdoo/widgets/qooxdoo.js
+++ b/swat2/style/qooxdoo/widgets/qooxdoo.js
diff --git a/swat/style/qooxdoo/widgets/types/QxColor.js b/swat2/style/qooxdoo/widgets/types/QxColor.js
index bb72695386..bb72695386 100644
--- a/swat/style/qooxdoo/widgets/types/QxColor.js
+++ b/swat2/style/qooxdoo/widgets/types/QxColor.js
diff --git a/swat/style/qooxdoo/widgets/types/QxInteger.js b/swat2/style/qooxdoo/widgets/types/QxInteger.js
index aca33b4a30..aca33b4a30 100644
--- a/swat/style/qooxdoo/widgets/types/QxInteger.js
+++ b/swat2/style/qooxdoo/widgets/types/QxInteger.js
diff --git a/swat/style/qooxdoo/widgets/types/QxNumber.js b/swat2/style/qooxdoo/widgets/types/QxNumber.js
index 4c42444893..4c42444893 100644
--- a/swat/style/qooxdoo/widgets/types/QxNumber.js
+++ b/swat2/style/qooxdoo/widgets/types/QxNumber.js
diff --git a/swat/style/qooxdoo/widgets/types/QxString.js b/swat2/style/qooxdoo/widgets/types/QxString.js
index bdeaad5c81..bdeaad5c81 100644
--- a/swat/style/qooxdoo/widgets/types/QxString.js
+++ b/swat2/style/qooxdoo/widgets/types/QxString.js
diff --git a/swat/style/qooxdoo/widgets/types/QxTextile.js b/swat2/style/qooxdoo/widgets/types/QxTextile.js
index 037876c7ad..037876c7ad 100644
--- a/swat/style/qooxdoo/widgets/types/QxTextile.js
+++ b/swat2/style/qooxdoo/widgets/types/QxTextile.js
diff --git a/swat/style/qooxdoo/widgets/types/QxVariable.js b/swat2/style/qooxdoo/widgets/types/QxVariable.js
index 31c1d6a1e0..31c1d6a1e0 100644
--- a/swat/style/qooxdoo/widgets/types/QxVariable.js
+++ b/swat2/style/qooxdoo/widgets/types/QxVariable.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxAtom.js b/swat2/style/qooxdoo/widgets/widgets/QxAtom.js
index 6603d5b6b2..6603d5b6b2 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxAtom.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxAtom.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxBarSelectorBar.js b/swat2/style/qooxdoo/widgets/widgets/QxBarSelectorBar.js
index 7a9d4c171e..7a9d4c171e 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxBarSelectorBar.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxBarSelectorBar.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxBarSelectorButton.js b/swat2/style/qooxdoo/widgets/widgets/QxBarSelectorButton.js
index 5aa4612267..5aa4612267 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxBarSelectorButton.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxBarSelectorButton.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxBarSelectorFrame.js b/swat2/style/qooxdoo/widgets/widgets/QxBarSelectorFrame.js
index c78277a34c..c78277a34c 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxBarSelectorFrame.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxBarSelectorFrame.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxBarSelectorPage.js b/swat2/style/qooxdoo/widgets/widgets/QxBarSelectorPage.js
index ee4c0efd24..ee4c0efd24 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxBarSelectorPage.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxBarSelectorPage.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxBarSelectorPane.js b/swat2/style/qooxdoo/widgets/widgets/QxBarSelectorPane.js
index 822474cc77..822474cc77 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxBarSelectorPane.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxBarSelectorPane.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxBlocker.js b/swat2/style/qooxdoo/widgets/widgets/QxBlocker.js
index b3c8fcda18..b3c8fcda18 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxBlocker.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxBlocker.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxBoxLayout.js b/swat2/style/qooxdoo/widgets/widgets/QxBoxLayout.js
index 9d3e7bb47b..9d3e7bb47b 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxBoxLayout.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxBoxLayout.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxButton.js b/swat2/style/qooxdoo/widgets/widgets/QxButton.js
index 4c4c8def07..4c4c8def07 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxButton.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxButton.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxCheckBox.js b/swat2/style/qooxdoo/widgets/widgets/QxCheckBox.js
index 33e6d5497a..33e6d5497a 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxCheckBox.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxCheckBox.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxClientDocument.js b/swat2/style/qooxdoo/widgets/widgets/QxClientDocument.js
index 60da8a147a..60da8a147a 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxClientDocument.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxClientDocument.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxColorPresetPopup.js b/swat2/style/qooxdoo/widgets/widgets/QxColorPresetPopup.js
index 13f444f7b7..13f444f7b7 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxColorPresetPopup.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxColorPresetPopup.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxColorSelector.js b/swat2/style/qooxdoo/widgets/widgets/QxColorSelector.js
index 65dee664a2..65dee664a2 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxColorSelector.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxColorSelector.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxComboBox.js b/swat2/style/qooxdoo/widgets/widgets/QxComboBox.js
index 5af95e4f03..5af95e4f03 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxComboBox.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxComboBox.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxContainer.js b/swat2/style/qooxdoo/widgets/widgets/QxContainer.js
index f89fb97d8d..f89fb97d8d 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxContainer.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxContainer.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxDockLayout.js b/swat2/style/qooxdoo/widgets/widgets/QxDockLayout.js
index ccd41abdb7..ccd41abdb7 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxDockLayout.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxDockLayout.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxFieldSet.js b/swat2/style/qooxdoo/widgets/widgets/QxFieldSet.js
index c40c5224e3..c40c5224e3 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxFieldSet.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxFieldSet.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxFlowLayout.js b/swat2/style/qooxdoo/widgets/widgets/QxFlowLayout.js
index c62b09aba8..c62b09aba8 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxFlowLayout.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxFlowLayout.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxForm.js b/swat2/style/qooxdoo/widgets/widgets/QxForm.js
index 649607a513..649607a513 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxForm.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxForm.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxGallery.js b/swat2/style/qooxdoo/widgets/widgets/QxGallery.js
index 1359aabf56..1359aabf56 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxGallery.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxGallery.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxGalleryList.js b/swat2/style/qooxdoo/widgets/widgets/QxGalleryList.js
index 898f7d0093..898f7d0093 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxGalleryList.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxGalleryList.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxGridLayout.js b/swat2/style/qooxdoo/widgets/widgets/QxGridLayout.js
index 32465982d2..32465982d2 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxGridLayout.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxGridLayout.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxHorizontalBoxLayout.js b/swat2/style/qooxdoo/widgets/widgets/QxHorizontalBoxLayout.js
index a9c5ab7af1..a9c5ab7af1 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxHorizontalBoxLayout.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxHorizontalBoxLayout.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxIframe.js b/swat2/style/qooxdoo/widgets/widgets/QxIframe.js
index 1bfa34ade3..1bfa34ade3 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxIframe.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxIframe.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxImage.js b/swat2/style/qooxdoo/widgets/widgets/QxImage.js
index 801f4de5a8..801f4de5a8 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxImage.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxImage.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxImagePreloader.js b/swat2/style/qooxdoo/widgets/widgets/QxImagePreloader.js
index 18255032ec..18255032ec 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxImagePreloader.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxImagePreloader.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxInline.js b/swat2/style/qooxdoo/widgets/widgets/QxInline.js
index 4ee644cac6..4ee644cac6 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxInline.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxInline.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxInputCheckIcon.js b/swat2/style/qooxdoo/widgets/widgets/QxInputCheckIcon.js
index 0256852df8..0256852df8 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxInputCheckIcon.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxInputCheckIcon.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxLayout.js b/swat2/style/qooxdoo/widgets/widgets/QxLayout.js
index 804d99680f..804d99680f 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxLayout.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxLayout.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxList.js b/swat2/style/qooxdoo/widgets/widgets/QxList.js
index 702f2081c1..702f2081c1 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxList.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxList.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxListItem.js b/swat2/style/qooxdoo/widgets/widgets/QxListItem.js
index 864c9d086b..864c9d086b 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxListItem.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxListItem.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxListView.js b/swat2/style/qooxdoo/widgets/widgets/QxListView.js
index 7009af04a2..7009af04a2 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxListView.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxListView.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxMenu.js b/swat2/style/qooxdoo/widgets/widgets/QxMenu.js
index 4c060c488a..4c060c488a 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxMenu.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxMenu.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxMenuBar.js b/swat2/style/qooxdoo/widgets/widgets/QxMenuBar.js
index 81723c681b..81723c681b 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxMenuBar.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxMenuBar.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxMenuBarButton.js b/swat2/style/qooxdoo/widgets/widgets/QxMenuBarButton.js
index d78a61b862..d78a61b862 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxMenuBarButton.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxMenuBarButton.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxMenuButton.js b/swat2/style/qooxdoo/widgets/widgets/QxMenuButton.js
index 09683cca93..09683cca93 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxMenuButton.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxMenuButton.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxMenuCheckBox.js b/swat2/style/qooxdoo/widgets/widgets/QxMenuCheckBox.js
index 9b0e42402c..9b0e42402c 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxMenuCheckBox.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxMenuCheckBox.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxMenuRadioButton.js b/swat2/style/qooxdoo/widgets/widgets/QxMenuRadioButton.js
index 68f596a4a3..68f596a4a3 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxMenuRadioButton.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxMenuRadioButton.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxMenuSeparator.js b/swat2/style/qooxdoo/widgets/widgets/QxMenuSeparator.js
index ad200d535e..ad200d535e 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxMenuSeparator.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxMenuSeparator.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxPasswordField.js b/swat2/style/qooxdoo/widgets/widgets/QxPasswordField.js
index 3309fd6f26..3309fd6f26 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxPasswordField.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxPasswordField.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxPopup.js b/swat2/style/qooxdoo/widgets/widgets/QxPopup.js
index 055e6939d7..055e6939d7 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxPopup.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxPopup.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxRadioButton.js b/swat2/style/qooxdoo/widgets/widgets/QxRadioButton.js
index 341aad500a..341aad500a 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxRadioButton.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxRadioButton.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxSpinner.js b/swat2/style/qooxdoo/widgets/widgets/QxSpinner.js
index 81725cb753..81725cb753 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxSpinner.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxSpinner.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxTab.js b/swat2/style/qooxdoo/widgets/widgets/QxTab.js
index 620884e78a..620884e78a 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxTab.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxTab.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxTabBar.js b/swat2/style/qooxdoo/widgets/widgets/QxTabBar.js
index 4370d8c7f1..4370d8c7f1 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxTabBar.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxTabBar.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxTabFrame.js b/swat2/style/qooxdoo/widgets/widgets/QxTabFrame.js
index 7b42086dd7..7b42086dd7 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxTabFrame.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxTabFrame.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxTabPage.js b/swat2/style/qooxdoo/widgets/widgets/QxTabPage.js
index 6e3febc771..6e3febc771 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxTabPage.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxTabPage.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxTabPane.js b/swat2/style/qooxdoo/widgets/widgets/QxTabPane.js
index ac61469817..ac61469817 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxTabPane.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxTabPane.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxTerminator.js b/swat2/style/qooxdoo/widgets/widgets/QxTerminator.js
index 0310d21850..0310d21850 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxTerminator.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxTerminator.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxTextArea.js b/swat2/style/qooxdoo/widgets/widgets/QxTextArea.js
index f9e00fe6c5..f9e00fe6c5 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxTextArea.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxTextArea.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxTextField.js b/swat2/style/qooxdoo/widgets/widgets/QxTextField.js
index 82a0571c97..82a0571c97 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxTextField.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxTextField.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxToolBar.js b/swat2/style/qooxdoo/widgets/widgets/QxToolBar.js
index 364ca3b9ec..364ca3b9ec 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxToolBar.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxToolBar.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxToolBarButton.js b/swat2/style/qooxdoo/widgets/widgets/QxToolBarButton.js
index 2e7aef7e9c..2e7aef7e9c 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxToolBarButton.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxToolBarButton.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxToolBarCheckBox.js b/swat2/style/qooxdoo/widgets/widgets/QxToolBarCheckBox.js
index 82c114287e..82c114287e 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxToolBarCheckBox.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxToolBarCheckBox.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxToolBarMenuButton.js b/swat2/style/qooxdoo/widgets/widgets/QxToolBarMenuButton.js
index 17d344142c..17d344142c 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxToolBarMenuButton.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxToolBarMenuButton.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxToolBarPart.js b/swat2/style/qooxdoo/widgets/widgets/QxToolBarPart.js
index 9202865d5f..9202865d5f 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxToolBarPart.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxToolBarPart.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxToolBarPartHandle.js b/swat2/style/qooxdoo/widgets/widgets/QxToolBarPartHandle.js
index 4af974a40c..4af974a40c 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxToolBarPartHandle.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxToolBarPartHandle.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxToolBarRadioButton.js b/swat2/style/qooxdoo/widgets/widgets/QxToolBarRadioButton.js
index 2516e101ed..2516e101ed 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxToolBarRadioButton.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxToolBarRadioButton.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxToolBarSeparator.js b/swat2/style/qooxdoo/widgets/widgets/QxToolBarSeparator.js
index 7147477879..7147477879 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxToolBarSeparator.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxToolBarSeparator.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxToolTip.js b/swat2/style/qooxdoo/widgets/widgets/QxToolTip.js
index 13175094e0..13175094e0 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxToolTip.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxToolTip.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxTree.js b/swat2/style/qooxdoo/widgets/widgets/QxTree.js
index 1fdd24eac3..1fdd24eac3 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxTree.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxTree.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxTreeElement.js b/swat2/style/qooxdoo/widgets/widgets/QxTreeElement.js
index a73882f123..a73882f123 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxTreeElement.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxTreeElement.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxTreeFile.js b/swat2/style/qooxdoo/widgets/widgets/QxTreeFile.js
index 2ff2899c7d..2ff2899c7d 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxTreeFile.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxTreeFile.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxTreeFolder.js b/swat2/style/qooxdoo/widgets/widgets/QxTreeFolder.js
index 7bdba69cd3..7bdba69cd3 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxTreeFolder.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxTreeFolder.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxVerticalBoxLayout.js b/swat2/style/qooxdoo/widgets/widgets/QxVerticalBoxLayout.js
index c74d6bf8dd..c74d6bf8dd 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxVerticalBoxLayout.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxVerticalBoxLayout.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxWidget.js b/swat2/style/qooxdoo/widgets/widgets/QxWidget.js
index a07389c2f3..a07389c2f3 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxWidget.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxWidget.js
diff --git a/swat/style/qooxdoo/widgets/widgets/QxWindow.js b/swat2/style/qooxdoo/widgets/widgets/QxWindow.js
index e4732f5666..e4732f5666 100644
--- a/swat/style/qooxdoo/widgets/widgets/QxWindow.js
+++ b/swat2/style/qooxdoo/widgets/widgets/QxWindow.js
diff --git a/swat/style/swat.css b/swat2/style/swat.css
index c41e4eaf10..c41e4eaf10 100644
--- a/swat/style/swat.css
+++ b/swat2/style/swat.css
diff --git a/swat/style/wide.css b/swat2/style/wide.css
index 0107b33698..0107b33698 100644
--- a/swat/style/wide.css
+++ b/swat2/style/wide.css
diff --git a/swat/wins_server/index.esp b/swat2/wins_server/index.esp
index b91ef6fc24..b91ef6fc24 100644
--- a/swat/wins_server/index.esp
+++ b/swat2/wins_server/index.esp