diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 4f954fc4b..15f81ba47 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -53,7 +53,6 @@
 #include "ChatLobbyWidget.h"
 #include "HelpDialog.h"
 #include "AboutDialog.h"
-#include "QuickStartWizard.h"
 #include "ChannelFeed.h"
 #include "bwgraph/bwgraph.h"
 #include "help/browser/helpbrowser.h"
@@ -1087,12 +1086,6 @@ void MainWindow::showHelpDialog(const QString &topic)
   HelpBrowser::showWindow(topic);
 }
 
-void MainWindow::on_actionQuick_Start_Wizard_activated()
-{
-    QuickStartWizard qstartwizard(this);
-    qstartwizard.exec();
-}
-
 /** Called when the user changes the UI translation. */
 void
 MainWindow::retranslateUi()
diff --git a/retroshare-gui/src/gui/MainWindow.h b/retroshare-gui/src/gui/MainWindow.h
index 8ada1f06f..7c7824dbd 100644
--- a/retroshare-gui/src/gui/MainWindow.h
+++ b/retroshare-gui/src/gui/MainWindow.h
@@ -209,7 +209,6 @@ private slots:
     /** Called when user attempts to quit via quit button*/
     void doQuit();
     
-    void on_actionQuick_Start_Wizard_activated();
     void updateTrayCombine();
 
 private:
diff --git a/retroshare-gui/src/gui/MainWindow.ui b/retroshare-gui/src/gui/MainWindow.ui
index f8806bd70..2c1a60984 100644
--- a/retroshare-gui/src/gui/MainWindow.ui
+++ b/retroshare-gui/src/gui/MainWindow.ui
@@ -53,7 +53,6 @@
    <addaction name="separator"/>
    <addaction name="actionMessenger"/>
    <addaction name="actionAbout"/>
-   <addaction name="actionQuick_Start_Wizard"/>
    <addaction name="actionOptions"/>
    <addaction name="separator"/>
    <addaction name="actionQuit"/>
diff --git a/retroshare-gui/src/gui/settings/GeneralPage.cpp b/retroshare-gui/src/gui/settings/GeneralPage.cpp
index 9e30d0118..19d7741bb 100755
--- a/retroshare-gui/src/gui/settings/GeneralPage.cpp
+++ b/retroshare-gui/src/gui/settings/GeneralPage.cpp
@@ -29,6 +29,7 @@
 #include <util/stringutil.h>
 #include <QSystemTrayIcon>
 #include "rsharesettings.h"
+#include <gui/QuickStartWizard.h>
 
 /** Constructor */
 GeneralPage::GeneralPage(QWidget * parent, Qt::WFlags flags)
@@ -51,12 +52,17 @@ GeneralPage::GeneralPage(QWidget * parent, Qt::WFlags flags)
     ui.enableRetroShareProtocol->setVisible(false);
     ui.adminLabel->setVisible(false);
 #endif
+	 connect(ui.runStartWizard_PB,SIGNAL(clicked()), this,SLOT(runStartWizard())) ;
 }
 
 /** Destructor */
 GeneralPage::~GeneralPage()
 {
 }
+void GeneralPage::runStartWizard()
+{
+    QuickStartWizard(this).exec();
+}
 
 /** Saves the changes on this page */
 bool GeneralPage::save(QString &/*errmsg*/)
diff --git a/retroshare-gui/src/gui/settings/GeneralPage.h b/retroshare-gui/src/gui/settings/GeneralPage.h
index 28826abad..d9d8c0f34 100755
--- a/retroshare-gui/src/gui/settings/GeneralPage.h
+++ b/retroshare-gui/src/gui/settings/GeneralPage.h
@@ -44,6 +44,8 @@ public:
   virtual QPixmap iconPixmap() const { return QPixmap(":/images/kcmsystem24.png") ; }
   virtual QString pageName() const { return tr("General") ; }
 
+  public slots:
+	  void runStartWizard() ;
 private:
   /** Qt Designer generated object */
   Ui::GeneralPage ui;
diff --git a/retroshare-gui/src/gui/settings/GeneralPage.ui b/retroshare-gui/src/gui/settings/GeneralPage.ui
index 134e6f6db..bb4b903b9 100755
--- a/retroshare-gui/src/gui/settings/GeneralPage.ui
+++ b/retroshare-gui/src/gui/settings/GeneralPage.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>411</width>
-    <height>400</height>
+    <width>485</width>
+    <height>465</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -182,18 +182,29 @@
     </widget>
    </item>
    <item>
-    <spacer name="verticalSpacer">
+    <spacer name="verticalSpacer_2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
-       <width>178</width>
-       <height>95</height>
+       <width>20</width>
+       <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
+   <item>
+    <widget class="QPushButton" name="runStartWizard_PB">
+     <property name="text">
+      <string>Launch startup wizard</string>
+     </property>
+     <property name="icon">
+      <iconset resource="../images.qrc">
+       <normaloff>:/images/tools_wizard.png</normaloff>:/images/tools_wizard.png</iconset>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources>