diff --git a/src/quo2/components/avatars/group_avatar/view.cljs b/src/quo2/components/avatars/group_avatar/view.cljs
index 0b15ea3121..10eb20e59d 100644
--- a/src/quo2/components/avatars/group_avatar/view.cljs
+++ b/src/quo2/components/avatars/group_avatar/view.cljs
@@ -34,7 +34,7 @@
           {:source picture
            :style  {:width  container-size
                     :height container-size}}]
-         [icon/icon :i/group
+         [icon/icon :i/members
           {:size  icon-size
            :color colors/white-opa-70}])])))
 
diff --git a/src/status_im2/contexts/quo_preview/avatars/group_avatar.cljs b/src/status_im2/contexts/quo_preview/avatars/group_avatar.cljs
index 83027403b6..ceca4fc31f 100644
--- a/src/status_im2/contexts/quo_preview/avatars/group_avatar.cljs
+++ b/src/status_im2/contexts/quo_preview/avatars/group_avatar.cljs
@@ -43,9 +43,7 @@
                   :flex-direction   :row
                   :justify-content  :center}}
          (let [{:keys [picture?]} @state
-               params             (cond-> @state
-                                    (picture?)
-                                    (assoc :picture avatar))]
+               params             (if picture? (assoc @state :picture avatar) @state)]
            [quo2/group-avatar params])]]])))
 
 (defn preview-group-avatar