diff --git a/src/quo2/components/icons/icons.cljs b/src/quo2/components/icons/icons.cljs
index 943482b439..5f49cff15f 100644
--- a/src/quo2/components/icons/icons.cljs
+++ b/src/quo2/components/icons/icons.cljs
@@ -7,7 +7,6 @@
 (defn icon-source [icon]
   (if-let [icon (get icons (name icon))]
     icon
-    #(do
-       (log/error "could not find source for " icon " icon")
-       nil)))
-
+    (do
+      (log/error "could not find source for " icon " icon")
+      nil)))
diff --git a/src/quo2/screens/drawers/action_drawers.cljs b/src/quo2/screens/drawers/action_drawers.cljs
index 723ede7074..8c7d19a397 100644
--- a/src/quo2/screens/drawers/action_drawers.cljs
+++ b/src/quo2/screens/drawers/action_drawers.cljs
@@ -27,7 +27,7 @@
                                   :label      (if (:muted? @state) "Unmute channel" "Mute channel")
                                   :right-icon :main-icons2/chevron-right
                                   :sub-label  (when (:muted? @state) "Muted for 15 min")}
-                                 {:icon       :main-icons2/scanner
+                                 {:icon       :main-icons2/scan
                                   :right-icon :main-icons2/chevron-right
                                   :label      "Fetch messages"}
                                  {:icon  :main-icons2/add-user
diff --git a/src/status_im/ui/components/topnav.cljs b/src/status_im/ui/components/topnav.cljs
index 85c3d452db..c1e6f69c1d 100644
--- a/src/status_im/ui/components/topnav.cljs
+++ b/src/status_im/ui/components/topnav.cljs
@@ -18,7 +18,7 @@
     :on-press #(re-frame/dispatch [::qr-scanner/scan-code
                                    {:title   (i18n/label :t/add-bootnode)
                                     :handler :bootnodes.callback/qr-code-scanned}])}
-   :main-icons2/scanner])
+   :main-icons2/scan])
 
 (defn qr-code []
   [quo2.button/button
diff --git a/src/status_im/ui/screens/communities/communities_list_redesign.cljs b/src/status_im/ui/screens/communities/communities_list_redesign.cljs
index 4d1c6708f5..6b876cdd1b 100644
--- a/src/status_im/ui/screens/communities/communities_list_redesign.cljs
+++ b/src/status_im/ui/screens/communities/communities_list_redesign.cljs
@@ -94,7 +94,7 @@
        :size     32
        :style    {:margin-right 12}
        :on-press #(re-frame/dispatch [:bottom-sheet/show-sheet :sort-communities {}])}
-      :main-icons2/lightning]
+      :main-icons2/flash]
      [quo2.button/button
       {:icon     true
        :type     :outline
diff --git a/src/status_im/ui/screens/communities/sort_communities.cljs b/src/status_im/ui/screens/communities/sort_communities.cljs
index f7e8f3b166..cf2d8aebc7 100644
--- a/src/status_im/ui/screens/communities/sort_communities.cljs
+++ b/src/status_im/ui/screens/communities/sort_communities.cljs
@@ -39,7 +39,7 @@
     {:theme               (theme/get-theme)
      :title               (i18n/label :t/active-members)
      :accessibility-label :active-members
-     :icon                :main-icons2/lightning
+     :icon                :main-icons2/flash
      :new-ui?             true}]
    [quo/list-item
     {:theme               (theme/get-theme)