diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp
index 2ca31ea08..a40639559 100644
--- a/retroshare-gui/src/gui/GenCertDialog.cpp
+++ b/retroshare-gui/src/gui/GenCertDialog.cpp
@@ -19,7 +19,6 @@
  *  Boston, MA  02110-1301, USA.
  ****************************************************************/
 
-
 #include <rshare.h>
 #include <rsiface/rsinit.h>
 #include "GenCertDialog.h"
@@ -30,7 +29,6 @@
 #include <QMovie>
 #include <time.h>
 
-#include <util/WidgetBackgroundImage.h>
 
 /* Define the format used for displaying the date and time */
 #define DATETIME_FMT  "MMM dd hh:mm:ss"
@@ -44,9 +42,6 @@ GenCertDialog::GenCertDialog(QWidget *parent, Qt::WFlags flags)
   ui.setupUi(this);
 
   connect(ui.new_gpg_key_checkbox, SIGNAL(clicked()), this, SLOT(newGPGKeyGenUiSetup()));
-
-  //WidgetBackgroundImage::setBackgroundImage(ui.loginLabel, ":images/new-account.png", WidgetBackgroundImage::AdjustSize);
-
   
   connect(ui.genButton, SIGNAL(clicked()), this, SLOT(genPerson()));
   connect(ui.infopushButton,SIGNAL(clicked()), this, SLOT(infodlg()));
diff --git a/retroshare-gui/src/gui/GenCertDialog.ui b/retroshare-gui/src/gui/GenCertDialog.ui
index 65c7ebffb..793c2fba1 100644
--- a/retroshare-gui/src/gui/GenCertDialog.ui
+++ b/retroshare-gui/src/gui/GenCertDialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>569</width>
-    <height>444</height>
+    <height>437</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -721,6 +721,12 @@ border: 1px solid #CCCCCC;}</string>
          </item>
          <item row="2" column="0">
           <widget class="QLabel" name="progress_label">
+           <property name="maximumSize">
+            <size>
+             <width>16777215</width>
+             <height>32</height>
+            </size>
+           </property>
            <property name="text">
             <string/>
            </property>
@@ -728,9 +734,28 @@ border: 1px solid #CCCCCC;}</string>
          </item>
          <item row="1" column="0">
           <widget class="QCheckBox" name="new_gpg_key_checkbox">
+           <property name="maximumSize">
+            <size>
+             <width>16777215</width>
+             <height>32</height>
+            </size>
+           </property>
            <property name="text">
             <string>Generate a new a new gpg key</string>
            </property>
+           <property name="icon">
+            <iconset resource="images.qrc">
+             <normaloff>:/images/gpgp_key_generate.png</normaloff>:/images/gpgp_key_generate.png</iconset>
+           </property>
+           <property name="iconSize">
+            <size>
+             <width>32</width>
+             <height>32</height>
+            </size>
+           </property>
+           <property name="tristate">
+            <bool>false</bool>
+           </property>
           </widget>
          </item>
          <item row="5" column="0">
diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index f2b3f254b..6c6320157 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -88,19 +88,6 @@
         <file>images/button_cancel.png</file>
         <file>images/calendar.png</file>
         <file>images/chat.png</file>
-        <file>images/chat/bar_end.png</file>
-        <file>images/chat/bar_fill.png</file>
-        <file>images/chat/chat_emoticon_button.png</file>
-        <file>images/chat/chat_emoticon_button_on.png</file>
-        <file>images/chat/chat_send.png</file>
-        <file>images/chat/font_bold.png</file>
-        <file>images/chat/font_bold_on.png</file>
-        <file>images/chat/font_italic.png</file>
-        <file>images/chat/font_italic_on.png</file>
-        <file>images/chat/font_underline.png</file>
-        <file>images/chat/font_underline_on.png</file>
-        <file>images/chat/hide_avatar_frame.png</file>
-        <file>images/chat/show_avatar_frame.png</file>
         <file>images/chats_24x24.png</file>
         <file>images/cancel.png</file>
         <file>images/close-down.png</file>
@@ -119,7 +106,6 @@
         <file>images/ddeny.png</file>
         <file>images/delete.png</file>
         <file>images/deleteall.png</file>
-        <file>images/deletemail-hover.png</file>
         <file>images/deletemail-pressed.png</file>
         <file>images/deletemail24.png</file>
         <file>images/dhidden.png</file>
@@ -186,7 +172,6 @@
         <file>images/flags/sl.png</file>
         <file>images/flags/tr.png</file>
         <file>images/folder-draft.png</file>
-        <file>images/folder-draft24-hover.png</file>
         <file>images/folder-draft24-pressed.png</file>
         <file>images/folder-draft24.png</file>
         <file>images/folder_inbox64.png</file>
@@ -211,6 +196,7 @@
         <file>images/groupchat.png</file>
         <file>images/genbackground.png</file>
         <file>images/gohome.png</file>
+        <file>images/gpgp_key_generate.png</file>
         <file>images/help.png</file>
         <file>images/help24.png</file>
         <file>images/hide_toolbox_frame.png</file>
@@ -284,8 +270,6 @@
         <file>images/network.png</file>
         <file>images/network16.png</file>
         <file>images/network32.png</file>
-        <file>images/new-account.png</file>
-        <file>images/new-contact.png</file>
         <file>images/new-mail-alert.png</file>
         <file>images/new_forum16.png</file>
         <file>images/nopic.png</file>
@@ -313,13 +297,11 @@
         <file>images/records.png</file>
         <file>images/removefriend16.png</file>
         <file>images/replymail-pressed.png</file>
-        <file>images/replymail24-hover.png</file>
         <file>images/replymail24.png</file>
         <file>images/replymailall24-hover.png</file>
         <file>images/reload24.png</file>
         <file>images/reset.png</file>
         <file>images/resume.png</file>
-        <file>images/retro4.png</file>
         <file>images/RetroShare16.png</file>
         <file>images/retrosharelogo1.png</file>
         <file>images/retrosharelogo2.png</file>
diff --git a/retroshare-gui/src/gui/images/chat/bar_end.png b/retroshare-gui/src/gui/images/chat/bar_end.png
deleted file mode 100644
index 6533362ec..000000000
Binary files a/retroshare-gui/src/gui/images/chat/bar_end.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/chat/bar_fill.png b/retroshare-gui/src/gui/images/chat/bar_fill.png
deleted file mode 100644
index 2902f4129..000000000
Binary files a/retroshare-gui/src/gui/images/chat/bar_fill.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/chat/chat_emoticon_button.png b/retroshare-gui/src/gui/images/chat/chat_emoticon_button.png
deleted file mode 100644
index 82f539602..000000000
Binary files a/retroshare-gui/src/gui/images/chat/chat_emoticon_button.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/chat/chat_emoticon_button_on.png b/retroshare-gui/src/gui/images/chat/chat_emoticon_button_on.png
deleted file mode 100644
index 9925163d0..000000000
Binary files a/retroshare-gui/src/gui/images/chat/chat_emoticon_button_on.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/chat/chat_send.png b/retroshare-gui/src/gui/images/chat/chat_send.png
deleted file mode 100644
index 22a96927f..000000000
Binary files a/retroshare-gui/src/gui/images/chat/chat_send.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/chat/font_bold.png b/retroshare-gui/src/gui/images/chat/font_bold.png
deleted file mode 100644
index 381277e75..000000000
Binary files a/retroshare-gui/src/gui/images/chat/font_bold.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/chat/font_bold_on.png b/retroshare-gui/src/gui/images/chat/font_bold_on.png
deleted file mode 100644
index 1ef72ffff..000000000
Binary files a/retroshare-gui/src/gui/images/chat/font_bold_on.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/chat/font_color.png b/retroshare-gui/src/gui/images/chat/font_color.png
deleted file mode 100644
index 542c6ff1d..000000000
Binary files a/retroshare-gui/src/gui/images/chat/font_color.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/chat/font_color_on.png b/retroshare-gui/src/gui/images/chat/font_color_on.png
deleted file mode 100644
index ee074023f..000000000
Binary files a/retroshare-gui/src/gui/images/chat/font_color_on.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/chat/font_italic.png b/retroshare-gui/src/gui/images/chat/font_italic.png
deleted file mode 100644
index a241d9868..000000000
Binary files a/retroshare-gui/src/gui/images/chat/font_italic.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/chat/font_italic_on.png b/retroshare-gui/src/gui/images/chat/font_italic_on.png
deleted file mode 100644
index adc8a8abd..000000000
Binary files a/retroshare-gui/src/gui/images/chat/font_italic_on.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/chat/font_police.png b/retroshare-gui/src/gui/images/chat/font_police.png
deleted file mode 100644
index f5c7d9d53..000000000
Binary files a/retroshare-gui/src/gui/images/chat/font_police.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/chat/font_police_on.png b/retroshare-gui/src/gui/images/chat/font_police_on.png
deleted file mode 100644
index e73c7e5c3..000000000
Binary files a/retroshare-gui/src/gui/images/chat/font_police_on.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/chat/font_underline.png b/retroshare-gui/src/gui/images/chat/font_underline.png
deleted file mode 100644
index 7e2663d94..000000000
Binary files a/retroshare-gui/src/gui/images/chat/font_underline.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/chat/font_underline_on.png b/retroshare-gui/src/gui/images/chat/font_underline_on.png
deleted file mode 100644
index 8e18a4f92..000000000
Binary files a/retroshare-gui/src/gui/images/chat/font_underline_on.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/chat/hide_avatar_frame.png b/retroshare-gui/src/gui/images/chat/hide_avatar_frame.png
deleted file mode 100644
index e1d9351ce..000000000
Binary files a/retroshare-gui/src/gui/images/chat/hide_avatar_frame.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/chat/show_avatar_frame.png b/retroshare-gui/src/gui/images/chat/show_avatar_frame.png
deleted file mode 100644
index a54a4e74a..000000000
Binary files a/retroshare-gui/src/gui/images/chat/show_avatar_frame.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/deletemail-hover.png b/retroshare-gui/src/gui/images/deletemail-hover.png
deleted file mode 100644
index 87367bcc4..000000000
Binary files a/retroshare-gui/src/gui/images/deletemail-hover.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/folder-draft24-hover.png b/retroshare-gui/src/gui/images/folder-draft24-hover.png
deleted file mode 100644
index ef9b2a19a..000000000
Binary files a/retroshare-gui/src/gui/images/folder-draft24-hover.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/messages_new.png b/retroshare-gui/src/gui/images/messages_new.png
index 2e688f390..c2239d6f2 100644
Binary files a/retroshare-gui/src/gui/images/messages_new.png and b/retroshare-gui/src/gui/images/messages_new.png differ
diff --git a/retroshare-gui/src/gui/images/new-account.png b/retroshare-gui/src/gui/images/new-account.png
deleted file mode 100644
index ef90402f8..000000000
Binary files a/retroshare-gui/src/gui/images/new-account.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/new-contact.png b/retroshare-gui/src/gui/images/new-contact.png
deleted file mode 100644
index 0cb71ca03..000000000
Binary files a/retroshare-gui/src/gui/images/new-contact.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/replymail24-hover.png b/retroshare-gui/src/gui/images/replymail24-hover.png
deleted file mode 100644
index 4b3d3f8f8..000000000
Binary files a/retroshare-gui/src/gui/images/replymail24-hover.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/retro3.png b/retroshare-gui/src/gui/images/retro3.png
deleted file mode 100644
index 5743e098d..000000000
Binary files a/retroshare-gui/src/gui/images/retro3.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/retro4.png b/retroshare-gui/src/gui/images/retro4.png
deleted file mode 100644
index d68db6277..000000000
Binary files a/retroshare-gui/src/gui/images/retro4.png and /dev/null differ