diff --git a/.prettierignore b/.prettierignore
index 63a774714a..2456f95334 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -7,3 +7,4 @@ modules
 result
 target
 component-spec
+/app
diff --git a/Makefile b/Makefile
index d022e203e5..cd282740a7 100644
--- a/Makefile
+++ b/Makefile
@@ -312,6 +312,7 @@ lint: export TARGET := clojure
 lint: export CLJ_LINTER_PRINT_WARNINGS ?= false
 lint: ##@test Run code style checks
 	@sh scripts/lint-re-frame-in-quo-components.sh && \
+	sh scripts/lint-direct-require-component-outside-quo.sh && \
 	clj-kondo --config .clj-kondo/config.edn --cache false --fail-level error --lint src $(if $(filter $(CLJ_LINTER_PRINT_WARNINGS),true),,| grep -v ': warning: ') && \
 	ALL_CLOJURE_FILES=$(call find_all_clojure_files) && \
 	zprint '{:search-config? true}' -sfc $$ALL_CLOJURE_FILES && \
diff --git a/doc/component-tests-overview.md b/doc/component-tests-overview.md
index 016d508778..9635dd6a90 100644
--- a/doc/component-tests-overview.md
+++ b/doc/component-tests-overview.md
@@ -23,7 +23,7 @@ setups and runs the test suite once.
 setups and runs the test suite and watches for code changes will then retrigger the test suite.
 
 ## Writing Tests
-New test files will need their namespace added to either the file "src/quo2/core_spec.cljs" or "src/status_im2/core_spec.cljs. These locations may update overtime but it is dependent on the entrypoint in shadow-cljs config discussed below.
+New test files will need their namespace added to either the file "src/quo/core_spec.cljs" or "src/status_im2/core_spec.cljs. These locations may update overtime but it is dependent on the entrypoint in shadow-cljs config discussed below.
 
 
 ### Best practices
diff --git a/doc/new-guidelines.md b/doc/new-guidelines.md
index c90de39a7c..b61f38eba3 100644
--- a/doc/new-guidelines.md
+++ b/doc/new-guidelines.md
@@ -76,7 +76,7 @@ It's important to name functional components with `f-` prefix.
 
 ### Component props and API scheme to match Figma as closely as possible
 
-Ideally, the prop names for components (particularly in quo2 Design System)
+Ideally, the prop names for components (particularly in quo Design System)
 should match the Figma properties as best as possible. This makes it easier for
 the developer using that component to configure it correctly for the screen it
 is being used on and avoids unnecessary overwrites and adjustments being made.
@@ -134,7 +134,7 @@ For example if Figma has sizes `:small`, `:medium` and `:large`
 
 Prefer to define styles in a separate file named `style.cljs`, colocated with
 the source file. For a real example, see
-[src/quo2/components/record_audio/record_audio/style.cljs](../src/quo2/components/record_audio/record_audio/style.cljs).
+[src/quo/components/record_audio/record_audio/style.cljs](../src/quo/components/record_audio/record_audio/style.cljs).
 
 ```clojure
 ;; bad
@@ -528,27 +528,27 @@ due to performance constraints.
    (:preferred-name multiaccount)))
 ```
 
-### Requiring quo2 components
+### Requiring quo components
 
-Consume `quo2` components from `quo2.core`, unless the namespace is also inside
-the `quo2/` directory.
+Consume `quo` components from `quo.core`, unless the namespace is also inside
+the `quo/` directory.
 
 ```clojure
 ;; bad
 (ns my-namespace
-  (:require [quo2.components.icon :as icon]))
+  (:require [quo.components.icon :as icon]))
 
 (icon/icon :i/verified)
 
 ;; good
 (ns my-namespace
-  (:require [quo2.core :as quo]))
+  (:require [quo.core :as quo]))
 
 (quo/icon :i/verified)
 
-;; also good because both namespaces are inside quo2/
-(ns quo2.components.tabs.account-selector
-  (:require [quo2.components.markdown.text :as text]))
+;; also good because both namespaces are inside quo/
+(ns quo.components.tabs.account-selector
+  (:require [quo.components.markdown.text :as text]))
 ```
 
 ### Require/import
@@ -615,12 +615,12 @@ Use the appropriate keyword qualification/namespace.
 
 ```clojure
 ;; bad
-(require '[quo2.components.icon :as icons])
+(require '[quo.components.icon :as icons])
 (icons/icon :main-icons2/verified)
 
 ;; good
-(require '[quo2.core :as quo2])
-(quo2/icon :i/verified)
+(require '[quo.core :as quo])
+(quo/icon :i/verified)
 ```
 
 ### Translations
@@ -695,7 +695,7 @@ First, the bird's-eye view with some example ClojureScript files:
 src
 ├── js/
 ├── mocks/
-├── quo2
+├── quo
 │   ├── components/
 │   ├── foundations/
 │   └── theme.cljs
@@ -716,7 +716,7 @@ src
 
 - `src/js`: Raw Javascript files, e.g. React Native Reanimated worklets.
 - `src/mocks`: Plumbing configuration to be able to run tests.
-- `src/quo2/`: The component library for Status Mobile.
+- `src/quo/`: The component library for Status Mobile.
 - `src/react_native/`: Contains only low-level constructs to help React Native
   work in tandem with Clojure(Script).
 - `src/status_im2/`: Directory where we try to be as strict as possible about
@@ -728,7 +728,7 @@ src
   of the directory tree. Just like directories named `utils`, their directory
   nesting level communicates their applicable limits.
 - `src/status_im2/common/components/`: Contains reusable components that are not
-  part of the design system (quo2).
+  part of the design system (quo).
 - `src/status_im2/contexts/`: Contains [bounded contexts](#glossary), like
   `browser/`, `messaging/`, etc. As much as possible, _bounded contexts_ should
   not directly require each other's namespaces.
@@ -743,9 +743,9 @@ directory nesting level precisely indicates its boundaries. For example, a
 `contexts/user_settings/utils/datetime.cljs` file communicates that it should
 only be used in the `user_settings` context.
 
-### src/quo2
+### src/quo
 
-The `src/quo2/` directory holds all components for the new design system. As
+The `src/quo/` directory holds all components for the new design system. As
 much as possible, its sub-directories and component names should reflect the
 same language used by designers.
 
@@ -753,14 +753,14 @@ Even though the directory lives alongside the rest of the codebase, we should
 think of it as an external entity that abstracts away particular Status domain
 knowledge.
 
-Components inside `src/quo2/` should not rely on re-frame, i.e. they should not
+Components inside `src/quo/` should not rely on re-frame, i.e. they should not
 dispatch events or use subscriptions.
 
 Example structure:
 
 ```
 src
-└── quo2
+└── quo
     ├── components
     │   └── dropdown
     │       ├── style.cljs
diff --git a/nix/shells.nix b/nix/shells.nix
index a30ec7d013..8f9cd776a6 100644
--- a/nix/shells.nix
+++ b/nix/shells.nix
@@ -21,7 +21,7 @@ let
       buildInputs = with pkgs; [
         clojure flock maven openjdk
         # lint specific utilities
-        clj-kondo zprint clojure-lsp
+        clj-kondo zprint clojure-lsp ripgrep
       ];
       # CLASSPATH from clojure deps with 'src' appended to find local sources.
       shellHook = with pkgs; ''
diff --git a/scripts/lint-direct-require-component-outside-quo.sh b/scripts/lint-direct-require-component-outside-quo.sh
new file mode 100755
index 0000000000..19c52bee71
--- /dev/null
+++ b/scripts/lint-direct-require-component-outside-quo.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# quo components namespace ends with style|utils|types|reaction-resource
+# are not the component view, they are usually utils fns or styles
+
+if rg --pcre2 --glob '!src/quo/**/*' 'quo\.components(\.[\w-]+)*\.[\w-]*(?<!style|utils|types|reaction-resource)(\s|\]|\n)' src; then
+  echo "Found above direct require of quo component outside src/quo/"
+  echo "For more info, check the style guide https://github.com/status-im/status-mobile/blob/develop/doc/new-guidelines.md#requiring-quo-components"
+  exit 1
+elif [ $? -eq 1 ]; then
+  exit 0
+else
+  exit $?
+fi
diff --git a/src/quo/components/animated_header_flatlist/view.cljs b/src/quo/components/animated_header_flatlist/view.cljs
index 6ff13a0f3c..cda1cc5fa5 100644
--- a/src/quo/components/animated_header_flatlist/view.cljs
+++ b/src/quo/components/animated_header_flatlist/view.cljs
@@ -2,7 +2,7 @@
   (:require
     [oops.core :as oops]
     [quo.components.animated-header-flatlist.style :as style]
-    [quo.core :as quo]
+    [quo.components.icon :as icon]
     [quo.foundations.colors :as colors]
     [quo.theme :as quo.theme]
     [react-native.core :as rn]
@@ -73,11 +73,11 @@
       {:active-opacity 1
        :on-press       back-button-on-press
        :style          (style/button-container {:left 20 :theme theme})}
-      [quo/icon :i/arrow-left {:size 20 :color (colors/theme-colors colors/black colors/white theme)}]]
+      [icon/icon :i/arrow-left {:size 20 :color (colors/theme-colors colors/black colors/white theme)}]]
      [rn/touchable-opacity
       {:active-opacity 1
        :style          (style/button-container {:right 20 :theme theme})}
-      [quo/icon :i/options {:size 20 :color (colors/theme-colors colors/black colors/white theme)}]]
+      [icon/icon :i/options {:size 20 :color (colors/theme-colors colors/black colors/white theme)}]]
      [reanimated/blur-view
       {:blurAmount   32
        :blurType     :light
diff --git a/src/quo/core.cljs b/src/quo/core.cljs
index 21baf73c6a..638338aad6 100644
--- a/src/quo/core.cljs
+++ b/src/quo/core.cljs
@@ -1,6 +1,7 @@
 (ns quo.core
   (:refer-clojure :exclude [filter])
   (:require
+    quo.components.animated-header-flatlist.view
     quo.components.avatars.account-avatar.view
     quo.components.avatars.channel-avatar.view
     quo.components.avatars.collection-avatar.view
@@ -239,6 +240,7 @@
 
 ;;;; Header
 (def header quo.components.header/header)
+(def animated-header-list quo.components.animated-header-flatlist.view/animated-header-list)
 
 ;;;; Gradient
 (def gradient-cover quo.components.gradient.gradient-cover.view/view)
diff --git a/src/status_im/ui/screens/home/views/inner_item.cljs b/src/status_im/ui/screens/home/views/inner_item.cljs
index 8809ccc930..d38eefa9d1 100644
--- a/src/status_im/ui/screens/home/views/inner_item.cljs
+++ b/src/status_im/ui/screens/home/views/inner_item.cljs
@@ -1,14 +1,14 @@
 (ns status-im.ui.screens.home.views.inner-item
   (:require
     [clojure.string :as string]
-    [quo.components.markdown.text :as quo.text]
+    [quo.core :as quo]
     [quo.foundations.colors :as quo.colors]
     [re-frame.core :as re-frame]
     [status-im.ui.components.badge :as badge]
     [status-im.ui.components.chat-icon.screen :as chat-icon.screen]
     [status-im.ui.components.chat-icon.styles :as chat-icon.styles]
     [status-im.ui.components.colors :as colors]
-    [status-im.ui.components.core :as quo]
+    [status-im.ui.components.core :as components]
     [status-im.ui.components.icons.icons :as icons]
     [status-im.ui.components.react :as react]
     [status-im.ui.screens.home.styles :as styles]
@@ -187,7 +187,7 @@
 
 (defn chat-item-title
   [chat-id muted group-chat chat-name edit?]
-  [quo.text/text
+  [quo/text
    {:weight              :semi-bold
     :color               (when muted :secondary)
     :accessibility-label :chat-name-text
@@ -206,7 +206,7 @@
 
 (defn chat-item-title-old
   [chat-id muted group-chat chat-name edit?]
-  [quo/text
+  [components/text
    {:weight              :medium
     :color               (when muted :secondary)
     :accessibility-label :chat-name-text
@@ -260,7 +260,7 @@
          [unviewed-indicator home-item]])
       [react/view {:position :absolute :left 72 :top 32 :right 80}
        (if public?
-         [quo.text/text
+         [quo/text
           {:color           :secondary
            :number-of-lines 1
            :ellipsize-mode  :middle
@@ -281,11 +281,11 @@
               :container-style {:width        16
                                 :height       16
                                 :margin-right 4}}]
-            [quo.text/text
+            [quo/text
              {:weight :medium
               :style  {:color (quo.colors/theme-colors quo.colors/neutral-50 quo.colors/neutral-40)}}
              (i18n/label :t/members-count {:count (count group-members-public-keys)})]]
-           [quo.text/text
+           [quo/text
             {:monospace       true
              :weight          :medium
              :style           {:color (quo.colors/theme-colors quo.colors/neutral-50
diff --git a/src/status_im/ui/screens/wallet/account/views.cljs b/src/status_im/ui/screens/wallet/account/views.cljs
index 73b7a0b45d..571fe6bd32 100644
--- a/src/status_im/ui/screens/wallet/account/views.cljs
+++ b/src/status_im/ui/screens/wallet/account/views.cljs
@@ -1,6 +1,5 @@
 (ns status-im.ui.screens.wallet.account.views
   (:require
-    [quo.components.markdown.text :as quo.text]
     [quo.core :as quo]
     [quo.foundations.colors :as quo.colors]
     [re-frame.core :as re-frame]
@@ -288,7 +287,7 @@
       :shadow-color            (:shadow-01 @colors/theme)
       :shadow-offset           {:width 0 :height 4}}
      [react/view {:padding 20}
-      [quo.text/text {:size :heading-2 :weight :semi-bold} (str portfolio-value " " (:code currency))]]
+      [quo/text {:size :heading-2 :weight :semi-bold} (str portfolio-value " " (:code currency))]]
      [react/view
       [react/scroll-view {:horizontal true :margin-bottom 32 :showsHorizontalScrollIndicator false}
        [react/view {:width 20}]
diff --git a/src/status_im/ui/screens/wallet/accounts/common.cljs b/src/status_im/ui/screens/wallet/accounts/common.cljs
index b3d684663f..6f2d7ed23e 100644
--- a/src/status_im/ui/screens/wallet/accounts/common.cljs
+++ b/src/status_im/ui/screens/wallet/accounts/common.cljs
@@ -1,12 +1,12 @@
 (ns status-im.ui.screens.wallet.accounts.common
   (:require
-    [quo.components.markdown.text :as quo.text]
+    [quo.core :as quo]
     [quo.foundations.colors :as quo.colors]
     [re-frame.core :as re-frame]
     [react-native.core :as rn]
     [reagent.core :as reagent]
     [status-im.ui.components.chat-icon.screen :as chat-icon]
-    [status-im.ui.components.core :as quo]
+    [status-im.ui.components.core :as components]
     [status-im.ui.components.list.item :as list.item]
     [status-im.ui.screens.wallet.components.views :as wallet.components]
     [status-im.utils.utils :as utils.utils]
@@ -41,13 +41,13 @@
 (defn render-asset
   [{:keys [icon decimals amount color value] :as token} _ _ currency]
   [list.item/list-item
-   {:title               [quo/text {:weight :medium}
-                          [quo/text {:weight :inherit}
+   {:title               [components/text {:weight :medium}
+                          [components/text {:weight :inherit}
                            (str (if amount
                                   (wallet.utils/format-amount amount decimals)
                                   "...")
                                 " ")]
-                          [quo/text
+                          [components/text
                            {:color  :secondary
                             :weight :inherit}
                            (wallet.utils/display-symbol token)]]
@@ -66,11 +66,11 @@
       [chat-icon/custom-icon-view-list (:name token) color])]
    [rn/view {:position :absolute :left 52 :top 8 :right 12}
     [rn/view {:flex-direction :row :justify-content :space-between :align-items :center}
-     [quo.text/text {:weight :semi-bold :style {:height 22}}
+     [quo/text {:weight :semi-bold :style {:height 22}}
       name]
-     [quo.text/text {:size :paragraph-2 :weight :medium}
+     [quo/text {:size :paragraph-2 :weight :medium}
       (str (if value value "...") " " currency)]]
-    [quo.text/text
+    [quo/text
      {:size   :paragraph-2
       :weight :medium
       :style  {:color (quo.colors/theme-colors quo.colors/neutral-50 quo.colors/neutral-40)}}
diff --git a/src/status_im/ui/screens/wallet/accounts/views.cljs b/src/status_im/ui/screens/wallet/accounts/views.cljs
index c8fd971726..5705fa058f 100644
--- a/src/status_im/ui/screens/wallet/accounts/views.cljs
+++ b/src/status_im/ui/screens/wallet/accounts/views.cljs
@@ -1,6 +1,5 @@
 (ns status-im.ui.screens.wallet.accounts.views
   (:require
-    [quo.components.markdown.text :as quo.text]
     [quo.core :as quo]
     [quo.foundations.colors :as quo.colors]
     [re-frame.core :as re-frame]
@@ -207,8 +206,8 @@
   (views/letsubs [currency        [:wallet-legacy/currency]
                   portfolio-value [:portfolio-value]]
     [react/view {:padding-vertical 12}
-     [quo.text/text (i18n/label :t/wallet-total-value)]
-     [quo.text/text {:size :heading-1 :weight :semi-bold}
+     [quo/text (i18n/label :t/wallet-total-value)]
+     [quo/text {:size :heading-1 :weight :semi-bold}
       (str portfolio-value " " (:code currency))]
      [react/scroll-view {:horizontal true}]]))
 
diff --git a/src/status_im2/contexts/chat/home/chat_list_item/view.cljs b/src/status_im2/contexts/chat/home/chat_list_item/view.cljs
index d4e74b8335..b289d0c90b 100644
--- a/src/status_im2/contexts/chat/home/chat_list_item/view.cljs
+++ b/src/status_im2/contexts/chat/home/chat_list_item/view.cljs
@@ -1,7 +1,6 @@
 (ns status-im2.contexts.chat.home.chat-list-item.view
   (:require
     [clojure.string :as string]
-    [quo.components.icon :as icons]
     [quo.core :as quo]
     [quo.foundations.colors :as colors]
     [react-native.core :as rn]
@@ -193,7 +192,7 @@
     [rn/view {:style style/notification-container}
      (cond
        muted
-       [icons/icon :i/muted {:color colors/neutral-40}]
+       [quo/icon :i/muted {:color colors/neutral-40}]
 
        (and group-chat unread-mentions?)
        [quo/counter
diff --git a/src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer.cljs b/src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer.cljs
index b115f25dcc..9deafba8af 100644
--- a/src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer.cljs
+++ b/src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer.cljs
@@ -1,6 +1,5 @@
 (ns status-im2.contexts.chat.messages.contact-requests.bottom-drawer
   (:require
-    [quo.components.drawers.permission-context.view :as permission-context]
     [quo.core :as quo]
     [react-native.core :as rn]
     [status-im2.config :as config]
@@ -14,7 +13,7 @@
   (let [customization-color (rf/sub [:profile/customization-color])
         [primary-name _]    (rf/sub [:contacts/contact-two-names-by-identity contact-id])]
     [rn/view
-     [permission-context/view
+     [quo/permission-context
       [quo/button
        {:type      :ghost
         :size      24
diff --git a/src/status_im2/contexts/contacts/drawers/nickname_drawer/view.cljs b/src/status_im2/contexts/contacts/drawers/nickname_drawer/view.cljs
index 5f72af3bfd..8f4f2de2e6 100644
--- a/src/status_im2/contexts/contacts/drawers/nickname_drawer/view.cljs
+++ b/src/status_im2/contexts/contacts/drawers/nickname_drawer/view.cljs
@@ -1,7 +1,6 @@
 (ns status-im2.contexts.contacts.drawers.nickname-drawer.view
   (:require
     [clojure.string :as string]
-    [quo.components.icon :as icons]
     [quo.core :as quo]
     [quo.foundations.colors :as colors]
     [react-native.core :as rn]
@@ -60,7 +59,7 @@
          :on-submit-editing #(add-nickname-and-show-toast primary-name @entered-nickname public-key)}]
        [rn/view
         {:style style/nickname-description-container}
-        [icons/icon :i/info
+        [quo/icon :i/info
          {:size  16
           :color (colors/theme-colors colors/black colors/white)}]
         [quo/text
diff --git a/src/status_im2/contexts/quo_preview/animated_header_list/animated_header_list.cljs b/src/status_im2/contexts/quo_preview/animated_header_list/animated_header_list.cljs
index 8601e0cf9f..1269d83886 100644
--- a/src/status_im2/contexts/quo_preview/animated_header_list/animated_header_list.cljs
+++ b/src/status_im2/contexts/quo_preview/animated_header_list/animated_header_list.cljs
@@ -1,6 +1,5 @@
 (ns status-im2.contexts.quo-preview.animated-header-list.animated-header-list
   (:require
-    [quo.components.animated-header-flatlist.view :as animated-header-list]
     [quo.core :as quo]
     [quo.foundations.colors :as colors]
     [re-frame.core :as rf]
@@ -83,4 +82,4 @@
 
 (defn mock-screen
   []
-  [animated-header-list/animated-header-list parameters])
+  [quo/animated-header-list parameters])