diff --git a/frontend/src/uxbox/main/ui.cljs b/frontend/src/uxbox/main/ui.cljs
index c708417425..61375c4d53 100644
--- a/frontend/src/uxbox/main/ui.cljs
+++ b/frontend/src/uxbox/main/ui.cljs
@@ -13,7 +13,7 @@
    [cuerdas.core :as str]
    [potok.core :as ptk]
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.common.data :as d]
    [uxbox.common.exceptions :as ex]
    [uxbox.main.data.auth :refer [logout]]
diff --git a/frontend/src/uxbox/main/ui/components/editable_label.cljs b/frontend/src/uxbox/main/ui/components/editable_label.cljs
index f260cdfd1d..8ce7c65079 100644
--- a/frontend/src/uxbox/main/ui/components/editable_label.cljs
+++ b/frontend/src/uxbox/main/ui/components/editable_label.cljs
@@ -1,7 +1,7 @@
 (ns uxbox.main.ui.components.editable-label
   (:require
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.main.ui.keyboard :as kbd]
    [uxbox.util.dom :as dom]
    [uxbox.util.timers :as timers]
diff --git a/frontend/src/uxbox/main/ui/confirm.cljs b/frontend/src/uxbox/main/ui/confirm.cljs
index 72bfb1ddd7..c3d2103abb 100644
--- a/frontend/src/uxbox/main/ui/confirm.cljs
+++ b/frontend/src/uxbox/main/ui/confirm.cljs
@@ -7,7 +7,7 @@
 
 (ns uxbox.main.ui.confirm
   (:require
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [rumext.alpha :as mf]
    [uxbox.main.ui.modal :as modal]
    [uxbox.util.i18n :refer (tr)]
diff --git a/frontend/src/uxbox/main/ui/dashboard.cljs b/frontend/src/uxbox/main/ui/dashboard.cljs
index ca2e4ab829..7d10462540 100644
--- a/frontend/src/uxbox/main/ui/dashboard.cljs
+++ b/frontend/src/uxbox/main/ui/dashboard.cljs
@@ -11,7 +11,7 @@
   (:require
    [cuerdas.core :as str]
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.common.exceptions :as ex]
    [uxbox.common.spec :as us]
    [uxbox.main.refs :as refs]
diff --git a/frontend/src/uxbox/main/ui/dashboard/colors.cljs b/frontend/src/uxbox/main/ui/dashboard/colors.cljs
index c9d17afa79..75f4f2dcb0 100644
--- a/frontend/src/uxbox/main/ui/dashboard/colors.cljs
+++ b/frontend/src/uxbox/main/ui/dashboard/colors.cljs
@@ -10,7 +10,7 @@
    [cuerdas.core :as str]
    [lentes.core :as l]
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.main.data.colors :as dc]
    [uxbox.main.store :as st]
    [uxbox.main.ui.dashboard.common :as common]
diff --git a/frontend/src/uxbox/main/ui/dashboard/common.cljs b/frontend/src/uxbox/main/ui/dashboard/common.cljs
index 636861f50f..f2c7ea06a3 100644
--- a/frontend/src/uxbox/main/ui/dashboard/common.cljs
+++ b/frontend/src/uxbox/main/ui/dashboard/common.cljs
@@ -8,7 +8,7 @@
   (:require
    [cuerdas.core :as str]
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.main.ui.keyboard :as k]
    [uxbox.util.dom :as dom]
    [uxbox.util.i18n :as t :refer [tr]]))
diff --git a/frontend/src/uxbox/main/ui/dashboard/grid.cljs b/frontend/src/uxbox/main/ui/dashboard/grid.cljs
index 6dd46f2b84..1a0cfa3f25 100644
--- a/frontend/src/uxbox/main/ui/dashboard/grid.cljs
+++ b/frontend/src/uxbox/main/ui/dashboard/grid.cljs
@@ -3,7 +3,7 @@
    [cuerdas.core :as str]
    [beicon.core :as rx]
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.main.data.dashboard :as dsh]
    [uxbox.main.store :as st]
    [uxbox.main.ui.modal :as modal]
diff --git a/frontend/src/uxbox/main/ui/dashboard/images.cljs b/frontend/src/uxbox/main/ui/dashboard/images.cljs
index e495c51e84..b188291b72 100644
--- a/frontend/src/uxbox/main/ui/dashboard/images.cljs
+++ b/frontend/src/uxbox/main/ui/dashboard/images.cljs
@@ -14,7 +14,7 @@
    [cuerdas.core :as str]
    [lentes.core :as l]
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.common.data :as d]
    [uxbox.common.spec :as us]
    [uxbox.main.data.images :as di]
diff --git a/frontend/src/uxbox/main/ui/dashboard/library.cljs b/frontend/src/uxbox/main/ui/dashboard/library.cljs
index a6e4d37654..4d02a04c6c 100644
--- a/frontend/src/uxbox/main/ui/dashboard/library.cljs
+++ b/frontend/src/uxbox/main/ui/dashboard/library.cljs
@@ -22,7 +22,7 @@
    [uxbox.main.data.icons :as dico]
    [uxbox.main.data.images :as dimg]
    [uxbox.main.data.colors :as dcol]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.main.store :as st]
    [uxbox.main.refs :as refs]
    [uxbox.main.ui.components.context-menu :refer [context-menu]]
diff --git a/frontend/src/uxbox/main/ui/dashboard/profile.cljs b/frontend/src/uxbox/main/ui/dashboard/profile.cljs
index adfc4c6587..b1cc1ba2ec 100644
--- a/frontend/src/uxbox/main/ui/dashboard/profile.cljs
+++ b/frontend/src/uxbox/main/ui/dashboard/profile.cljs
@@ -13,7 +13,7 @@
    [cuerdas.core :as str]
    [lentes.core :as l]
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.main.data.auth :as da]
    [uxbox.main.store :as st]
    [uxbox.main.refs :as refs]
diff --git a/frontend/src/uxbox/main/ui/dashboard/project.cljs b/frontend/src/uxbox/main/ui/dashboard/project.cljs
index 5355536572..92374b8c9a 100644
--- a/frontend/src/uxbox/main/ui/dashboard/project.cljs
+++ b/frontend/src/uxbox/main/ui/dashboard/project.cljs
@@ -11,7 +11,7 @@
   (:require
    [okulary.core :as l]
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.util.i18n :as i18n :refer [t]]
    [uxbox.util.dom :as dom]
    [uxbox.util.router :as rt]
diff --git a/frontend/src/uxbox/main/ui/dashboard/recent_files.cljs b/frontend/src/uxbox/main/ui/dashboard/recent_files.cljs
index 807a04a879..4b0321a402 100644
--- a/frontend/src/uxbox/main/ui/dashboard/recent_files.cljs
+++ b/frontend/src/uxbox/main/ui/dashboard/recent_files.cljs
@@ -11,7 +11,7 @@
   (:require
    [okulary.core :as l]
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.common.exceptions :as ex]
    [uxbox.main.constants :as c]
    [uxbox.main.data.dashboard :as dsh]
diff --git a/frontend/src/uxbox/main/ui/dashboard/sidebar.cljs b/frontend/src/uxbox/main/ui/dashboard/sidebar.cljs
index f7c8f5fef1..975d266236 100644
--- a/frontend/src/uxbox/main/ui/dashboard/sidebar.cljs
+++ b/frontend/src/uxbox/main/ui/dashboard/sidebar.cljs
@@ -14,7 +14,7 @@
    [okulary.core :as l]
    [rumext.alpha :as mf]
    [goog.functions :as f]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.main.constants :as c]
    [uxbox.main.data.dashboard :as dsh]
    [uxbox.main.store :as st]
diff --git a/frontend/src/uxbox/builtins/icons.clj b/frontend/src/uxbox/main/ui/icons.clj
similarity index 60%
rename from frontend/src/uxbox/builtins/icons.clj
rename to frontend/src/uxbox/main/ui/icons.clj
index 179919fc89..f721ee039e 100644
--- a/frontend/src/uxbox/builtins/icons.clj
+++ b/frontend/src/uxbox/main/ui/icons.clj
@@ -2,14 +2,19 @@
 ;; License, v. 2.0. If a copy of the MPL was not distributed with this
 ;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 ;;
+;; This Source Code Form is "Incompatible With Secondary Licenses", as
+;; defined by the Mozilla Public License, v. 2.0.
+;;
 ;; Copyright (c) 2020 UXBOX Labs SL
 
-(ns uxbox.builtins.icons
+(ns uxbox.main.ui.icons
   (:require [rumext.alpha]))
 
+(def base-uri "/images/svg-sprite/symbol/svg/sprite.symbol.svg#icon-")
+
 (defmacro icon-xref
   [id]
-  (let [href (str "/images/svg-sprite/symbol/svg/sprite.symbol.svg#icon-" (name id))]
+  (let [href (str base-uri (name id))]
     `(rumext.alpha/html
       [:svg {:width 500 :height 500}
        [:use {:xlinkHref ~href}]])))
diff --git a/frontend/src/uxbox/builtins/icons.cljs b/frontend/src/uxbox/main/ui/icons.cljs
similarity index 93%
rename from frontend/src/uxbox/builtins/icons.cljs
rename to frontend/src/uxbox/main/ui/icons.cljs
index 3f47f646be..b8d8efcc03 100644
--- a/frontend/src/uxbox/builtins/icons.cljs
+++ b/frontend/src/uxbox/main/ui/icons.cljs
@@ -2,31 +2,29 @@
 ;; License, v. 2.0. If a copy of the MPL was not distributed with this
 ;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 ;;
-;; Copyright (c) 2015-2020 Andrey Antukh <niwi@niwi.nz>
-;; Copyright (c) 2015-2020 Juan de la Cruz <delacruzgarciajuan@gmail.com>
+;; This Source Code Form is "Incompatible With Secondary Licenses", as
+;; defined by the Mozilla Public License, v. 2.0.
+;;
+;; Copyright (c) 2020 UXBOX Labs SL
 
-(ns uxbox.builtins.icons
-  (:require-macros [uxbox.builtins.icons :refer [icon-xref]])
+(ns uxbox.main.ui.icons
+  (:require-macros [uxbox.main.ui.icons :refer [icon-xref]])
   (:require [rumext.alpha :as mf]))
 
 (def action (icon-xref :action))
 (def actions (icon-xref :actions))
-(def text-align-center (icon-xref :text-align-center))
-(def text-align-justify (icon-xref :text-align-justify))
-(def text-align-left (icon-xref :text-align-left))
-(def text-align-right (icon-xref :text-align-right))
-(def align-top (icon-xref :align-top))
 (def align-bottom (icon-xref :align-bottom))
 (def align-middle (icon-xref :align-middle))
-(def auto-fix (icon-xref :auto-fix))
-(def auto-width (icon-xref :auto-width))
-(def auto-height (icon-xref :auto-height))
+(def align-top (icon-xref :align-top))
 (def alignment (icon-xref :alignment))
 (def arrow (icon-xref :arrow))
 (def arrow-down (icon-xref :arrow-down))
 (def arrow-end (icon-xref :arrow-end))
 (def arrow-slide (icon-xref :arrow-slide))
 (def artboard (icon-xref :artboard))
+(def auto-fix (icon-xref :auto-fix))
+(def auto-height (icon-xref :auto-height))
+(def auto-width (icon-xref :auto-width))
 (def box (icon-xref :box))
 (def chain (icon-xref :chain))
 (def chat (icon-xref :chat))
@@ -48,9 +46,9 @@
 (def full-screen-off (icon-xref :full-screen-off))
 (def grid (icon-xref :grid))
 (def grid-snap (icon-xref :grid-snap))
-(def icon-set (icon-xref :icon-set))
-(def icon-lock (icon-xref :icon-lock))
 (def icon-empty (icon-xref :icon-empty))
+(def icon-lock (icon-xref :icon-lock))
+(def icon-set (icon-xref :icon-set))
 (def image (icon-xref :image))
 (def infocard (icon-xref :infocard))
 (def interaction (icon-xref :interaction))
@@ -76,19 +74,20 @@
 (def pin (icon-xref :pin))
 (def play (icon-xref :play))
 (def radius (icon-xref :radius))
+(def recent (icon-xref :recent))
 (def redo (icon-xref :redo))
 (def rotate (icon-xref :rotate))
 (def ruler (icon-xref :ruler))
 (def ruler-tool (icon-xref :ruler-tool))
 (def save (icon-xref :save))
 (def search (icon-xref :search))
-(def shape-halign-left (icon-xref :shape-halign-left))
 (def shape-halign-center (icon-xref :shape-halign-center))
+(def shape-halign-left (icon-xref :shape-halign-left))
 (def shape-halign-right (icon-xref :shape-halign-right))
 (def shape-hdistribute (icon-xref :shape-hdistribute))
-(def shape-valign-top (icon-xref :shape-valign-top))
-(def shape-valign-center (icon-xref :shape-valign-center))
 (def shape-valign-bottom (icon-xref :shape-valign-bottom))
+(def shape-valign-center (icon-xref :shape-valign-center))
+(def shape-valign-top (icon-xref :shape-valign-top))
 (def shape-vdistribute (icon-xref :shape-vdistribute))
 (def size-horiz (icon-xref :size-horiz))
 (def size-vert (icon-xref :size-vert))
@@ -96,18 +95,21 @@
 (def stroke (icon-xref :stroke))
 (def sublevel (icon-xref :sublevel))
 (def text (icon-xref :text))
+(def text-align-center (icon-xref :text-align-center))
+(def text-align-justify (icon-xref :text-align-justify))
+(def text-align-left (icon-xref :text-align-left))
+(def text-align-right (icon-xref :text-align-right))
 (def titlecase (icon-xref :titlecase))
 (def toggle (icon-xref :toggle))
 (def trash (icon-xref :trash))
 (def tree (icon-xref :tree))
+(def underline (icon-xref :underline))
 (def undo (icon-xref :undo))
 (def undo-history (icon-xref :undo-history))
 (def ungroup (icon-xref :ungroup))
 (def unlock (icon-xref :unlock))
-(def underline (icon-xref :underline))
 (def uppercase (icon-xref :uppercase))
 (def user (icon-xref :user))
-(def recent (icon-xref :recent))
 
 (def loader-pencil
   (mf/html
@@ -130,7 +132,7 @@
   {::mf/wrap-props false}
   [props]
   [:section.debug-icons-preview
-   (for [[key val] (sort-by first (ns-publics 'uxbox.builtins.icons))]
+   (for [[key val] (sort-by first (ns-publics 'uxbox.main.ui.icons))]
      (when (not= key 'debug-icons-preview)
        [:div.icon-item {:key key}
         (deref val)
diff --git a/frontend/src/uxbox/main/ui/loader.cljs b/frontend/src/uxbox/main/ui/loader.cljs
index 0a7c9a0319..611efadb68 100644
--- a/frontend/src/uxbox/main/ui/loader.cljs
+++ b/frontend/src/uxbox/main/ui/loader.cljs
@@ -7,7 +7,7 @@
 (ns uxbox.main.ui.loader
   (:require
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.main.store :as st]))
 
 ;; --- Component
diff --git a/frontend/src/uxbox/main/ui/login.cljs b/frontend/src/uxbox/main/ui/login.cljs
index 0049de470e..c8c272956f 100644
--- a/frontend/src/uxbox/main/ui/login.cljs
+++ b/frontend/src/uxbox/main/ui/login.cljs
@@ -13,7 +13,7 @@
    [cljs.spec.alpha :as s]
    [rumext.alpha :as mf]
    [uxbox.common.spec :as us]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.config :as cfg]
    [uxbox.main.data.auth :as da]
    [uxbox.main.store :as st]
diff --git a/frontend/src/uxbox/main/ui/messages.cljs b/frontend/src/uxbox/main/ui/messages.cljs
index 52e5161d49..df15ce75b3 100644
--- a/frontend/src/uxbox/main/ui/messages.cljs
+++ b/frontend/src/uxbox/main/ui/messages.cljs
@@ -1,7 +1,7 @@
 (ns uxbox.main.ui.messages
   (:require
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.main.data.messages :as dm]
    [uxbox.main.refs :as refs]
    [uxbox.main.store :as st]
diff --git a/frontend/src/uxbox/main/ui/profile/recovery.cljs b/frontend/src/uxbox/main/ui/profile/recovery.cljs
index b221f455e3..9b4ca3c4b1 100644
--- a/frontend/src/uxbox/main/ui/profile/recovery.cljs
+++ b/frontend/src/uxbox/main/ui/profile/recovery.cljs
@@ -14,7 +14,7 @@
    [cuerdas.core :as str]
    [lentes.core :as l]
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.common.spec :as us]
    [uxbox.main.data.auth :as uda]
    [uxbox.main.data.messages :as dm]
diff --git a/frontend/src/uxbox/main/ui/profile/recovery_request.cljs b/frontend/src/uxbox/main/ui/profile/recovery_request.cljs
index 3db6352f56..17abdf54c8 100644
--- a/frontend/src/uxbox/main/ui/profile/recovery_request.cljs
+++ b/frontend/src/uxbox/main/ui/profile/recovery_request.cljs
@@ -14,7 +14,7 @@
    [cuerdas.core :as str]
    [lentes.core :as l]
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.common.spec :as us]
    [uxbox.main.data.auth :as uda]
    [uxbox.main.data.messages :as dm]
diff --git a/frontend/src/uxbox/main/ui/profile/register.cljs b/frontend/src/uxbox/main/ui/profile/register.cljs
index 659ef6796f..1e7fd01854 100644
--- a/frontend/src/uxbox/main/ui/profile/register.cljs
+++ b/frontend/src/uxbox/main/ui/profile/register.cljs
@@ -11,7 +11,7 @@
    [cuerdas.core :as str]
    [lentes.core :as l]
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.main.data.auth :as uda]
    [uxbox.main.store :as st]
    [uxbox.main.ui.messages :refer [messages]]
diff --git a/frontend/src/uxbox/main/ui/settings.cljs b/frontend/src/uxbox/main/ui/settings.cljs
index 45827afe27..6cb275bcba 100644
--- a/frontend/src/uxbox/main/ui/settings.cljs
+++ b/frontend/src/uxbox/main/ui/settings.cljs
@@ -10,7 +10,7 @@
    [cuerdas.core :as str]
    [potok.core :as ptk]
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.main.refs :as refs]
    [uxbox.main.store :as st]
    [uxbox.util.router :as rt]
diff --git a/frontend/src/uxbox/main/ui/settings/header.cljs b/frontend/src/uxbox/main/ui/settings/header.cljs
index 2198142f0e..e279d8e746 100644
--- a/frontend/src/uxbox/main/ui/settings/header.cljs
+++ b/frontend/src/uxbox/main/ui/settings/header.cljs
@@ -8,7 +8,7 @@
   (:require
    [lentes.core :as l]
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.main.data.auth :as da]
    [uxbox.main.store :as st]
    [uxbox.util.i18n :as i18n :refer [tr t]]
diff --git a/frontend/src/uxbox/main/ui/settings/password.cljs b/frontend/src/uxbox/main/ui/settings/password.cljs
index bef2262834..f2294b16a8 100644
--- a/frontend/src/uxbox/main/ui/settings/password.cljs
+++ b/frontend/src/uxbox/main/ui/settings/password.cljs
@@ -12,7 +12,7 @@
   (:require
    [rumext.alpha :as mf]
    [cljs.spec.alpha :as s]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.main.data.users :as udu]
    [uxbox.main.data.messages :as dm]
    [uxbox.main.store :as st]
diff --git a/frontend/src/uxbox/main/ui/settings/profile.cljs b/frontend/src/uxbox/main/ui/settings/profile.cljs
index a4eaa7e3d0..bfba122674 100644
--- a/frontend/src/uxbox/main/ui/settings/profile.cljs
+++ b/frontend/src/uxbox/main/ui/settings/profile.cljs
@@ -11,7 +11,7 @@
    [cuerdas.core :as str]
    [lentes.core :as l]
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.main.data.users :as udu]
    [uxbox.main.data.messages :as dm]
    [uxbox.main.store :as st]
diff --git a/frontend/src/uxbox/main/ui/static.cljs b/frontend/src/uxbox/main/ui/static.cljs
index 93d1089b29..f5ae324690 100644
--- a/frontend/src/uxbox/main/ui/static.cljs
+++ b/frontend/src/uxbox/main/ui/static.cljs
@@ -11,7 +11,7 @@
   (:require
    [cljs.spec.alpha :as s]
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]))
+   [uxbox.main.ui.icons :as i]))
 
 (mf/defc not-found-page
   [{:keys [error] :as props}]
diff --git a/frontend/src/uxbox/main/ui/viewer.cljs b/frontend/src/uxbox/main/ui/viewer.cljs
index 00cd21334f..53368656dd 100644
--- a/frontend/src/uxbox/main/ui/viewer.cljs
+++ b/frontend/src/uxbox/main/ui/viewer.cljs
@@ -14,7 +14,7 @@
    [goog.object :as gobj]
    [okulary.core :as l]
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.common.exceptions :as ex]
    [uxbox.main.data.viewer :as dv]
    [uxbox.main.refs :as refs]
diff --git a/frontend/src/uxbox/main/ui/viewer/header.cljs b/frontend/src/uxbox/main/ui/viewer/header.cljs
index 98b48b499d..298b9540a9 100644
--- a/frontend/src/uxbox/main/ui/viewer/header.cljs
+++ b/frontend/src/uxbox/main/ui/viewer/header.cljs
@@ -10,7 +10,7 @@
 (ns uxbox.main.ui.viewer.header
   (:require
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.main.data.messages :as dm]
    [uxbox.main.data.viewer :as dv]
    [uxbox.main.refs :as refs]
diff --git a/frontend/src/uxbox/main/ui/viewer/thumbnails.cljs b/frontend/src/uxbox/main/ui/viewer/thumbnails.cljs
index 21861cdf6a..bfc3d4f1f1 100644
--- a/frontend/src/uxbox/main/ui/viewer/thumbnails.cljs
+++ b/frontend/src/uxbox/main/ui/viewer/thumbnails.cljs
@@ -13,7 +13,7 @@
    [goog.object :as gobj]
    [lentes.core :as l]
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.common.data :as d]
    [uxbox.main.store :as st]
    [uxbox.main.data.viewer :as dv]
diff --git a/frontend/src/uxbox/main/ui/workspace.cljs b/frontend/src/uxbox/main/ui/workspace.cljs
index bbdc9e21e7..86dab92adc 100644
--- a/frontend/src/uxbox/main/ui/workspace.cljs
+++ b/frontend/src/uxbox/main/ui/workspace.cljs
@@ -12,7 +12,7 @@
    [beicon.core :as rx]
    [lentes.core :as l]
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.main.constants :as c]
    [uxbox.main.data.history :as udh]
    [uxbox.main.data.workspace :as dw]
diff --git a/frontend/src/uxbox/main/ui/workspace/colorpalette.cljs b/frontend/src/uxbox/main/ui/workspace/colorpalette.cljs
index 5392079019..dbdb9bc8f7 100644
--- a/frontend/src/uxbox/main/ui/workspace/colorpalette.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/colorpalette.cljs
@@ -12,7 +12,7 @@
    [beicon.core :as rx]
    [okulary.core :as l]
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.main.data.colors :as udc]
    [uxbox.main.data.library :as dlib]
    [uxbox.main.data.workspace :as udw]
diff --git a/frontend/src/uxbox/main/ui/workspace/context_menu.cljs b/frontend/src/uxbox/main/ui/workspace/context_menu.cljs
index 0d57ab3f74..2ef31176e6 100644
--- a/frontend/src/uxbox/main/ui/workspace/context_menu.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/context_menu.cljs
@@ -17,7 +17,7 @@
    [uxbox.main.store :as st]
    [uxbox.main.refs :as refs]
    [uxbox.main.streams :as ms]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.util.dom :as dom]
    [uxbox.main.data.workspace :as dw]
    [uxbox.main.ui.hooks :refer [use-rxsub]]
diff --git a/frontend/src/uxbox/main/ui/workspace/download.cljs b/frontend/src/uxbox/main/ui/workspace/download.cljs
index 7815408ca8..745c12bdcc 100644
--- a/frontend/src/uxbox/main/ui/workspace/download.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/download.cljs
@@ -10,7 +10,7 @@
             [beicon.core :as rx]
             [potok.core :as ptk]
             [lentes.core :as l]
-            [uxbox.builtins.icons :as i]
+            [uxbox.main.ui.icons :as i]
             [uxbox.main.store :as st]
             [uxbox.main.refs :as refs]
             [uxbox.main.data.lightbox :as udl]
diff --git a/frontend/src/uxbox/main/ui/workspace/header.cljs b/frontend/src/uxbox/main/ui/workspace/header.cljs
index 405010be9c..bb8356e490 100644
--- a/frontend/src/uxbox/main/ui/workspace/header.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/header.cljs
@@ -11,7 +11,7 @@
 (ns uxbox.main.ui.workspace.header
   (:require
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i :include-macros true]
+   [uxbox.main.ui.icons :as i :include-macros true]
    [uxbox.config :as cfg]
    [uxbox.main.data.history :as udh]
    [uxbox.main.data.workspace :as dw]
diff --git a/frontend/src/uxbox/main/ui/workspace/images.cljs b/frontend/src/uxbox/main/ui/workspace/images.cljs
index eddc3275f6..ea5f7a502c 100644
--- a/frontend/src/uxbox/main/ui/workspace/images.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/images.cljs
@@ -9,7 +9,7 @@
   (:require
    [lentes.core :as l]
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.common.data :as d]
    [uxbox.main.data.images :as udi]
    [uxbox.main.data.workspace :as dw]
diff --git a/frontend/src/uxbox/main/ui/workspace/left_toolbar.cljs b/frontend/src/uxbox/main/ui/workspace/left_toolbar.cljs
index a8871b59bf..382167ba0b 100644
--- a/frontend/src/uxbox/main/ui/workspace/left_toolbar.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/left_toolbar.cljs
@@ -17,7 +17,7 @@
    [uxbox.main.ui.modal :as modal]
    [uxbox.main.ui.workspace.images :refer [import-image-modal]]
    [uxbox.util.i18n :as i18n :refer [t]]
-   [uxbox.builtins.icons :as i]))
+   [uxbox.main.ui.icons :as i]))
 
 ;; --- Component: Left toolbar
 
diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/align.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/align.cljs
index a98651beca..4b8c49f62c 100644
--- a/frontend/src/uxbox/main/ui/workspace/sidebar/align.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/sidebar/align.cljs
@@ -8,7 +8,7 @@
 (ns uxbox.main.ui.workspace.sidebar.align
   (:require
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.main.refs :as refs]
    [uxbox.main.store :as st]
    [uxbox.main.data.workspace :as dw]
diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/history.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/history.cljs
index 9b1f191855..db91e562e5 100644
--- a/frontend/src/uxbox/main/ui/workspace/sidebar/history.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/sidebar/history.cljs
@@ -8,7 +8,7 @@
 (ns uxbox.main.ui.workspace.sidebar.history
   (:require
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.main.data.history :as udh]
    [uxbox.main.data.workspace :as dw]
    [uxbox.main.refs :as refs]
diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/icons.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/icons.cljs
index 6ee964c52f..94873ea8d3 100644
--- a/frontend/src/uxbox/main/ui/workspace/sidebar/icons.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/sidebar/icons.cljs
@@ -10,7 +10,7 @@
    [lentes.core :as l]
    [rumext.alpha :as mf]
    [uxbox.common.data :as d]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.main.data.icons :as di]
    [uxbox.main.data.workspace :as dw]
    [uxbox.main.refs :as refs]
diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs
index 96e634c93d..9a568a2cd2 100644
--- a/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs
@@ -12,7 +12,7 @@
   (:require
    [okulary.core :as l]
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.common.data :as d]
    [uxbox.common.uuid :as uuid]
    [uxbox.common.pages :as cp]
diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/libraries.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/libraries.cljs
index 51673a8f13..1b77b57c1c 100644
--- a/frontend/src/uxbox/main/ui/workspace/sidebar/libraries.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/sidebar/libraries.cljs
@@ -13,7 +13,7 @@
    [cuerdas.core :as str]
    [rumext.alpha :as mf]
    [uxbox.common.data :as d]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.main.data.workspace :as dw]
    [uxbox.main.refs :as refs]
    [uxbox.main.store :as st]
diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options.cljs
index d0cc807509..a633d3de99 100644
--- a/frontend/src/uxbox/main/ui/workspace/sidebar/options.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options.cljs
@@ -11,7 +11,7 @@
   (:require
    [okulary.core :as l]
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.main.data.workspace :as udw]
    [uxbox.main.store :as st]
    [uxbox.main.refs :as refs]
diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/fill.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options/fill.cljs
index f33ac1ae29..b7e2b9949d 100644
--- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/fill.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options/fill.cljs
@@ -10,7 +10,7 @@
 (ns uxbox.main.ui.workspace.sidebar.options.fill
   (:require
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.common.data :as d]
    [uxbox.main.data.workspace :as udw]
    [uxbox.main.store :as st]
diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/frame.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options/frame.cljs
index 53e31c9507..d0ad8bec07 100644
--- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/frame.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options/frame.cljs
@@ -12,7 +12,7 @@
   (:require
    [rumext.alpha :as mf]
    [uxbox.common.data :as d]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.main.data.workspace :as udw]
    [uxbox.main.store :as st]
    [uxbox.main.ui.components.dropdown :refer [dropdown]]
diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/interactions.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options/interactions.cljs
index 33937badc6..bef9cdc610 100644
--- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/interactions.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options/interactions.cljs
@@ -10,7 +10,7 @@
 (ns uxbox.main.ui.workspace.sidebar.options.interactions
   (:require
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.common.pages :as cp]
    [uxbox.main.data.workspace :as dw]
    [uxbox.main.refs :as refs]
diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/measures.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options/measures.cljs
index 4f3a881c2c..e79017312c 100644
--- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/measures.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options/measures.cljs
@@ -10,7 +10,7 @@
 (ns uxbox.main.ui.workspace.sidebar.options.measures
   (:require
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.main.store :as st]
    [uxbox.main.refs :as refs]
    [uxbox.common.data :as d]
diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/page.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options/page.cljs
index e8750ae481..5eb3bcb439 100644
--- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/page.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options/page.cljs
@@ -14,7 +14,7 @@
    [rumext.alpha :as mf]
    [okulary.core :as l]
    [uxbox.common.data :as d]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.main.data.workspace :as dw]
    [uxbox.main.refs :as refs]
    [uxbox.main.store :as st]
diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs
index 5c98aa6a63..33c7adfbe3 100644
--- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs
@@ -11,7 +11,7 @@
   (:require
    [rumext.alpha :as mf]
    [uxbox.common.data :as d]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.main.data.workspace :as udw]
    [uxbox.main.store :as st]
    [uxbox.main.ui.modal :as modal]
diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/text.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options/text.cljs
index 41ca167b8b..fa0483b298 100644
--- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/text.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options/text.cljs
@@ -12,7 +12,7 @@
    [rumext.alpha :as mf]
    [cuerdas.core :as str]
    [okulary.core :as l]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.common.data :as d]
    [uxbox.main.data.workspace :as dw]
    [uxbox.main.data.workspace.texts :as dwt]
diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs
index 2eedc6bd50..3a15b36e08 100644
--- a/frontend/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs
@@ -11,7 +11,7 @@
    [okulary.core :as l]
    [rumext.alpha :as mf]
    [uxbox.common.data :as d]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.main.data.workspace :as dw]
    [uxbox.main.store :as st]
    [uxbox.main.refs :as refs]
diff --git a/frontend/src/uxbox/main/ui/workspace/viewport.cljs b/frontend/src/uxbox/main/ui/workspace/viewport.cljs
index 6fdf281598..ff76e2ca7b 100644
--- a/frontend/src/uxbox/main/ui/workspace/viewport.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/viewport.cljs
@@ -14,7 +14,7 @@
    [lentes.core :as l]
    [potok.core :as ptk]
    [rumext.alpha :as mf]
-   [uxbox.builtins.icons :as i]
+   [uxbox.main.ui.icons :as i]
    [uxbox.common.data :as d]
    [uxbox.main.constants :as c]
    [uxbox.main.data.workspace :as dw]