diff --git a/src/quo2/components/tags/context_tag/view.cljs b/src/quo2/components/tags/context_tag/view.cljs
index 4628cfc8e5..54c5c1c4a7 100644
--- a/src/quo2/components/tags/context_tag/view.cljs
+++ b/src/quo2/components/tags/context_tag/view.cljs
@@ -44,7 +44,7 @@
   (let [text-params       {:weight :medium
                            :size   :paragraph-2
                            :style  (assoc text-style :justify-content :center)}
-        empty-photo?      (empty? photo)
+        empty-photo?      (nil? photo)
         avatar-size       :xxs
         avatar-outer-size (get-in user-avatar-style/sizes [avatar-size :outer])]
     [rn/view {:flex-direction :row}
diff --git a/src/status_im2/common/bottom_sheet_screen/style.cljs b/src/status_im2/common/bottom_sheet_screen/style.cljs
index 198640bb1f..8c5d73356b 100644
--- a/src/status_im2/common/bottom_sheet_screen/style.cljs
+++ b/src/status_im2/common/bottom_sheet_screen/style.cljs
@@ -15,10 +15,10 @@
     :right            0}))
 
 (defn main-view
-  [translate-y]
+  [translate-y override-theme]
   (reanimated/apply-animations-to-style
    {:transform [{:translate-y translate-y}]}
-   {:background-color        (colors/theme-colors colors/white colors/neutral-95)
+   {:background-color        (colors/theme-colors colors/white colors/neutral-95 override-theme)
     :border-top-left-radius  20
     :border-top-right-radius 20
     :flex                    1
@@ -36,8 +36,8 @@
    :align-items     :center})
 
 (defn handle
-  []
+  [override-theme]
   {:width            32
    :height           4
    :border-radius    100
-   :background-color (colors/theme-colors colors/neutral-100-opa-30 colors/white-opa-30)})
+   :background-color (colors/theme-colors colors/neutral-100-opa-30 colors/white-opa-30 override-theme)})
diff --git a/src/status_im2/common/bottom_sheet_screen/view.cljs b/src/status_im2/common/bottom_sheet_screen/view.cljs
index bb33ab46bb..f2dc57037a 100644
--- a/src/status_im2/common/bottom_sheet_screen/view.cljs
+++ b/src/status_im2/common/bottom_sheet_screen/view.cljs
@@ -45,8 +45,9 @@
 
 (defn f-view
   [content skip-background?]
-  (let [scroll-enabled (reagent/atom true)
-        curr-scroll    (atom 0)]
+  (let [scroll-enabled           (reagent/atom true)
+        curr-scroll              (atom 0)
+        {:keys [override-theme]} (rf/sub [:get-screen-params])]
     (fn []
       (let [insets           (safe-area/get-insets)
             {:keys [height]} (rn/get-window)
@@ -70,9 +71,9 @@
            [reanimated/view {:style (style/background opacity)}])
          [gesture/gesture-detector
           {:gesture (drag-gesture translate-y opacity scroll-enabled curr-scroll close)}
-          [reanimated/view {:style (style/main-view translate-y)}
+          [reanimated/view {:style (style/main-view translate-y override-theme)}
            [rn/view {:style style/handle-container}
-            [rn/view {:style (style/handle)}]]
+            [rn/view {:style (style/handle override-theme)}]]
            [content
             {:insets         insets
              :close          close
diff --git a/src/status_im2/contexts/syncing/how_to_pair/view.cljs b/src/status_im2/contexts/syncing/how_to_pair/view.cljs
index 52f4daca35..ee3e2493d5 100644
--- a/src/status_im2/contexts/syncing/how_to_pair/view.cljs
+++ b/src/status_im2/contexts/syncing/how_to_pair/view.cljs
@@ -49,7 +49,8 @@
      (i18n/label (:label value))]))
 
 (defn render-item
-  [i item]
+  [i list-item]
+  ^{:key i}
   [rn/view
    {:margin-vertical 6
     :style           style/numbered-list-item}
@@ -60,7 +61,10 @@
      {:size   :label
       :weight :medium
       :style  style/list-icon-text} i]]
-   (map #(render-element %) item)])
+   (map-indexed (fn [idx item]
+                  ^{:key idx}
+                  [render-element item])
+                list-item)])
 
 (defn render-list
   [{:keys [title image list]}]
diff --git a/src/status_im2/contexts/syncing/setup_syncing/view.cljs b/src/status_im2/contexts/syncing/setup_syncing/view.cljs
index 500763d11a..86c611ac69 100644
--- a/src/status_im2/contexts/syncing/setup_syncing/view.cljs
+++ b/src/status_im2/contexts/syncing/setup_syncing/view.cljs
@@ -31,7 +31,8 @@
                               :label               (i18n/label :t/how-to-scan)
                               :icon                :i/info
                               :icon-override-theme :dark
-                              :on-press            #(rf/dispatch [:open-modal :how-to-pair])}]}]])
+                              :on-press            #(rf/dispatch [:open-modal :how-to-pair
+                                                                  {:override-theme :dark}])}]}]])
 
 (defn f-use-interval
   [clock cleanup-clock delay]