diff --git a/src/commoncomponents/PhotoboothView.qml b/src/commoncomponents/PhotoboothView.qml
index b8edc565eca1435f8199337023a77e9004f97bc1..4ff0e989bcd1f903c701112f74320ef84019b9a6 100644
--- a/src/commoncomponents/PhotoboothView.qml
+++ b/src/commoncomponents/PhotoboothView.qml
@@ -141,7 +141,9 @@ ColumnLayout {
             AvatarImage {
                 id: avatarImg
 
-                anchors.fill: parent
+                anchors.centerIn: avatarLabelBackground
+                width: avatarLabelBackground.width + avatarImg.spinningAnimationWidth
+                height: avatarLabelBackground.height + avatarImg.spinningAnimationWidth
 
                 showPresenceIndicator: false
 
diff --git a/src/previewrenderer.cpp b/src/previewrenderer.cpp
index c76ce79c2899efdb52eb82d2634c28f9d808123b..7235c923c84d2c5663de7e0da9e966686a3b38f3 100644
--- a/src/previewrenderer.cpp
+++ b/src/previewrenderer.cpp
@@ -137,9 +137,8 @@ QString
 PhotoboothPreviewRender::takePhoto(int size)
 {
     if (auto previewImage = lrcInstance_->renderer()->getPreviewFrame()) {
-        return Utils::byteArrayToBase64String(Utils::QImageToByteArray(
-            previewImage->copy()
-                .scaled(size, size, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation)));
+        return Utils::byteArrayToBase64String(
+            Utils::QImageToByteArray(Utils::getCirclePhoto(previewImage->copy(), size)));
     }
     return {};
 }