diff --git a/src/commoncomponents/PhotoboothView.qml b/src/commoncomponents/PhotoboothView.qml
index 42d5b681..c1bbf72b 100644
--- a/src/commoncomponents/PhotoboothView.qml
+++ b/src/commoncomponents/PhotoboothView.qml
@@ -16,6 +16,10 @@ ColumnLayout {
 
     property int boothWidth: 224
 
+    readonly property int size: boothWidth +
+                                buttonsRowLayout.height +
+                                JamiTheme.preferredMarginSize / 2
+
     signal imageAcquired
     signal imageCleared
 
@@ -49,6 +53,8 @@ ColumnLayout {
         }
     }
 
+    spacing: 0
+
     JamiFileDialog{
         id: importFromFileToAvatar_Dialog
 
diff --git a/src/wizardview/components/ProfilePage.qml b/src/wizardview/components/ProfilePage.qml
index 98f52c0c..780964ee 100644
--- a/src/wizardview/components/ProfilePage.qml
+++ b/src/wizardview/components/ProfilePage.qml
@@ -87,8 +87,8 @@ Rectangle {
             id: setAvatarWidget
 
             Layout.alignment: Qt.AlignCenter
-            Layout.preferredWidth: JamiTheme.preferredFieldHeight + boothWidth
-            Layout.preferredHeight: JamiTheme.preferredFieldHeight + boothWidth
+            Layout.preferredWidth: size
+            Layout.preferredHeight: size
 
             boothWidth: 200
         }