diff --git a/src/constant/JamiTheme.qml b/src/constant/JamiTheme.qml
index 335dc8aa98b576381cbea121f6070257cb83b43e..732241cf736f42a5136d5690642e7f6cb99611cb 100644
--- a/src/constant/JamiTheme.qml
+++ b/src/constant/JamiTheme.qml
@@ -268,6 +268,8 @@ Item {
     property real preferredFieldWidth: 256
     property real preferredFieldHeight: 32
     property real preferredMarginSize: 16
+    property real settingsMarginSize: 8
+    property real swarmDetailsPageTopMargin: 64
     property real preferredDialogWidth: 400
     property real preferredDialogHeight: 300
     property real minimumPreviewWidth: 120
diff --git a/src/conversationsadapter.cpp b/src/conversationsadapter.cpp
index 5e87e005b56f80b6c4d57a8cc5def5eba9f73650..a08c82af77224698f1701e4e6bd48ec15cf66a5a 100644
--- a/src/conversationsadapter.cpp
+++ b/src/conversationsadapter.cpp
@@ -570,8 +570,14 @@ ConversationsAdapter::connectConversationModel()
 }
 
 void
-ConversationsAdapter::createSwarm()
+ConversationsAdapter::createSwarm(const QString& title,
+                                  const QString& description,
+                                  const QString& avatar,
+                                  const VectorString& participants)
 {
     auto convModel = lrcInstance_->getCurrentConversationModel();
-    convModel->createConversation({}, "");
+    convModel->createConversation(participants,
+                                  {{"title", title},
+                                   {"description", description},
+                                   {"avatar", avatar}});
 }
\ No newline at end of file
diff --git a/src/conversationsadapter.h b/src/conversationsadapter.h
index d9a7bc5d604977f469ec99597e7d813ddea66ab2..1d7e318fe424c71fd9ee579c6727746260548753 100644
--- a/src/conversationsadapter.h
+++ b/src/conversationsadapter.h
@@ -48,7 +48,10 @@ protected:
 
 public:
     Q_INVOKABLE bool connectConversationModel();
-    Q_INVOKABLE void createSwarm();
+    Q_INVOKABLE void createSwarm(const QString& title,
+                                 const QString& description,
+                                 const QString& avatar,
+                                 const VectorString& participants);
     Q_INVOKABLE void setFilter(const QString& filterString);
     Q_INVOKABLE QVariantMap getConvInfoMap(const QString& convId);
     Q_INVOKABLE void restartConversation(const QString& convId);
diff --git a/src/mainview/components/NewSwarmPage.qml b/src/mainview/components/NewSwarmPage.qml
index 5cb70464af21bcdf9b2740fed39fbb86f000f255..109d9f33b0d707b353a282b941c42dc42b45eb0d 100644
--- a/src/mainview/components/NewSwarmPage.qml
+++ b/src/mainview/components/NewSwarmPage.qml
@@ -40,6 +40,7 @@ Rectangle {
         anchors.centerIn: root
 
         EditableLineEdit {
+            id: title
             Layout.alignment: Qt.AlignCenter
             Layout.topMargin: JamiTheme.preferredMarginSize
 
@@ -55,6 +56,7 @@ Rectangle {
         }
 
         EditableLineEdit {
+            id: description
             Layout.alignment: Qt.AlignCenter
             Layout.topMargin: JamiTheme.preferredMarginSize
 
@@ -81,7 +83,7 @@ Rectangle {
             text: JamiStrings.createTheSwarm
 
             onClicked: {
-                ConversationsAdapter.createSwarm()
+                ConversationsAdapter.createSwarm(title.text, description.text, "", [])
                 createSwarmClicked()
             }
         }
diff --git a/src/mainview/components/SwarmDetailsPanel.qml b/src/mainview/components/SwarmDetailsPanel.qml
index 986a167e5ee60e835c6b2ed495fb6e34aa4f63b2..923f798fb7dcb5a04b39ce73281a2148a13aaeb6 100644
--- a/src/mainview/components/SwarmDetailsPanel.qml
+++ b/src/mainview/components/SwarmDetailsPanel.qml
@@ -82,7 +82,10 @@ Rectangle {
                 Layout.topMargin: JamiTheme.preferredMarginSize
                 Layout.bottomMargin: JamiTheme.preferredMarginSize
 
-                font.pointSize: JamiTheme.titleFontSize
+                font.pointSize: JamiTheme.menuFontSize
+
+                horizontalAlignment: Text.AlignHCenter
+                verticalAlignment: Text.AlignVCenter
 
                 text: CurrentConversation.description
                 placeholderText: JamiStrings.editDescription
@@ -108,8 +111,8 @@ Rectangle {
                     backgroundColor: JamiTheme.buttonTintedBlue
                     hoverColor: JamiTheme.buttonTintedBlue
                     borderWidth: 4
-                    bottomMargin: JamiTheme.preferredMarginSize
-                    fontSize: JamiTheme.titleFontSize
+                    bottomMargin: JamiTheme.settingsMarginSize
+                    fontSize: JamiTheme.menuFontSize
                     underlineContentOnly: true
 
                     down: tabBar.currentIndex === 0
@@ -121,8 +124,8 @@ Rectangle {
                     backgroundColor: JamiTheme.buttonTintedBlue
                     hoverColor: JamiTheme.buttonTintedBlue
                     borderWidth: 4
-                    bottomMargin: JamiTheme.preferredMarginSize
-                    fontSize: JamiTheme.titleFontSize
+                    bottomMargin: JamiTheme.settingsMarginSize
+                    fontSize: JamiTheme.menuFontSize
                     underlineContentOnly: true
 
                     down: true//tabBar.currentIndex === 1
@@ -139,8 +142,8 @@ Rectangle {
                     backgroundColor: JamiTheme.buttonTintedBlue
                     hoverColor: JamiTheme.buttonTintedBlue
                     borderWidth: 4
-                    bottomMargin: JamiTheme.preferredMarginSize
-                    fontSize: JamiTheme.titleFontSize
+                    bottomMargin: JamiTheme.settingsMarginSize
+                    fontSize: JamiTheme.menuFontSize
                     underlineContentOnly: true
 
                     down: tabBar.currentIndex === 2