diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp
index 10436c4b4..2fd6ba3cf 100644
--- a/retroshare-gui/src/gui/GenCertDialog.cpp
+++ b/retroshare-gui/src/gui/GenCertDialog.cpp
@@ -96,10 +96,18 @@ void GenCertDialog::grabMouse()
 
 	ui.entropy_bar->setValue(count*100/2048) ;
 
-	if(ui.entropy_bar->value() < 20)
-		ui.genButton->setEnabled(false) ;
-	else
-		ui.genButton->setEnabled(true) ;
+    if(ui.entropy_bar->value() < 20)
+    {
+        ui.genButton2->setEnabled(false) ;
+        ui.genButton2->setIcon(QIcon(":/images/delete.png")) ;
+    ui.genButton2->setToolTip(tr("Currently disabled. Please move your mouse around until you reach at least 20%")) ;
+    }
+    else
+    {
+        ui.genButton2->setEnabled(true) ;
+        ui.genButton2->setIcon(QIcon(":/images/resume.png")) ;
+    ui.genButton2->setToolTip(tr("CLick to create your node and/or identity")) ;
+    }
 
 	RsInit::collectEntropy(E+(F << 16)) ;
 }
@@ -122,7 +130,7 @@ GenCertDialog::GenCertDialog(bool onlyGenerateIdentity, QWidget *parent)
     connect(ui.adv_checkbox, SIGNAL(clicked()), this, SLOT(updateUiSetup()));
     connect(ui.hidden_checkbox, SIGNAL(clicked()), this, SLOT(updateUiSetup()));
 
-	connect(ui.genButton, SIGNAL(clicked()), this, SLOT(genPerson()));
+    connect(ui.genButton2, SIGNAL(clicked()), this, SLOT(genPerson()));
 	connect(ui.importIdentity_PB, SIGNAL(clicked()), this, SLOT(importIdentity()));
 	connect(ui.exportIdentity_PB, SIGNAL(clicked()), this, SLOT(exportIdentity()));
 
@@ -206,7 +214,7 @@ void GenCertDialog::init()
 		ui.no_gpg_key_label->hide();
 		ui.new_gpg_key_checkbox->setChecked(false);
 		setWindowTitle(tr("Create new node"));
-		ui.genButton->setText(tr("Generate new node"));
+        ui.genButton2->setText(tr("Generate new node"));
 		ui.headerFrame->setHeaderText(tr("Create a new node"));
 		genNewGPGKey = false;
 	} else {
@@ -214,7 +222,7 @@ void GenCertDialog::init()
 		ui.new_gpg_key_checkbox->setChecked(true);
 		ui.new_gpg_key_checkbox->setEnabled(true);
 		setWindowTitle(tr("Create new Identity"));
-		ui.genButton->setText(tr("Generate new Identity"));
+        ui.genButton2->setText(tr("Generate new Identity"));
 		ui.headerFrame->setHeaderText(tr("Create a new Identity"));
 		genNewGPGKey = true;
 	}
@@ -260,9 +268,9 @@ void GenCertDialog::newGPGKeyGenUiSetup() {
 		ui.importIdentity_PB->hide() ;
 		ui.exportIdentity_PB->hide();
 		setWindowTitle(tr("Create new identity"));
-		ui.genButton->setText(tr("Generate new identity"));
+        ui.genButton2->setText(tr("Generate new identity and node"));
 		ui.headerFrame->setHeaderText(tr("Create a new identity"));
-		ui.genButton->setVisible(true);
+        ui.genButton2->setVisible(true);
 		ui.genprofileinfo_label->hide();
 		ui.header_label->show();
 		//ui.keylength_label->show();
@@ -283,8 +291,8 @@ void GenCertDialog::newGPGKeyGenUiSetup() {
 		ui.exportIdentity_PB->setVisible(!mOnlyGenerateIdentity);
 		ui.exportIdentity_PB->setEnabled(ui.genPGPuser->count() != 0);
 		setWindowTitle(tr("Create new node"));
-		ui.genButton->setText(tr("Generate new node"));
-		ui.genButton->setVisible(ui.genPGPuser->count() != 0);
+        ui.genButton2->setText(tr("Generate new node"));
+        ui.genButton2->setVisible(ui.genPGPuser->count() != 0);
 		ui.headerFrame->setHeaderText(tr("Create a new node"));
 		ui.genprofileinfo_label->show();
 		ui.header_label->hide();
@@ -459,7 +467,7 @@ void GenCertDialog::genPerson()
 		ui.genPGPuser->hide();
 		ui.node_label->hide();
 		ui.node_input->hide();
-		ui.genButton->hide();
+        ui.genButton2->hide();
 		ui.importIdentity_PB->hide();
 		ui.genprofileinfo_label->hide();
         ui.hidden_checkbox->hide();
diff --git a/retroshare-gui/src/gui/GenCertDialog.ui b/retroshare-gui/src/gui/GenCertDialog.ui
index a319168c5..8d849d4fe 100644
--- a/retroshare-gui/src/gui/GenCertDialog.ui
+++ b/retroshare-gui/src/gui/GenCertDialog.ui
@@ -213,6 +213,28 @@
      </item>
     </layout>
    </item>
+   <item>
+    <widget class="QLabel" name="label_hiddenaddr2">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>30</height>
+      </size>
+     </property>
+     <property name="lineWidth">
+      <number>1</number>
+     </property>
+     <property name="text">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is a TOR Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;/p&gt;&lt;p&gt;In order to get one, you must configure TOR to create a new hidden service. If you do not yet have one, you can still go on, and make it right later in Retroshare's Options-&amp;gt;Server-&amp;gt;TOR configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="scaledContents">
+      <bool>false</bool>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
@@ -437,28 +459,6 @@ anonymous, you can use a fake email.</string>
      </item>
     </layout>
    </item>
-   <item>
-    <widget class="QLabel" name="label_hiddenaddr2">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>30</height>
-      </size>
-     </property>
-     <property name="lineWidth">
-      <number>1</number>
-     </property>
-     <property name="text">
-      <string>This is a TOR Onion address of the form: xa76giaf6ifda7ri63i263.onion and your selected port,  you must first launch TOR and create a new hidden service to generate this address.</string>
-     </property>
-     <property name="scaledContents">
-      <bool>false</bool>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
    <item>
     <widget class="QLabel" name="entropy_label">
      <property name="font">
@@ -482,7 +482,7 @@ anonymous, you can use a fake email.</string>
     </widget>
    </item>
    <item>
-    <widget class="QPushButton" name="genButton">
+    <widget class="QPushButton" name="genButton2">
      <property name="maximumSize">
       <size>
        <width>16777215</width>
@@ -502,22 +502,35 @@ anonymous, you can use a fake email.</string>
      <property name="text">
       <string>Create new identity</string>
      </property>
+     <property name="icon">
+      <iconset resource="images.qrc">
+       <normaloff>:/images/resume.png</normaloff>:/images/resume.png</iconset>
+     </property>
     </widget>
    </item>
+   <item>
+    <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>
-  <zorder>headerFrame</zorder>
+  <zorder>genButton2</zorder>
   <zorder>header_label</zorder>
-  <zorder>genButton</zorder>
-  <zorder>header_label</zorder>
-  <zorder>layoutWidget</zorder>
-  <zorder>layoutWidget_2</zorder>
   <zorder>genprofileinfo_label</zorder>
   <zorder>entropy_bar</zorder>
-  <zorder>label_hiddenaddr2</zorder>
   <zorder>entropy_label</zorder>
-  <zorder>layoutWidget_3</zorder>
   <zorder>headerFrame</zorder>
   <zorder>no_gpg_key_label</zorder>
+  <zorder>verticalSpacer</zorder>
+  <zorder>label_hiddenaddr2</zorder>
  </widget>
  <customwidgets>
   <customwidget>