diff --git a/retroshare-gui/src/gui/GenCertDialog.ui b/retroshare-gui/src/gui/GenCertDialog.ui
index 0500f2b99..0c458216f 100644
--- a/retroshare-gui/src/gui/GenCertDialog.ui
+++ b/retroshare-gui/src/gui/GenCertDialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>618</width>
-    <height>641</height>
+    <width>677</width>
+    <height>564</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -32,11 +32,28 @@
        <height>30</height>
       </size>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <widget class="QLabel" name="label">
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="0" column="0">
+       <widget class="QLabel" name="header_label">
         <property name="font">
          <font>
+          <family>Tahoma</family>
+          <pointsize>11</pointsize>
+         </font>
+        </property>
+        <property name="text">
+         <string>RetroShare uses PGP keys for identity management.</string>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="genprofileinfo_label">
+        <property name="font">
+         <font>
+          <family>Tahoma</family>
           <pointsize>11</pointsize>
          </font>
         </property>
@@ -48,7 +65,7 @@
         </property>
        </widget>
       </item>
-      <item>
+      <item row="2" column="0">
        <widget class="QGroupBox" name="groupBox">
         <layout class="QGridLayout" name="gridLayout">
          <item row="0" column="0" colspan="4">
@@ -130,119 +147,135 @@
            </item>
           </layout>
          </item>
-         <item row="2" column="0">
-          <widget class="QLabel" name="genPGPuserlabel">
-           <property name="text">
-            <string>Use identity</string>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="1" colspan="3">
-          <widget class="QComboBox" name="genPGPuser">
-           <property name="toolTip">
-            <string>Your profile is associated with a PGP key. RetroShare currently ignores DSA keys.</string>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="0">
-          <widget class="QLabel" name="name_label">
-           <property name="text">
-            <string>Name</string>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="1" colspan="3">
-          <widget class="QLineEdit" name="name_input">
-           <property name="toolTip">
-            <string>Enter your nickname here</string>
-           </property>
-           <property name="maxLength">
-            <number>64</number>
-           </property>
-          </widget>
-         </item>
-         <item row="4" column="0">
-          <widget class="QLabel" name="email_label">
-           <property name="text">
-            <string>Email</string>
-           </property>
-          </widget>
-         </item>
-         <item row="4" column="1" colspan="3">
-          <widget class="QLineEdit" name="email_input">
-           <property name="toolTip">
-            <string>Be careful: this email will be visible to your friends and friends 
+         <item row="2" column="0" colspan="4">
+          <layout class="QHBoxLayout" name="horizontalLayout">
+           <item>
+            <layout class="QVBoxLayout" name="verticalLayout">
+             <item>
+              <widget class="QLabel" name="genPGPuserlabel">
+               <property name="text">
+                <string>Use identity</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QLabel" name="name_label">
+               <property name="text">
+                <string>Name</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QLabel" name="email_label">
+               <property name="text">
+                <string>Email</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QLabel" name="password_label">
+               <property name="toolTip">
+                <string>This Password is for PGP</string>
+               </property>
+               <property name="text">
+                <string>Password</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QLabel" name="password_label_2">
+               <property name="toolTip">
+                <string>This Password is for PGP</string>
+               </property>
+               <property name="text">
+                <string>Password (check)</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QLabel" name="location_label">
+               <property name="text">
+                <string>Location</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+           <item>
+            <layout class="QVBoxLayout" name="verticalLayout_2">
+             <item>
+              <widget class="QComboBox" name="genPGPuser">
+               <property name="toolTip">
+                <string>Your profile is associated with a PGP key. RetroShare currently ignores DSA keys.</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QLineEdit" name="name_input">
+               <property name="toolTip">
+                <string>Enter your nickname here</string>
+               </property>
+               <property name="maxLength">
+                <number>64</number>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QLineEdit" name="email_input">
+               <property name="toolTip">
+                <string>Be careful: this email will be visible to your friends and friends 
 of your friends. This information is required by PGP, but to stay 
 anonymous, you can use a fake email.</string>
-           </property>
-           <property name="maxLength">
-            <number>64</number>
-           </property>
-          </widget>
+               </property>
+               <property name="maxLength">
+                <number>64</number>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QLineEdit" name="password_input">
+               <property name="toolTip">
+                <string>Put a strong password here. This password protects your PGP key.</string>
+               </property>
+               <property name="inputMask">
+                <string/>
+               </property>
+               <property name="maxLength">
+                <number>1024</number>
+               </property>
+               <property name="echoMode">
+                <enum>QLineEdit::Password</enum>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QLineEdit" name="password_input_2">
+               <property name="toolTip">
+                <string>Put a strong password here. This password protects your PGP key.</string>
+               </property>
+               <property name="inputMask">
+                <string/>
+               </property>
+               <property name="maxLength">
+                <number>1024</number>
+               </property>
+               <property name="echoMode">
+                <enum>QLineEdit::Password</enum>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QLineEdit" name="location_input">
+               <property name="maxLength">
+                <number>64</number>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+          </layout>
          </item>
-         <item row="5" column="0">
-          <widget class="QLabel" name="password_label">
-           <property name="toolTip">
-            <string>This Password is for PGP</string>
-           </property>
-           <property name="text">
-            <string>Password</string>
-           </property>
-          </widget>
-         </item>
-         <item row="5" column="1" colspan="3">
-          <widget class="QLineEdit" name="password_input">
-           <property name="toolTip">
-            <string>Put a strong password here. This password protects your PGP key.</string>
-           </property>
-           <property name="inputMask">
-            <string/>
-           </property>
-           <property name="maxLength">
-            <number>1024</number>
-           </property>
-           <property name="echoMode">
-            <enum>QLineEdit::Password</enum>
-           </property>
-          </widget>
-         </item>
-         <item row="6" column="0">
-          <widget class="QLabel" name="location_label">
-           <property name="text">
-            <string>Location</string>
-           </property>
-          </widget>
-         </item>
-         <item row="6" column="1" colspan="3">
-          <widget class="QLineEdit" name="location_input">
-           <property name="maxLength">
-            <number>64</number>
-           </property>
-          </widget>
-         </item>
-         <item row="7" column="1" colspan="3">
-          <widget class="QLabel" name="label_location2">
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>30</height>
-            </size>
-           </property>
-           <property name="lineWidth">
-            <number>1</number>
-           </property>
-           <property name="text">
-            <string>Put a meaningful location. ex : home, laptop, etc. This field will be used to differentiate different installations with the same identity (PGP key).</string>
-           </property>
-           <property name="scaledContents">
-            <bool>false</bool>
-           </property>
-           <property name="wordWrap">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item row="8" column="0" colspan="4">
+         <item row="3" column="0" colspan="4">
           <widget class="QCheckBox" name="hidden_checkbox">
            <property name="maximumSize">
             <size>
@@ -271,28 +304,28 @@ anonymous, you can use a fake email.</string>
            </property>
           </widget>
          </item>
-         <item row="9" column="0">
+         <item row="4" column="0">
           <widget class="QLabel" name="hiddenaddr_label">
            <property name="text">
             <string>Tor Address</string>
            </property>
           </widget>
          </item>
-         <item row="9" column="1">
+         <item row="4" column="1">
           <widget class="QLineEdit" name="hiddenaddr_input">
            <property name="maxLength">
             <number>64</number>
            </property>
           </widget>
          </item>
-         <item row="9" column="2">
+         <item row="4" column="2">
           <widget class="QLabel" name="hiddenport_label">
            <property name="text">
             <string>Port</string>
            </property>
           </widget>
          </item>
-         <item row="9" column="3">
+         <item row="4" column="3">
           <widget class="QSpinBox" name="hiddenport_spinBox">
            <property name="minimum">
             <number>1</number>
@@ -305,7 +338,7 @@ anonymous, you can use a fake email.</string>
            </property>
           </widget>
          </item>
-         <item row="10" column="1" colspan="3">
+         <item row="5" column="0" colspan="4">
           <widget class="QLabel" name="label_hiddenaddr2">
            <property name="minimumSize">
             <size>
@@ -327,7 +360,24 @@ anonymous, you can use a fake email.</string>
            </property>
           </widget>
          </item>
-         <item row="11" column="1" colspan="3">
+         <item row="6" column="0" colspan="4">
+          <widget class="QLabel" name="entropy_label">
+           <property name="text">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Before proceeding, move your mouse around to help Retroshare collect as much randomness as possible. Filling the progressbar to 20% is needed, 100% is advised.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="wordWrap">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="7" column="0" colspan="4">
+          <widget class="QProgressBar" name="entropy_bar">
+           <property name="value">
+            <number>24</number>
+           </property>
+          </widget>
+         </item>
+         <item row="8" column="0" colspan="4">
           <widget class="QPushButton" name="genButton">
            <property name="maximumSize">
             <size>
@@ -335,41 +385,44 @@ anonymous, you can use a fake email.</string>
              <height>26</height>
             </size>
            </property>
+           <property name="font">
+            <font>
+             <family>Arial</family>
+             <weight>50</weight>
+             <bold>false</bold>
+            </font>
+           </property>
+           <property name="styleSheet">
+            <string notr="true"/>
+           </property>
            <property name="text">
             <string>Create new identity</string>
            </property>
-           <property name="icon">
-            <iconset resource="images.qrc">
-             <normaloff>:/images/contact_new.png</normaloff>:/images/contact_new.png</iconset>
-           </property>
           </widget>
          </item>
-         <item row="12" column="1">
-          <spacer name="verticalSpacer">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>1</width>
-             <height>1</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
         </layout>
        </widget>
       </item>
+      <item row="3" column="0">
+       <spacer name="verticalSpacer">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      </layout>
     </widget>
    </item>
    <item row="0" column="0">
-    <widget class="QFrame" name="headerFrame">
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>140</height>
-      </size>
+    <widget class="HeaderFrame" name="headerFrame">
+     <property name="styleSheet">
+      <string notr="true"/>
      </property>
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
@@ -377,71 +430,22 @@ anonymous, you can use a fake email.</string>
      <property name="frameShadow">
       <enum>QFrame::Plain</enum>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_3">
-      <property name="topMargin">
-       <number>3</number>
-      </property>
-      <property name="bottomMargin">
-       <number>3</number>
-      </property>
-      <item>
-       <widget class="QLabel" name="headerImage">
-        <property name="minimumSize">
-         <size>
-          <width>128</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>128</width>
-          <height>128</height>
-         </size>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="pixmap">
-         <pixmap resource="images.qrc">:/images/contact_new128.png</pixmap>
-        </property>
-        <property name="scaledContents">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <layout class="QVBoxLayout" name="headerLayout">
-        <item>
-         <widget class="QLabel" name="headerLabel">
-          <property name="font">
-           <font>
-            <pointsize>16</pointsize>
-           </font>
-          </property>
-          <property name="text">
-           <string>Create a new Identity</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="headerLabel2">
-          <property name="text">
-           <string>RetroShare uses PGP keys for identity management.</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
     </widget>
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>HeaderFrame</class>
+   <extends>QFrame</extends>
+   <header>gui/common/HeaderFrame.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
  <tabstops>
   <tabstop>genPGPuser</tabstop>
   <tabstop>name_input</tabstop>
   <tabstop>email_input</tabstop>
-  <tabstop>password_input</tabstop>
   <tabstop>location_input</tabstop>
  </tabstops>
  <resources>