diff --git a/depotclient/org.universaal.tools.depotclient.feature/feature.xml b/depotclient/org.universaal.tools.depotclient.feature/feature.xml
index bb59e59ddc75201617d94ad12d76c016d93f5769..d0d7f6b538038bebe216b310244acd885933a5da 100644
--- a/depotclient/org.universaal.tools.depotclient.feature/feature.xml
+++ b/depotclient/org.universaal.tools.depotclient.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.universaal.tools.depotclient.feature"
       label="AAL Studio integration with Developer Depot"
-      version="0.9.0"
+      version="0.9.5"
       provider-name="universAAL"
       plugin="org.universaal.tools.aalstudio.core">
 
diff --git a/depotclient/org.universaal.tools.importthirdpartyproject/META-INF/MANIFEST.MF b/depotclient/org.universaal.tools.importthirdpartyproject/META-INF/MANIFEST.MF
index 338e4f6cd16c3d4d303d280f9d53ab8bf7af5e36..4d1d45bee177cf9afb52a0acad38c695bc1ac530 100644
--- a/depotclient/org.universaal.tools.importthirdpartyproject/META-INF/MANIFEST.MF
+++ b/depotclient/org.universaal.tools.importthirdpartyproject/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Importexternalproject
 Bundle-SymbolicName: org.universaal.tools.importthirdpartyproject;singleton:=true
-Bundle-Version: 0.9.0
+Bundle-Version: 0.9.5
 Bundle-Activator: org.universaal.tools.importexternalproject.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/depotclient/org.universaal.tools.importthirdpartyproject/icons/document_import.png b/depotclient/org.universaal.tools.importthirdpartyproject/icons/document_import.png
deleted file mode 100644
index e6c5d348fdd6586f5d6436cdbca12a673dbd008a..0000000000000000000000000000000000000000
Binary files a/depotclient/org.universaal.tools.importthirdpartyproject/icons/document_import.png and /dev/null differ
diff --git a/depotclient/org.universaal.tools.importthirdpartyproject/icons/import-document-16.png b/depotclient/org.universaal.tools.importthirdpartyproject/icons/import-document-16.png
new file mode 100644
index 0000000000000000000000000000000000000000..8eeb220d5a1be5bb7cf3afa65e0d13e321656431
Binary files /dev/null and b/depotclient/org.universaal.tools.importthirdpartyproject/icons/import-document-16.png differ
diff --git a/depotclient/org.universaal.tools.importthirdpartyproject/icons/sample.gif b/depotclient/org.universaal.tools.importthirdpartyproject/icons/sample.gif
deleted file mode 100644
index 34fb3c9d8cb7d489681b7f7aee4bdcd7eaf53610..0000000000000000000000000000000000000000
Binary files a/depotclient/org.universaal.tools.importthirdpartyproject/icons/sample.gif and /dev/null differ
diff --git a/depotclient/org.universaal.tools.importthirdpartyproject/plugin.xml b/depotclient/org.universaal.tools.importthirdpartyproject/plugin.xml
index e5cd39da150711b975024a2cda768e937336ebac..b3f495822f1006ac8dbafa40dce5db10de17b188 100644
--- a/depotclient/org.universaal.tools.importthirdpartyproject/plugin.xml
+++ b/depotclient/org.universaal.tools.importthirdpartyproject/plugin.xml
@@ -22,7 +22,7 @@
             locationURI="menu:org.universaal.tools.AALStudio.menu?endof=import">
          <command
                commandId="org.universaal.importexternalproject.commands.importexample"
-               icon="icons/document_import.png"
+               icon="icons/import-document-16.png"
                id="org.universaal.importexternalproject.menus.importthirdparty">
          </command>
       </menuContribution>
diff --git a/depotclient/org.universaal.tools.uploadopensourceplugin/META-INF/MANIFEST.MF b/depotclient/org.universaal.tools.uploadopensourceplugin/META-INF/MANIFEST.MF
index eb7eb7cc7918128daf853d84c76b90d1a51703c5..1ff17a6cdb79fcb83065f5ca09b8d045b4bc0e0a 100644
--- a/depotclient/org.universaal.tools.uploadopensourceplugin/META-INF/MANIFEST.MF
+++ b/depotclient/org.universaal.tools.uploadopensourceplugin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Open Source Upload
 Bundle-SymbolicName: org.universaal.tools.uploadopensourceplugin;singleton:=true
-Bundle-Version: 0.5.0
+Bundle-Version: 0.9.5
 Bundle-Activator: org.universaal.tools.uploadopensourceplugin.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/depotclient/org.universaal.tools.uploadopensourceplugin/icons/new-document-16.png b/depotclient/org.universaal.tools.uploadopensourceplugin/icons/new-document-16.png
new file mode 100644
index 0000000000000000000000000000000000000000..1fd98597962ed948452efefd88f643b5138367b9
Binary files /dev/null and b/depotclient/org.universaal.tools.uploadopensourceplugin/icons/new-document-16.png differ
diff --git a/depotclient/org.universaal.tools.uploadopensourceplugin/icons/newuaal_clss.gif b/depotclient/org.universaal.tools.uploadopensourceplugin/icons/newuaal_clss.gif
deleted file mode 100644
index 2a614a751f1dccb606f9bd5621484927e4544f01..0000000000000000000000000000000000000000
Binary files a/depotclient/org.universaal.tools.uploadopensourceplugin/icons/newuaal_clss.gif and /dev/null differ
diff --git a/depotclient/org.universaal.tools.uploadopensourceplugin/icons/newuaal_clss.png b/depotclient/org.universaal.tools.uploadopensourceplugin/icons/newuaal_clss.png
deleted file mode 100644
index e489a50728517d0a517d4df68dac3aad00c04556..0000000000000000000000000000000000000000
Binary files a/depotclient/org.universaal.tools.uploadopensourceplugin/icons/newuaal_clss.png and /dev/null differ
diff --git a/depotclient/org.universaal.tools.uploadopensourceplugin/icons/sample.gif b/depotclient/org.universaal.tools.uploadopensourceplugin/icons/sample.gif
deleted file mode 100644
index 34fb3c9d8cb7d489681b7f7aee4bdcd7eaf53610..0000000000000000000000000000000000000000
Binary files a/depotclient/org.universaal.tools.uploadopensourceplugin/icons/sample.gif and /dev/null differ
diff --git a/depotclient/org.universaal.tools.uploadopensourceplugin/icons/upload-16.png b/depotclient/org.universaal.tools.uploadopensourceplugin/icons/upload-16.png
new file mode 100644
index 0000000000000000000000000000000000000000..472e5e42ebe88ed56c2c09553e51c07e50609dc7
Binary files /dev/null and b/depotclient/org.universaal.tools.uploadopensourceplugin/icons/upload-16.png differ
diff --git a/depotclient/org.universaal.tools.uploadopensourceplugin/icons/upload.png b/depotclient/org.universaal.tools.uploadopensourceplugin/icons/upload.png
deleted file mode 100644
index 138aa8be51d869ac61dca65c7f5a7a68db1092cb..0000000000000000000000000000000000000000
Binary files a/depotclient/org.universaal.tools.uploadopensourceplugin/icons/upload.png and /dev/null differ
diff --git a/depotclient/org.universaal.tools.uploadopensourceplugin/plugin.xml b/depotclient/org.universaal.tools.uploadopensourceplugin/plugin.xml
index 049cde1a3dcd9ea7bb650a1401055ba476f2f16a..cf334e74575c7c026dac49d6a324204f0a08b920 100644
--- a/depotclient/org.universaal.tools.uploadopensourceplugin/plugin.xml
+++ b/depotclient/org.universaal.tools.uploadopensourceplugin/plugin.xml
@@ -42,7 +42,7 @@
             locationURI="menu:org.universaal.tools.AALStudio.menu?after=publish">
          <command
                commandId="org.universaal.tools.uploadopensourceplugin.commands.uploadopensource"
-               icon="icons/upload.png"
+               icon="icons/upload-16.png"
                id="org.universaal.tools.uploadopensourceplugin.menus.uploadsourcecommand"
                style="push">
          </command>
@@ -58,7 +58,7 @@
             locationURI="menu:org.universaal.tools.AALStudio.menu?endof=new">
          <command
                commandId="org.universaal.tools.uploadopensourceplugin.generateaalapp"
-               icon="icons/newuaal_clss.png"
+               icon="icons/new-document-16.png"
                id="org.universaal.tools.uploadopensourceplugin.menus.generateaalapp"
                style="push">
          </command>
diff --git a/depotclient/org.universaal.tools.uploadopensourceplugin/src/org/universaal/tools/uploadopensourceplugin/email/SendEmail.java b/depotclient/org.universaal.tools.uploadopensourceplugin/src/org/universaal/tools/uploadopensourceplugin/email/SendEmail.java
index 82af84c35caccb6bae19135866eb4e77f5a3c65e..e522f7b3bf04b4a0b17c368ea7909429ddad2de8 100644
--- a/depotclient/org.universaal.tools.uploadopensourceplugin/src/org/universaal/tools/uploadopensourceplugin/email/SendEmail.java
+++ b/depotclient/org.universaal.tools.uploadopensourceplugin/src/org/universaal/tools/uploadopensourceplugin/email/SendEmail.java
@@ -46,7 +46,7 @@ import org.eclipse.ui.PlatformUI;
  */
 public class SendEmail {
 
-	private final static String EMAIL = "universAAL@something.org";
+	private final static String EMAIL = "erlend.stav@sintef.no";
 	private final static String SUBJECT = "New universAAL Project";
 	
 	private Desktop desktop;
diff --git a/depotclient/org.universaal.tools.xmlEditor/META-INF/MANIFEST.MF b/depotclient/org.universaal.tools.xmlEditor/META-INF/MANIFEST.MF
index a417ef3e0336061ea75fb2ef6bf7a4fafe762b83..d53da01c163ea6d8e2f6796cc2be0af0e78dc635 100644
--- a/depotclient/org.universaal.tools.xmlEditor/META-INF/MANIFEST.MF
+++ b/depotclient/org.universaal.tools.xmlEditor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: AAL Application Info Editor
 Bundle-SymbolicName: org.universaal.tools.xmlEditor;singleton:=true
-Bundle-Version: 0.4.0
+Bundle-Version: 0.9.5
 Bundle-Activator: org.universaal.tools.xmleditor.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/depotclient/org.universaal.tools.xmlEditor/icons/sample.gif b/depotclient/org.universaal.tools.xmlEditor/icons/sample.gif
deleted file mode 100644
index 34fb3c9d8cb7d489681b7f7aee4bdcd7eaf53610..0000000000000000000000000000000000000000
Binary files a/depotclient/org.universaal.tools.xmlEditor/icons/sample.gif and /dev/null differ
diff --git a/depotclient/org.universaal.tools.xmlEditor/icons/compile.png b/depotclient/org.universaal.tools.xmlEditor/icons/uaal-16.png
similarity index 100%
rename from depotclient/org.universaal.tools.xmlEditor/icons/compile.png
rename to depotclient/org.universaal.tools.xmlEditor/icons/uaal-16.png
diff --git a/depotclient/org.universaal.tools.xmlEditor/plugin.xml b/depotclient/org.universaal.tools.xmlEditor/plugin.xml
index d063544ca029089a9c1962a444902c801bb3c24d..4fff9c9193983321a57a6e6d0a742deabf1267b9 100644
--- a/depotclient/org.universaal.tools.xmlEditor/plugin.xml
+++ b/depotclient/org.universaal.tools.xmlEditor/plugin.xml
@@ -7,7 +7,7 @@
             class="org.universaal.tools.xmleditor.editors.XmlEditor"
             default="true"
             filenames="aalapp.xml,"
-            icon="icons/compile.png"
+            icon="icons/uaal-16.png"
             id="xmleditor.editors.MultiPageEditor"
             name="AAL Studio Project XML Editor">
       </editor>