diff --git a/libretroshare/src/util/rsversion.cc b/libretroshare/src/util/rsversion.cc
index b890ff852..a0e96cb6d 100644
--- a/libretroshare/src/util/rsversion.cc
+++ b/libretroshare/src/util/rsversion.cc
@@ -7,7 +7,7 @@
#include "rsversion.h"
-#define LIB_VERSION "0.5.5c"
+#define LIB_VERSION "0.6.x"
std::string RsUtil::retroshareVersion()
{
diff --git a/libretroshare/src/util/rsversion.h b/libretroshare/src/util/rsversion.h
index 422ab729c..f60bc7ea6 100644
--- a/libretroshare/src/util/rsversion.h
+++ b/libretroshare/src/util/rsversion.h
@@ -11,8 +11,8 @@
// These versioning parameters are in the header because plugin versioning requires it.
// Please use the functions below, and don't refer directly to the #defines.
-#define SVN_REVISION "Revision 7062"
-#define SVN_REVISION_NUMBER 7062
+#define SVN_REVISION "Revision 7106"
+#define SVN_REVISION_NUMBER 7106
namespace RsUtil {
diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp
index 6e99be1e5..bf40d950a 100644
--- a/retroshare-gui/src/gui/Identity/IdDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp
@@ -114,7 +114,7 @@ IdDialog::IdDialog(QWidget *parent)
connect(ui.toolButton_NewId, SIGNAL(clicked()), this, SLOT(addIdentity()));
connect(ui.todoPushButton, SIGNAL(clicked()), this, SLOT(todo()));
connect(ui.toolButton_EditId, SIGNAL(clicked()), this, SLOT(editIdentity()));
- connect( ui.treeWidget_IdList, SIGNAL(itemSelectionChanged()), this, SLOT(updateSelection()));
+ connect(ui.treeWidget_IdList, SIGNAL(itemSelectionChanged()), this, SLOT(updateSelection()));
connect(ui.filterComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(filterComboBoxChanged()));
connect(ui.filterLineEdit, SIGNAL(textChanged(QString)), this, SLOT(filterChanged(QString)));
diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
index 2f0604615..bdff39f86 100644
--- a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
@@ -140,6 +140,8 @@ void IdEditDialog::updateIdType(bool pseudo)
void IdEditDialog::setupExistingId(std::string keyId)
{
setWindowTitle(tr("Edit identity"));
+ ui.headerFrame->setHeaderImage(QPixmap(":/images/identity/user-properties_64.png"));
+ ui.headerFrame->setHeaderText(tr("Edit identity"));
mIsNew = false;
diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.ui b/retroshare-gui/src/gui/Identity/IdEditDialog.ui
index d7d060ea8..ac166dea9 100644
--- a/retroshare-gui/src/gui/Identity/IdEditDialog.ui
+++ b/retroshare-gui/src/gui/Identity/IdEditDialog.ui
@@ -7,10 +7,16 @@
0
0
510
- 595
+ 462
+
+ 0
+
+
+ 0
+
-
-
+
+
+ 0
+ 0
+
+
QFrame::StyledPanel
@@ -114,6 +126,19 @@
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
@@ -126,119 +151,137 @@
QFrame::Raised
- -
+
-
TextLabel
- -
+
-
RM
- -
+
-
TextLabel
- -
+
-
RM
- -
+
-
TextLabel
- -
+
-
RM
- -
+
-
TextLabel
- -
+
-
RM
- -
+
-
TextLabel
- -
+
-
RM
- -
+
-
- -
+
-
TextLabel
- -
+
-
Add
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
-
-
-
-
-
-
- Qt::Horizontal
-
-
-
- 328
- 20
-
-
-
-
- -
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
-
+
+
+
+ 6
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 328
+ 20
+
+
+
+
+ -
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
+
+
+
diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index 58fd31250..31c0eb74e 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -546,6 +546,7 @@
images/identity/list-add-user_64.png
images/identity/list-remove-user_32.png
images/identity/user-properties_32.png
+ images/identity/user-properties_64.png
qss/chat/standard/private/info.xml
qss/chat/standard/private/incoming.htm
qss/chat/standard/private/outgoing.htm
diff --git a/retroshare-gui/src/gui/images/identity/user-properties_128.png b/retroshare-gui/src/gui/images/identity/user-properties_128.png
new file mode 100644
index 000000000..21e44c859
Binary files /dev/null and b/retroshare-gui/src/gui/images/identity/user-properties_128.png differ
diff --git a/retroshare-gui/src/gui/images/identity/user-properties_64.png b/retroshare-gui/src/gui/images/identity/user-properties_64.png
new file mode 100644
index 000000000..672b7da0b
Binary files /dev/null and b/retroshare-gui/src/gui/images/identity/user-properties_64.png differ
diff --git a/retroshare-gui/src/util/rsguiversion.h b/retroshare-gui/src/util/rsguiversion.h
index 252f212ea..4a0b5c961 100644
--- a/retroshare-gui/src/util/rsguiversion.h
+++ b/retroshare-gui/src/util/rsguiversion.h
@@ -24,8 +24,8 @@
QString retroshareVersion();
QString retroshareRevision();
-#define GUI_VERSION "0.5.5c"
-#define GUI_REVISION "Revision: 7062"
+#define GUI_VERSION "0.6.x"
+#define GUI_REVISION "Revision: 7106"
diff --git a/retroshare-gui/src/util/rsguiversion.in b/retroshare-gui/src/util/rsguiversion.in
index 22f8d6cfb..c1da2ea14 100644
--- a/retroshare-gui/src/util/rsguiversion.in
+++ b/retroshare-gui/src/util/rsguiversion.in
@@ -24,7 +24,7 @@
QString retroshareVersion();
QString retroshareRevision();
-#define GUI_VERSION "0.5.5c"
+#define GUI_VERSION "0.6.x"
#define GUI_REVISION "Revision: $WCREV$"