diff --git a/retroshare-gui/src/gui/FriendsDialog.cpp b/retroshare-gui/src/gui/FriendsDialog.cpp
index 25d654da8..ae50d0d5c 100644
--- a/retroshare-gui/src/gui/FriendsDialog.cpp
+++ b/retroshare-gui/src/gui/FriendsDialog.cpp
@@ -54,12 +54,16 @@
 #include "FriendsDialog.h"
 #include "NetworkView.h"
 #include "NetworkDialog.h"
+#include "gui/Identity/IdDialog.h"
+#include "gui/Circles/CirclesDialog.h"
 
 /* Images for Newsfeed icons */
 #define IMAGE_NEWSFEED           ""
 #define IMAGE_NEWSFEED_NEW       ":/images/message-state-new.png"
-#define IMAGE_NETWORK2          ":/images/rs1.png"
+#define IMAGE_NETWORK2          ":/images/logo/logo_16.png"
 #define IMAGE_PEERS         	":/images/groupchat.png"
+#define IMAGE_IDENTITY          ":/images/identity/identities_32.png"
+#define IMAGE_CIRCLES           ":/images/circles/circles_32.png"
 
 /******
  * #define FRIENDS_DEBUG 1
@@ -91,6 +95,8 @@ FriendsDialog::FriendsDialog(QWidget *parent)
     ui.avatar->setOwnId();
 
     ui.tabWidget->setTabPosition(QTabWidget::North);
+    ui.tabWidget->addTab(idDialog = new IdDialog(),QIcon(IMAGE_IDENTITY), tr("Identities"));
+    ui.tabWidget->addTab(circlesDialog = new CirclesDialog(),QIcon(IMAGE_CIRCLES), tr("Circles"));
     ui.tabWidget->addTab(networkView = new NetworkView(),QIcon(IMAGE_NETWORK2), tr("Local network"));
     ui.tabWidget->addTab(networkDialog = new NetworkDialog(),QIcon(IMAGE_PEERS), tr("Keyring"));
 
@@ -103,6 +109,7 @@ FriendsDialog::FriendsDialog(QWidget *parent)
     ui.tabWidget->hideCloseButton(1);
     ui.tabWidget->hideCloseButton(2);
     ui.tabWidget->hideCloseButton(3);
+    ui.tabWidget->hideCloseButton(4);
 
     /* get the current text and text color of the tab bar */
     //newsFeedTabColor = ui.tabWidget->tabBar()->tabTextColor(newsFeedTabIndex);
@@ -251,6 +258,10 @@ void FriendsDialog::activatePage(FriendsDialog::Page page)
 {
 	switch(page)
 	{
+		case FriendsDialog::IdTab: ui.tabWidget->setCurrentWidget(idDialog) ;
+											  break ;
+		case FriendsDialog::CirclesTab: ui.tabWidget->setCurrentWidget(circlesDialog) ;
+											  break ;
 		case FriendsDialog::NetworkTab: ui.tabWidget->setCurrentWidget(networkDialog) ;
 											  break ;
 		case FriendsDialog::BroadcastTab: ui.tabWidget->setCurrentWidget(networkDialog) ;
diff --git a/retroshare-gui/src/gui/FriendsDialog.h b/retroshare-gui/src/gui/FriendsDialog.h
index ffa198b35..aa2360bf8 100644
--- a/retroshare-gui/src/gui/FriendsDialog.h
+++ b/retroshare-gui/src/gui/FriendsDialog.h
@@ -34,6 +34,8 @@ class QTextCharFormat;
 class ChatTabWidget;
 class NetworkDialog;
 class NetworkView;
+class IdDialog;
+class CirclesDialog;
 
 class FriendsDialog : public RsAutoUpdatePage
 {
@@ -42,9 +44,12 @@ class FriendsDialog : public RsAutoUpdatePage
 public:
 		 enum Page {
 						 /* Fixed numbers for load and save the last page */
-			 				NetworkTab         = 0,  /** Network page. */
-							NetworkViewTab     = 1,  /** Network new graph. */
-							BroadcastTab       = 2   /** Old group chat page. */
+			 				IdTab              = 0,  /** Identities page. */
+							CirclesTab         = 1,  /** Circles page. */
+							NetworkTab         = 2,  /** Network page. */
+							NetworkViewTab     = 3,  /** Network new graph. */
+							BroadcastTab       = 4   /** Old group chat page. */
+							
 		 };
 
     /** Default Constructor */
@@ -63,6 +68,10 @@ public:
 
 	 NetworkDialog *networkDialog ;
 	 NetworkView *networkView ;
+	 
+	 CirclesDialog *circlesDialog;
+	 IdDialog *idDialog;
+	 
 public slots:
 
     void publicChatChanged(int type);
diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 49a9b6328..40dcce5d6 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -252,13 +252,13 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags)
     ui->stackPages->add(peopleDialog = new PeopleDialog(ui->stackPages), action = createPageAction(QIcon(IMAGE_IDENTITY), tr("People"), grp));
     notify.push_back(QPair<MainPage*, QAction*>(peopleDialog, action));
 
-	 IdDialog *idDialog = NULL;
+	 /*IdDialog *idDialog = NULL;
     ui->stackPages->add(idDialog = new IdDialog(ui->stackPages), action = createPageAction(QIcon(IMAGE_IDENTITY), tr("Itentities"), grp));
     notify.push_back(QPair<MainPage*, QAction*>(idDialog, action));
 
     CirclesDialog *circlesDialog = NULL;
     ui->stackPages->add(circlesDialog = new CirclesDialog(ui->stackPages), createPageAction(QIcon(IMAGE_CIRCLES ), tr("Circles"), grp));
-    notify.push_back(QPair<MainPage*, QAction*>(circlesDialog, action));
+    notify.push_back(QPair<MainPage*, QAction*>(circlesDialog, action));*/
 
     ui->stackPages->add(transfersDialog = new TransfersDialog(ui->stackPages),
                       action = createPageAction(QIcon(IMAGE_TRANSFERS), tr("File sharing"), grp));