diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
index 16991b72f..a6ea59313 100644
--- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
@@ -19,6 +19,7 @@
  *******************************************************************************/
 
 #include <QMessageBox>
+#include <QPushButton>
 
 #include "util/misc.h"
 #include "util/DateTime.h"
@@ -105,7 +106,6 @@ void GxsGroupDialog::init()
 
 
 	connect(ui.groupLogo, SIGNAL(clicked() ), this , SLOT(addGroupLogo()));
-	connect(ui.addLogoButton, SIGNAL(clicked() ), this , SLOT(addGroupLogo()));
 
 	ui.typePublic->setChecked(true);
 	ui.distributionValueLabel->setText(tr("Public"));
@@ -377,7 +377,6 @@ void GxsGroupDialog::setupVisibility()
 	ui.groupName->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_NAME);
 
 	ui.groupLogo->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_ICON);
-	ui.addLogoButton->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_ICON);
 
 	ui.groupDesc->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_DESCRIPTION);
 
@@ -418,8 +417,6 @@ void GxsGroupDialog::setAllReadonly()
 void GxsGroupDialog::setupReadonly()
 {
 
-	ui.addLogoButton->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_ICON));
-
 	ui.publishGroupBox->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_PUBLISHSIGN));
 
 	ui.pubKeyShare_cb->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_SHAREKEYS));
diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui
index 00e49d8b3..9cf6f89ea 100644
--- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui
+++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui
@@ -77,6 +77,9 @@
           </property>
           <item>
            <layout class="QGridLayout" name="gridLayout_4">
+            <property name="topMargin">
+             <number>3</number>
+            </property>
             <property name="horizontalSpacing">
              <number>6</number>
             </property>
@@ -84,7 +87,7 @@
              <number>0</number>
             </property>
             <item row="0" column="0" rowspan="2">
-             <widget class="QLabel" name="groupLogo">
+             <widget class="ClickableLabel" name="groupLogo">
               <property name="minimumSize">
                <size>
                 <width>64</width>
@@ -97,6 +100,9 @@
                 <height>64</height>
                </size>
               </property>
+              <property name="toolTip">
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click to add a Logo&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              </property>
               <property name="frameShape">
                <enum>QFrame::StyledPanel</enum>
               </property>
@@ -104,33 +110,13 @@
                <enum>QFrame::Raised</enum>
               </property>
               <property name="pixmap">
-               <pixmap resource="../images.qrc">:/images/channels.png</pixmap>
+               <pixmap resource="../icons.qrc">:/icons/png/add-image.png</pixmap>
               </property>
               <property name="scaledContents">
                <bool>true</bool>
               </property>
              </widget>
             </item>
-            <item row="0" column="1">
-             <layout class="QHBoxLayout" name="horizontalLayout">
-              <property name="spacing">
-               <number>6</number>
-              </property>
-              <property name="leftMargin">
-               <number>6</number>
-              </property>
-              <item>
-               <widget class="QLabel" name="label">
-                <property name="text">
-                 <string>Name</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QLineEdit" name="groupName"/>
-              </item>
-             </layout>
-            </item>
             <item row="1" column="1">
              <layout class="QHBoxLayout" name="horizontalLayout_2">
               <property name="spacing">
@@ -148,17 +134,6 @@
               <property name="bottomMargin">
                <number>3</number>
               </property>
-              <item>
-               <widget class="QPushButton" name="addLogoButton">
-                <property name="text">
-                 <string>Add Icon</string>
-                </property>
-                <property name="icon">
-                 <iconset resource="../images.qrc">
-                  <normaloff>:/images/add_image24.png</normaloff>:/images/add_image24.png</iconset>
-                </property>
-               </widget>
-              </item>
               <item>
                <spacer name="horizontalSpacer_2">
                 <property name="orientation">
@@ -211,6 +186,26 @@
               </item>
              </layout>
             </item>
+            <item row="0" column="1">
+             <layout class="QHBoxLayout" name="horizontalLayout">
+              <property name="spacing">
+               <number>6</number>
+              </property>
+              <property name="leftMargin">
+               <number>6</number>
+              </property>
+              <item>
+               <widget class="QLabel" name="label">
+                <property name="text">
+                 <string>Name</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLineEdit" name="groupName"/>
+              </item>
+             </layout>
+            </item>
            </layout>
           </item>
          </layout>
@@ -894,6 +889,11 @@
    <extends>QComboBox</extends>
    <header>gui/common/GroupChooser.h</header>
   </customwidget>
+  <customwidget>
+   <class>ClickableLabel</class>
+   <extends>QLabel</extends>
+   <header>util/ClickableLabel.h</header>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="../icons.qrc"/>
diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
index 3e9a063cf..794c2aa8a 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
@@ -813,6 +813,11 @@ GxsChannelPostsWidget QToolButton#subscribeToolButton::menu-button {
 
 }
 
+GxsGroupDialog QLabel#groupLogo{
+	border: 2px solid #CCCCCC;
+	border-radius: 3px;
+}
+
 PostedItem QFrame#frame_notes {
 	background: white;
 }
@@ -880,12 +885,12 @@ PostedCreatePostDialog QPushButton#submitButton {
 	border-radius: 4px;
 	max-height: 27px;
 	min-width: 4em;
-    padding: 2px;
+	padding: 2px;
 }
 
 PostedCreatePostDialog QPushButton#submitButton:hover {
 	background: #03b1f3;
 	border-radius: 4px;
 	min-width: 4em;
-    padding: 2px;
-}
\ No newline at end of file
+	padding: 2px;
+}