diff --git a/src/uxbox/data/shapes.cljs b/src/uxbox/data/shapes.cljs
index 7ceffd499..088ff2e5f 100644
--- a/src/uxbox/data/shapes.cljs
+++ b/src/uxbox/data/shapes.cljs
@@ -7,13 +7,13 @@
 
 (ns uxbox.data.shapes
   (:require [beicon.core :as rx]
-            [uxbox.shapes :as sh]
             [uxbox.rstore :as rs]
             [uxbox.router :as r]
             [uxbox.state :as st]
             [uxbox.state.shapes :as stsh]
             [uxbox.schema :as sc]
             [uxbox.data.pages :as udp]
+            [uxbox.util.geom :as geom]
             [uxbox.util.geom.point :as gpt]
             [uxbox.util.data :refer (index-of)]))
 
@@ -54,7 +54,7 @@
     rs/UpdateEvent
     (-apply-update [_ state]
       (let [shape (get-in state [:shapes-by-id sid])]
-        (update-in state [:shapes-by-id sid] sh/move delta)))))
+        (update-in state [:shapes-by-id sid] geom/move delta)))))
 
 (defn update-line-attrs
   [sid {:keys [x1 y1 x2 y2] :as opts}]
@@ -65,7 +65,7 @@
       (let [shape (get-in state [:shapes-by-id sid])
             props (select-keys opts [:x1 :y1 :x2 :y2])
             props' (select-keys shape [:x1 :y1 :x2 :y2])]
-        (update-in state [:shapes-by-id sid] sh/initialize
+        (update-in state [:shapes-by-id sid] geom/setup
                    (merge props' props))))))
 
 (defn update-rotation
@@ -78,7 +78,7 @@
     rs/UpdateEvent
     (-apply-update [_ state]
       (update-in state [:shapes-by-id sid]
-                 sh/rotate rotation))))
+                 geom/rotate rotation))))
 
 (defn update-size
   "A helper event just for update the position
@@ -92,9 +92,15 @@
     udp/IPageUpdate
     rs/UpdateEvent
     (-apply-update [_ state]
-      (let [shape (get-in state [:shapes-by-id sid])
-            size (merge (sh/size shape) opts)]
-        (update-in state [:shapes-by-id sid] sh/resize' size)))))
+      (letfn [(resize [shape {:keys [width height] :as size}]
+                (let [x1 (:x1 shape)
+                      y1 (:y1 shape)]
+                  (assoc shape
+                         :x2 (+ x1 width)
+                         :y2 (+ y1 height))))]
+        (let [shape (get-in state [:shapes-by-id sid])
+              size (merge (geom/size shape) opts)]
+          (update-in state [:shapes-by-id sid] resize size))))))
 
 (defn update-vertex-position
   [id {:keys [vid delta]}]
@@ -102,7 +108,7 @@
     udp/IPageUpdate
     rs/UpdateEvent
     (-apply-update [_ state]
-      (update-in state [:shapes-by-id id] sh/move-vertex vid delta))))
+      (update-in state [:shapes-by-id id] geom/move-vertex vid delta))))
 
 (defn update-position
   "Update the start position coordenate of the shape."
@@ -110,7 +116,7 @@
   (reify
     rs/UpdateEvent
     (-apply-update [_ state]
-      (update-in state [:shapes-by-id sid] sh/move' opts))))
+      (update-in state [:shapes-by-id sid] geom/absolute-move opts))))
 
 (defn update-text
   "Update the start position coordenate of the shape."
@@ -185,7 +191,7 @@
     rs/WatchEvent
     (-apply-watch [_ state s]
       (let [shape (get-in state [:shapes-by-id sid])]
-        (if-not (= (:type shape) :builtin/group)
+        (if-not (= (:type shape) :group)
           (rx/empty)
           (rx/from-coll
            (map hide-shape (:items shape))))))))
@@ -201,7 +207,7 @@
     rs/WatchEvent
     (-apply-watch [_ state s]
       (let [shape (get-in state [:shapes-by-id sid])]
-        (if-not (= (:type shape) :builtin/group)
+        (if-not (= (:type shape) :group)
           (rx/empty)
           (rx/from-coll
            (map show-shape (:items shape))))))))
@@ -217,7 +223,7 @@
     rs/WatchEvent
     (-apply-watch [_ state s]
       (let [shape (get-in state [:shapes-by-id sid])]
-        (if-not (= (:type shape) :builtin/group)
+        (if-not (= (:type shape) :group)
           (rx/empty)
           (rx/from-coll
            (map block-shape (:items shape))))))))
@@ -233,7 +239,7 @@
     rs/WatchEvent
     (-apply-watch [_ state s]
       (let [shape (get-in state [:shapes-by-id sid])]
-        (if-not (= (:type shape) :builtin/group)
+        (if-not (= (:type shape) :group)
           (rx/empty)
           (rx/from-coll
            (map unblock-shape (:items shape))))))))
@@ -249,7 +255,7 @@
     rs/WatchEvent
     (-apply-watch [_ state s]
       (let [shape (get-in state [:shapes-by-id sid])]
-        (if-not (= (:type shape) :builtin/group)
+        (if-not (= (:type shape) :group)
           (rx/empty)
           (rx/from-coll
            (map lock-shape (:items shape))))))))
@@ -265,7 +271,7 @@
     rs/WatchEvent
     (-apply-watch [_ state s]
       (let [shape (get-in state [:shapes-by-id sid])]
-        (if-not (= (:type shape) :builtin/group)
+        (if-not (= (:type shape) :group)
           (rx/empty)
           (rx/from-coll
            (map unlock-shape (:items shape))))))))
@@ -305,36 +311,12 @@
 
 ;; --- Select Shapes
 
-(defn- not-blocked-group?
-  "Check if the shape is a blocked group."
-  [shape]
-  (and (not (:blocked shape))
-       (= :builtin/group (:type shape))))
-
-(defn- has-blocked-parent?
-  "Check if shape has blocked parent."
-  [shape]
-  (sh/parent-satisfies? shape :blocked))
-
-(defn- has-locked-parent?
-  [shape]
-  (sh/parent-satisfies? shape :locked))
-
 (defrecord SelectShapes [selrect]
   rs/UpdateEvent
   (-apply-update [_ state]
-    (let [pageid (get-in state [:workspace :page])
-          xform (comp (filter #(= (:page %) pageid))
-                      (remove :hidden)
-                      (remove :blocked)
-                      (remove not-blocked-group?)
-                      (remove has-locked-parent?)
-                      (remove has-blocked-parent?)
-                      (map sh/outer-rect')
-                      (filter #(sh/contained-in? % selrect))
-                      (map :id))]
-      (->> (into #{} xform (vals (:shapes-by-id state)))
-           (assoc-in state [:workspace :selected])))))
+    (let [page (get-in state [:workspace :page])
+          shapes (stsh/match-by-selrect state page selrect)]
+      (assoc-in state [:workspace :selected] shapes))))
 
 (defn select-shapes
   "Select shapes that matches the select rect."
@@ -380,7 +362,7 @@
               pid (get-in state [:workspace :page])
               selected (get-in state [:workspace :selected])
               selected' (map #(get shapes-by-id %) selected)
-              group {:type :builtin/group
+              group {:type :group
                     :name (str "Group " (rand-int 1000))
                     :items (into [] selected)
                     :id sid
diff --git a/src/uxbox/data/workspace.cljs b/src/uxbox/data/workspace.cljs
index db61a4985..b963d9527 100644
--- a/src/uxbox/data/workspace.cljs
+++ b/src/uxbox/data/workspace.cljs
@@ -8,7 +8,6 @@
 (ns uxbox.data.workspace
   (:require [beicon.core :as rx]
             [uxbox.constants :as c]
-            [uxbox.shapes :as sh]
             [uxbox.rstore :as rs]
             [uxbox.state.shapes :as stsh]
             [uxbox.schema :as sc]
diff --git a/src/uxbox/library/icons/material/actions.cljs b/src/uxbox/library/icons/material/actions.cljs
index ccc232129..9301ede63 100644
--- a/src/uxbox/library/icons/material/actions.cljs
+++ b/src/uxbox/library/icons/material/actions.cljs
@@ -7,217 +7,217 @@
 (def +icons+
   [{:name "Attachment"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M15 36c-6.08 0-11-4.93-11-11s4.92-11 11-11h21c4.42 0 8 3.58 8 8s-3.58 8-8 8h-17c-2.76 0-5-2.24-5-5s2.24-5 5-5h15v3h-15c-1.1 0-2 .89-2 2s.9 2 2 2h17c2.76 0 5-2.24 5-5s-2.24-5-5-5h-21c-4.42 0-8 3.58-8 8s3.58 8 8 8h19v3h-19z"}]}
    {:name "Cloud"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M38.71 20.07c-1.36-6.88-7.43-12.07-14.71-12.07-5.78 0-10.79 3.28-13.3 8.07-6.01.65-10.7 5.74-10.7 11.93 0 6.63 5.37 12 12 12h26c5.52 0 10-4.48 10-10 0-5.28-4.11-9.56-9.29-9.93z"}]}
    {:name "3d rotation"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M15.03 42.97c-6.53-3.1-11.22-9.45-11.93-16.97h-3c1.02 12.32 11.32 22 23.9 22 .45 0 .88-.04 1.32-.07l-7.62-7.63-2.67 2.67zm1.78-13.05c-.38 0-.73-.05-1.05-.17-.31-.11-.58-.27-.8-.47-.22-.2-.39-.45-.51-.73-.12-.29-.18-.6-.18-.94h-2.6c0 .72.14 1.35.42 1.9.28.55.65 1.01 1.12 1.37.47.37 1.01.64 1.63.83.62.2 1.26.29 1.94.29.74 0 1.43-.1 2.07-.3.64-.2 1.19-.5 1.66-.89s.83-.87 1.1-1.44c.26-.57.4-1.22.4-1.95 0-.39-.05-.76-.14-1.12-.1-.36-.25-.7-.45-1.02-.21-.32-.48-.6-.81-.86-.33-.25-.74-.46-1.21-.63.4-.18.75-.4 1.05-.66.3-.26.55-.54.75-.83.2-.3.35-.6.45-.92.1-.32.15-.64.15-.95 0-.73-.12-1.37-.36-1.92-.24-.55-.58-1.01-1.02-1.38-.44-.37-.96-.65-1.58-.84-.64-.2-1.32-.29-2.06-.29-.72 0-1.39.11-2 .32-.61.21-1.13.51-1.57.89-.44.38-.78.83-1.03 1.35-.25.52-.37 1.09-.37 1.7h2.6c0-.34.06-.64.18-.9.12-.27.29-.5.5-.68.21-.19.47-.34.76-.44.29-.1.61-.16.95-.16.8 0 1.39.21 1.78.62.39.41.58.99.58 1.73 0 .36-.05.68-.16.97-.11.29-.27.54-.49.75-.22.21-.5.37-.82.49-.33.12-.72.18-1.16.18h-1.54v2.05h1.54c.44 0 .84.05 1.19.15.35.1.65.25.9.47.25.21.44.48.58.8.13.32.2.7.2 1.14 0 .81-.23 1.43-.7 1.86-.45.42-1.08.63-1.89.63zm17.12-11.85c-.63-.66-1.39-1.17-2.27-1.53-.89-.36-1.86-.54-2.93-.54h-4.73v16h4.59c1.11 0 2.11-.18 3.02-.54.91-.36 1.68-.87 2.32-1.53.64-.66 1.14-1.46 1.48-2.39.35-.93.52-1.98.52-3.14v-.79c0-1.16-.18-2.2-.53-3.14-.35-.94-.84-1.74-1.47-2.4zm-.79 6.34c0 .83-.09 1.59-.29 2.25-.19.67-.47 1.23-.85 1.69-.38.46-.85.81-1.42 1.06-.57.24-1.23.37-1.99.37h-1.81v-11.54h1.95c1.44 0 2.53.46 3.29 1.37.75.92 1.13 2.24 1.13 3.98v.82zm-9.14-24.41c-.45 0-.88.04-1.32.07l7.62 7.63 2.66-2.66c6.54 3.09 11.23 9.44 11.94 16.96h3c-1.02-12.32-11.32-22-23.9-22z" :style {:stroke nil}}]}
    {:name "accesiblity"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M24 4c2.21 0 4 1.79 4 4s-1.79 4-4 4-4-1.79-4-4 1.79-4 4-4zm18 14h-12v26h-4v-12h-4v12h-4v-26h-12v-4h36v4z" :style {:stroke nil}}]}
    {:name "Account Balance"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M8 20v14h6v-14h-6zm12 0v14h6v-14h-6zm-16 24h38v-6h-38v6zm28-24v14h6v-14h-6zm-9-18l-19 10v4h38v-4l-19-10z" :style {:stroke nil}}]}
    {:name "Account Balance Wallet"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M42 36v2c0 2.21-1.79 4-4 4h-28c-2.21 0-4-1.79-4-4v-28c0-2.21 1.79-4 4-4h28c2.21 0 4 1.79 4 4v2h-18c-2.21 0-4 1.79-4 4v16c0 2.21 1.79 4 4 4h18zm-18-4h20v-16h-20v16zm8-5c-1.66 0-3-1.34-3-3s1.34-3 3-3 3 1.34 3 3-1.34 3-3 3z" :style {:stroke nil}}]}
    {:name "Account Box"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M6 10v28c0 2.21 1.79 4 4 4h28c2.21 0 4-1.79 4-4v-28c0-2.21-1.79-4-4-4h-28c-2.21 0-4 1.79-4 4zm24 8c0 3.32-2.69 6-6 6s-6-2.68-6-6c0-3.31 2.69-6 6-6s6 2.69 6 6zm-18 16c0-4 8-6.2 12-6.2s12 2.2 12 6.2v2h-24v-2z" :style {:stroke nil}}]}
    {:name "Account Child"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M33 24c2.76 0 4.98-2.24 4.98-5s-2.22-5-4.98-5c-2.76 0-5 2.24-5 5s2.24 5 5 5zm-15-2c3.31 0 5.98-2.69 5.98-6s-2.67-6-5.98-6c-3.31 0-6 2.69-6 6s2.69 6 6 6zm15 6c-3.67 0-11 1.84-11 5.5v4.5h22v-4.5c0-3.66-7.33-5.5-11-5.5zm-15-2c-4.67 0-14 2.34-14 7v5h14v-4.5c0-1.7.67-4.67 4.74-6.94-1.74-.37-3.43-.56-4.74-.56z" :style {:stroke nil}}]}
    {:name "Account Circle"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M24 4c-11.05 0-20 8.95-20 20s8.95 20 20 20 20-8.95 20-20-8.95-20-20-20zm0 6c3.31 0 6 2.69 6 6 0 3.32-2.69 6-6 6s-6-2.68-6-6c0-3.31 2.69-6 6-6zm0 28.4c-5.01 0-9.41-2.56-12-6.44.05-3.97 8.01-6.16 12-6.16s11.94 2.19 12 6.16c-2.59 3.88-6.99 6.44-12 6.44z" :style {:stroke nil}}]}
    {:name "Add Shopping Cart"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M22 18h4v-6h6v-4h-6v-6h-4v6h-6v4h6v6zm-8 18c-2.21 0-3.98 1.79-3.98 4s1.77 4 3.98 4 4-1.79 4-4-1.79-4-4-4zm20 0c-2.21 0-3.98 1.79-3.98 4s1.77 4 3.98 4 4-1.79 4-4-1.79-4-4-4zm-19.65-6.5c0-.09.02-.17.06-.24l1.8-3.26h14.9c1.5 0 2.81-.83 3.5-2.06l7.72-14.02-3.5-1.92h-.01l-2.21 4-5.51 10h-14.03l-.26-.54-4.49-9.46-1.9-4-1.89-4h-6.53v4h4l7.2 15.17-2.71 4.9c-.31.58-.49 1.23-.49 1.93 0 2.21 1.79 4 4 4h24v-4h-23.15c-.28 0-.5-.22-.5-.5z" :style {:stroke nil}}]}
    {:name "Alarm"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M44 11.44l-9.19-7.71-2.57 3.06 9.19 7.71 2.57-3.06zm-28.24-4.66l-2.57-3.06-9.19 7.71 2.57 3.06 9.19-7.71zm9.24 9.22h-3v12l9.49 5.71 1.51-2.47-8-4.74v-10.5zm-1.01-8c-9.95 0-17.99 8.06-17.99 18s8.04 18 17.99 18 18.01-8.06 18.01-18-8.06-18-18.01-18zm.01 32c-7.73 0-14-6.27-14-14s6.27-14 14-14 14 6.27 14 14-6.26 14-14 14z" :style {:stroke nil}}]}
    {:name "Alarm Add"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M15.76 6.78l-2.57-3.06-9.19 7.71 2.57 3.06 9.19-7.71zm28.24 4.66l-9.19-7.71-2.57 3.06 9.19 7.71 2.57-3.06zm-20.01-3.44c-9.95 0-17.99 8.06-17.99 18s8.04 18 17.99 18 18.01-8.06 18.01-18-8.06-18-18.01-18zm.01 32c-7.73 0-14-6.27-14-14s6.27-14 14-14 14 6.27 14 14-6.26 14-14 14zm2-22h-4v6h-6v4h6v6h4v-6h6v-4h-6v-6z" :style {:stroke nil}}]}
    {:name "Alarm Off"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M24 12c7.73 0 14 6.27 14 14 0 1.69-.31 3.3-.86 4.8l3.04 3.04c1.16-2.37 1.82-5.03 1.82-7.84 0-9.94-8.06-18-18.01-18-2.81 0-5.46.66-7.84 1.81l3.05 3.05c1.5-.55 3.11-.86 4.8-.86zm20-.56l-9.19-7.71-2.57 3.06 9.19 7.71 2.57-3.06zm-38.16-6.85l-2.55 2.54 2.66 2.66-2.22 1.86 2.84 2.84 2.22-1.86 1.6 1.6c-2.73 3.16-4.39 7.27-4.39 11.77 0 9.94 8.04 18 17.99 18 4.51 0 8.62-1.67 11.77-4.4l4.4 4.4 2.54-2.55-34.91-34.91-1.95-1.95zm27.1 32.19c-2.43 2.01-5.54 3.22-8.94 3.22-7.73 0-14-6.27-14-14 0-3.4 1.21-6.51 3.22-8.94l19.72 19.72zm-16.91-30.23l-2.84-2.84-1.7 1.43 2.84 2.84 1.7-1.43z" :style {:stroke nil}}]}
    {:name "Alarm Off"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M44 11.44l-9.19-7.71-2.57 3.06 9.19 7.71 2.57-3.06zm-28.24-4.66l-2.57-3.06-9.19 7.71 2.57 3.06 9.19-7.71zm8.23 1.22c-9.95 0-17.99 8.06-17.99 18s8.04 18 17.99 18 18.01-8.06 18.01-18-8.06-18-18.01-18zm.01 32c-7.73 0-14-6.27-14-14s6.27-14 14-14 14 6.27 14 14-6.26 14-14 14zm-2.93-10.95l-4.24-4.24-2.12 2.12 6.36 6.36 12.01-12.01-2.12-2.12-9.89 9.89z" :style {:stroke nil}}]}
    {:name "Android"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M12 36c0 1.1.9 2 2 2h2v7c0 1.66 1.34 3 3 3s3-1.34 3-3v-7h4v7c0 1.66 1.34 3 3 3s3-1.34 3-3v-7h2c1.1 0 2-.9 2-2v-20h-24v20zm-5-20c-1.66 0-3 1.34-3 3v14c0 1.66 1.34 3 3 3s3-1.34 3-3v-14c0-1.66-1.34-3-3-3zm34 0c-1.66 0-3 1.34-3 3v14c0 1.66 1.34 3 3 3s3-1.34 3-3v-14c0-1.66-1.34-3-3-3zm-9.94-11.68l2.61-2.61c.39-.39.39-1.02 0-1.41-.39-.39-1.02-.39-1.41 0l-2.96 2.95c-1.6-.79-3.39-1.25-5.3-1.25-1.92 0-3.72.46-5.33 1.26l-2.97-2.97c-.39-.39-1.02-.39-1.41 0-.39.39-.39 1.02 0 1.41l2.62 2.62c-2.97 2.19-4.91 5.71-4.91 9.68h24c0-3.98-1.95-7.5-4.94-9.68zm-11.06 5.68h-2v-2h2v2zm10 0h-2v-2h2v2z" :style {:stroke nil}}]}
    {:name "Announcement"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M40 4h-32c-2.21 0-3.98 1.79-3.98 4l-.02 36 8-8h28c2.21 0 4-1.79 4-4v-24c0-2.21-1.79-4-4-4zm-14 18h-4v-12h4v12zm0 8h-4v-4h4v4z" :style {:stroke nil}}]}
    {:name "Aspect Ratio"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M38 24h-4v6h-6v4h10v-10zm-24-6h6v-4h-10v10h4v-6zm28-12h-36c-2.21 0-4 1.79-4 4v28c0 2.21 1.79 4 4 4h36c2.21 0 4-1.79 4-4v-28c0-2.21-1.79-4-4-4zm0 32.03h-36v-28.06h36v28.06z" :style {:stroke nil}}]}
    {:name "Assesment"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M38 6h-28c-2.21 0-4 1.79-4 4v28c0 2.21 1.79 4 4 4h28c2.21 0 4-1.79 4-4v-28c0-2.21-1.79-4-4-4zm-20 28h-4v-14h4v14zm8 0h-4v-20h4v20zm8 0h-4v-8h4v8z" :style {:stroke nil}}]}
    {:name "Assignment"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M38 6h-8.37c-.82-2.32-3.02-4-5.63-4s-4.81 1.68-5.63 4h-8.37c-2.21 0-4 1.79-4 4v28c0 2.21 1.79 4 4 4h28c2.21 0 4-1.79 4-4v-28c0-2.21-1.79-4-4-4zm-14 0c1.1 0 2 .89 2 2s-.9 2-2 2-2-.89-2-2 .9-2 2-2zm4 28h-14v-4h14v4zm6-8h-20v-4h20v4zm0-8h-20v-4h20v4z" :style {:stroke nil}}]}
    {:name "Assignment Ind"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M38 6h-8.37c-.82-2.32-3.02-4-5.63-4s-4.81 1.68-5.63 4h-8.37c-2.21 0-4 1.79-4 4v28c0 2.21 1.79 4 4 4h28c2.21 0 4-1.79 4-4v-28c0-2.21-1.79-4-4-4zm-14 0c1.1 0 2 .89 2 2s-.9 2-2 2-2-.89-2-2 .9-2 2-2zm0 8c3.31 0 6 2.69 6 6 0 3.32-2.69 6-6 6s-6-2.68-6-6c0-3.31 2.69-6 6-6zm12 24h-24v-2.8c0-4 8-6.2 12-6.2s12 2.2 12 6.2v2.8z" :style {:stroke nil}}]}
    {:name "Assignment Late"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M38 6h-8.37c-.82-2.32-3.02-4-5.63-4s-4.81 1.68-5.63 4h-8.37c-2.21 0-4 1.79-4 4v28c0 2.21 1.79 4 4 4h28c2.21 0 4-1.79 4-4v-28c0-2.21-1.79-4-4-4zm-12 30h-4v-4h4v4zm0-8h-4v-12h4v12zm-2-18c-1.1 0-2-.89-2-2s.9-2 2-2 2 .89 2 2-.9 2-2 2z" :style {:stroke nil}}]}
    {:name "Assignment Return"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M38 6h-8.37c-.82-2.32-3.02-4-5.63-4s-4.81 1.68-5.63 4h-8.37c-2.21 0-4 1.79-4 4v28c0 2.21 1.79 4 4 4h28c2.21 0 4-1.79 4-4v-28c0-2.21-1.79-4-4-4zm-14 0c1.1 0 2 .89 2 2s-.9 2-2 2-2-.89-2-2 .9-2 2-2zm8 24h-8v6l-10-10 10-10v6h8v8z" :style {:stroke nil}}]}
    {:name "Assignment Returned"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M38 6h-8.37c-.82-2.32-3.02-4-5.63-4s-4.81 1.68-5.63 4h-8.37c-2.21 0-4 1.79-4 4v28c0 2.21 1.79 4 4 4h28c2.21 0 4-1.79 4-4v-28c0-2.21-1.79-4-4-4zm-14 0c1.1 0 2 .89 2 2s-.9 2-2 2-2-.89-2-2 .9-2 2-2zm0 30l-10-10h6v-8h8v8h6l-10 10z" :style {:stroke nil}}]}
    {:name "Autorenew"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M24 12v6l8-8-8-8v6c-8.84 0-16 7.16-16 16 0 3.14.92 6.05 2.48 8.52l2.92-2.92c-.89-1.67-1.4-3.57-1.4-5.6 0-6.63 5.37-12 12-12zm13.52 3.48l-2.92 2.92c.89 1.67 1.4 3.57 1.4 5.6 0 6.63-5.37 12-12 12v-6l-8 8 8 8v-6c8.84 0 16-7.16 16-16 0-3.14-.92-6.05-2.48-8.52z" :style {:stroke nil}}]}
    {:name "Backup"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M38.71 20.07c-1.36-6.88-7.43-12.07-14.71-12.07-5.78 0-10.79 3.28-13.3 8.07-6.01.65-10.7 5.74-10.7 11.93 0 6.63 5.37 12 12 12h26c5.52 0 10-4.48 10-10 0-5.28-4.11-9.56-9.29-9.93zm-10.71 5.93v8h-8v-8h-6l10-10 10 10h-6z" :style {:stroke nil}}]}
    {:name "Book"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M36 4h-24c-2.21 0-4 1.79-4 4v32c0 2.21 1.79 4 4 4h24c2.21 0 4-1.79 4-4v-32c0-2.21-1.79-4-4-4zm-24 4h10v16l-5-3-5 3v-16z" :style {:stroke nil}}]}
    {:name "Bookmark"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M34 6h-20c-2.21 0-3.98 1.79-3.98 4l-.02 32 14-6 14 6v-32c0-2.21-1.79-4-4-4z" :style {:stroke nil}}]}
    {:name "Bookmark Outline"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M34 6h-20c-2.21 0-3.98 1.79-3.98 4l-.02 32 14-6 14 6v-32c0-2.21-1.79-4-4-4zm0 30l-10-4.35-10 4.35v-26h20v26z" :style {:stroke nil}}]}
    {:name "Bug Report"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M40 16h-5.62c-.9-1.56-2.14-2.91-3.63-3.92l3.25-3.25-2.83-2.83-4.35 4.35c-.9-.22-1.85-.35-2.82-.35-.97 0-1.92.13-2.82.35l-4.35-4.35-2.83 2.83 3.25 3.25c-1.49 1.01-2.73 2.36-3.63 3.92h-5.62v4h4.18c-.11.65-.18 1.32-.18 2v2h-4v4h4v2c0 .68.07 1.35.18 2h-4.18v4h5.62c2.07 3.58 5.94 6 10.38 6s8.31-2.42 10.38-6h5.62v-4h-4.18c.11-.65.18-1.32.18-2v-2h4v-4h-4v-2c0-.68-.07-1.35-.18-2h4.18v-4zm-12 16h-8v-4h8v4zm0-8h-8v-4h8v4z" :style {:stroke nil}}]}
    {:name "Cached"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M38 16l-8 8h6c0 6.63-5.37 12-12 12-2.03 0-3.93-.51-5.61-1.39l-2.92 2.92c2.48 1.55 5.39 2.47 8.53 2.47 8.84 0 16-7.16 16-16h6l-8-8zm-26 8c0-6.63 5.37-12 12-12 2.03 0 3.93.51 5.61 1.39l2.92-2.92c-2.48-1.55-5.39-2.47-8.53-2.47-8.84 0-16 7.16-16 16h-6l8 8 8-8h-6z" :style {:stroke nil}}]}
    {:name "Class"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M36 4h-24c-2.21 0-4 1.79-4 4v32c0 2.21 1.79 4 4 4h24c2.21 0 4-1.79 4-4v-32c0-2.21-1.79-4-4-4zm-24 4h10v16l-5-3-5 3v-16z" :style {:stroke nil}}]}
    {:name "Credit Card"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M40 8h-32c-2.21 0-3.98 1.79-3.98 4l-.02 24c0 2.21 1.79 4 4 4h32c2.21 0 4-1.79 4-4v-24c0-2.21-1.79-4-4-4zm0 28h-32v-12h32v12zm0-20h-32v-4h32v4z" :style {:stroke nil}}]}
    {:name "Dashboard"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M6 26h16v-20h-16v20zm0 16h16v-12h-16v12zm20 0h16v-20h-16v20zm0-36v12h16v-12h-16z" :style {:stroke nil}}]}
    {:name "Delete"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M12 38c0 2.21 1.79 4 4 4h16c2.21 0 4-1.79 4-4v-24h-24v24zm26-30h-7l-2-2h-10l-2 2h-7v4h28v-4z" :style {:stroke nil}}]}
    {:name "Description"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M28 4h-16c-2.21 0-3.98 1.79-3.98 4l-.02 32c0 2.21 1.77 4 3.98 4h24.02c2.21 0 4-1.79 4-4v-24l-12-12zm4 32h-16v-4h16v4zm0-8h-16v-4h16v4zm-6-10v-11l11 11h-11z" :style {:stroke nil}}]}
    {:name "DNS"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M40 26h-32c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h32c1.1 0 2-.9 2-2v-12c0-1.1-.9-2-2-2zm-26 12c-2.21 0-4-1.79-4-4s1.79-4 4-4 4 1.79 4 4-1.79 4-4 4zm26-32h-32c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h32c1.1 0 2-.9 2-2v-12c0-1.1-.9-2-2-2zm-26 12c-2.21 0-4-1.79-4-4s1.79-4 4-4 4 1.79 4 4-1.79 4-4 4z" :style {:stroke nil}}]}
    {:name "Done"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M18 32.34l-8.34-8.34-2.83 2.83 11.17 11.17 24-24-2.83-2.83z" :style {:stroke nil}}]}
    {:name "Done All"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M36 14l-2.83-2.83-12.68 12.69 2.83 2.83 12.68-12.69zm8.49-2.83l-21.18 21.17-8.34-8.34-2.83 2.83 11.17 11.17 24-24-2.82-2.83zm-43.66 15.66l11.17 11.17 2.83-2.83-11.17-11.17-2.83 2.83z" :style {:stroke nil}}]}
    {:name "Event"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M34 24h-10v10h10v-10zm-2-22v4h-16v-4h-4v4h-2c-2.21 0-3.98 1.79-3.98 4l-.02 28c0 2.21 1.79 4 4 4h28c2.21 0 4-1.79 4-4v-28c0-2.21-1.79-4-4-4h-2v-4h-4zm6 36h-28v-22h28v22z" :style {:stroke nil}}]}
    {:name "Exit To App"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M20.17 31.17l2.83 2.83 10-10-10-10-2.83 2.83 5.17 5.17h-19.34v4h19.34l-5.17 5.17zm17.83-25.17h-28c-2.21 0-4 1.79-4 4v8h4v-8h28v28h-28v-8h-4v8c0 2.21 1.79 4 4 4h28c2.21 0 4-1.79 4-4v-28c0-2.21-1.79-4-4-4z" :style {:stroke nil}}]}
    {:name "Explore"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M24 21.8c-1.21 0-2.2.99-2.2 2.2s.99 2.2 2.2 2.2c1.22 0 2.2-.99 2.2-2.2s-.98-2.2-2.2-2.2zm0-17.8c-11.05 0-20 8.95-20 20 0 11.04 8.95 20 20 20s20-8.96 20-20c0-11.05-8.95-20-20-20zm4.38 24.38l-16.38 7.62 7.62-16.38 16.38-7.62-7.62 16.38z" :style {:stroke nil}}]}
    {:name "Explore"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M41 22h-3v-8c0-2.21-1.79-4-4-4h-8v-3c0-2.76-2.24-5-5-5s-5 2.24-5 5v3h-8c-2.21 0-3.98 1.79-3.98 4l-.01 7.6h2.99c2.98 0 5.4 2.42 5.4 5.4s-2.42 5.4-5.4 5.4h-2.99l-.01 7.6c0 2.21 1.79 4 4 4h7.6v-3c0-2.98 2.42-5.4 5.4-5.4 2.98 0 5.4 2.42 5.4 5.4v3h7.6c2.21 0 4-1.79 4-4v-8h3c2.76 0 5-2.24 5-5s-2.24-5-5-5z" :style {:stroke nil}}]}
    {:name "Face Unlock"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
            [:path {:d "M29.39 34.21c-1.49 1.15-3.4 1.79-5.39 1.79s-3.9-.64-5.39-1.79c-.43-.34-1.06-.26-1.4.18-.34.44-.26 1.06.18 1.4 1.83 1.42 4.18 2.21 6.61 2.21s4.78-.79 6.61-2.21c.44-.34.52-.97.18-1.4-.34-.44-.97-.52-1.4-.18z" :style {:stroke nil}}]
@@ -226,584 +226,584 @@
            [:circle {:cx "31" :cy "25" :r "2" :style {:stroke nil}}]]}
    {:name "Favorite"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M24 42.7l-2.9-2.63c-10.3-9.35-17.1-15.52-17.1-23.07 0-6.17 4.83-11 11-11 3.48 0 6.82 1.62 9 4.17 2.18-2.55 5.52-4.17 9-4.17 6.17 0 11 4.83 11 11 0 7.55-6.8 13.72-17.1 23.07l-2.9 2.63z" :style {:stroke nil}}]}
    {:name "Favorite Outline"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M33 6c-3.48 0-6.82 1.62-9 4.17-2.18-2.55-5.52-4.17-9-4.17-6.17 0-11 4.83-11 11 0 7.55 6.8 13.72 17.1 23.07l2.9 2.63 2.9-2.63c10.3-9.35 17.1-15.52 17.1-23.07 0-6.17-4.83-11-11-11zm-8.79 31.11l-.21.19-.21-.19c-9.51-8.63-15.79-14.33-15.79-20.11 0-3.99 3.01-7 7-7 3.08 0 6.08 1.99 7.13 4.72h3.73c1.06-2.73 4.06-4.72 7.14-4.72 3.99 0 7 3.01 7 7 0 5.78-6.28 11.48-15.79 20.11z" :style {:stroke nil}}]}
    {:name "Find In Page"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M40 39.17v-23.17l-12-12h-16c-2.21 0-3.98 1.79-3.98 4l-.02 32c0 2.21 1.77 4 3.98 4h24.02c.89 0 1.71-.3 2.37-.8l-8.87-8.87c-1.57 1.05-3.46 1.67-5.5 1.67-5.52 0-10-4.48-10-10s4.48-10 10-10 10 4.48 10 10c0 2.04-.62 3.93-1.66 5.51l7.66 7.66zm-22-13.17c0 3.31 2.69 6 6 6s6-2.69 6-6-2.69-6-6-6-6 2.69-6 6z" :style {:stroke nil}}]}
    {:name "Find Replace"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M22 12c2.76 0 5.26 1.12 7.07 2.93l-5.07 5.07h12v-12l-4.1 4.1c-2.53-2.53-6.03-4.1-9.9-4.1-7.05 0-12.87 5.22-13.84 12h4.04c.93-4.56 4.96-8 9.8-8zm11.28 18.27c1.33-1.81 2.23-3.95 2.56-6.27h-4.04c-.93 4.56-4.96 8-9.8 8-2.76 0-5.26-1.12-7.07-2.93l5.07-5.07h-12v12l4.1-4.1c2.53 2.53 6.03 4.1 9.9 4.1 3.1 0 5.96-1.02 8.28-2.73l9.72 9.71 2.98-2.98-9.7-9.73z" :style {:stroke nil}}]}
    {:name "Flip To Back"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M18 14h-4v4h4v-4zm0 8h-4v4h4v-4zm0-16c-2.21 0-4 1.79-4 4h4v-4zm8 24h-4v4h4v-4zm12-24v4h4c0-2.21-1.79-4-4-4zm-12 0h-4v4h4v-4zm-8 28v-4h-4c0 2.21 1.79 4 4 4zm20-8h4v-4h-4v4zm0-8h4v-4h-4v4zm0 16c2.21 0 4-1.79 4-4h-4v4zm-28-20h-4v24c0 2.21 1.79 4 4 4h24v-4h-24v-24zm20-4h4v-4h-4v4zm0 24h4v-4h-4v4z" :style {:stroke nil}}]}
    {:name "Flip To Front"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M6 26h4v-4h-4v4zm0 8h4v-4h-4v4zm4 8v-4h-4c0 2.21 1.79 4 4 4zm-4-24h4v-4h-4v4zm24 24h4v-4h-4v4zm8-36h-20c-2.21 0-4 1.79-4 4v20c0 2.21 1.79 4 4 4h20c2.21 0 4-1.79 4-4v-20c0-2.21-1.79-4-4-4zm0 24h-20v-20h20v20zm-16 12h4v-4h-4v4zm-8 0h4v-4h-4v4z" :style {:stroke nil}}]}
    {:name "Get App"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M38 18h-8v-12h-12v12h-8l14 14 14-14zm-28 18v4h28v-4h-28z" :style {:stroke nil}}]}
    {:name "Grade"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M24 34.54l12.36 7.46-3.27-14.06 10.91-9.45-14.38-1.24-5.62-13.25-5.62 13.25-14.38 1.24 10.91 9.45-3.27 14.06z" :style {:stroke nil}}]}
    {:name "Group Work"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M24 4c-11.05 0-20 8.95-20 20 0 11.04 8.95 20 20 20s20-8.96 20-20c0-11.05-8.95-20-20-20zm-8 31c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5 5-2.24 5-5 5zm3-19c0-2.76 2.24-5 5-5s5 2.24 5 5-2.24 5-5 5-5-2.24-5-5zm13 19c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5 5-2.24 5-5 5z" :style {:stroke nil}}]}
    {:name "Help"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M24 4c-11.05 0-20 8.95-20 20s8.95 20 20 20 20-8.95 20-20-8.95-20-20-20zm2 34h-4v-4h4v4zm4.13-15.49l-1.79 1.84c-1.44 1.44-2.34 2.65-2.34 5.65h-4v-1c0-2.21.9-4.21 2.34-5.66l2.49-2.52c.72-.72 1.17-1.72 1.17-2.82 0-2.21-1.79-4-4-4s-4 1.79-4 4h-4c0-4.42 3.58-8 8-8s8 3.58 8 8c0 1.76-.71 3.35-1.87 4.51z" :style {:stroke nil}}]}
    {:name "Highlight Remove"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M29.17 16l-5.17 5.17-5.17-5.17-2.83 2.83 5.17 5.17-5.17 5.17 2.83 2.83 5.17-5.17 5.17 5.17 2.83-2.83-5.17-5.17 5.17-5.17-2.83-2.83zm-5.17-12c-11.05 0-20 8.95-20 20s8.95 20 20 20 20-8.95 20-20-8.95-20-20-20zm0 36c-8.82 0-16-7.18-16-16s7.18-16 16-16 16 7.18 16 16-7.18 16-16 16z" :style {:stroke nil}}]}
    {:name "History"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:opacity ".9" :d "M25.99 6c-9.95 0-17.99 8.06-17.99 18h-6l7.79 7.79.14.29 8.07-8.08h-6c0-7.73 6.27-14 14-14s14 6.27 14 14-6.27 14-14 14c-3.87 0-7.36-1.58-9.89-4.11l-2.83 2.83c3.25 3.26 7.74 5.28 12.71 5.28 9.95 0 18.01-8.06 18.01-18s-8.06-18-18.01-18zm-1.99 10v10l8.56 5.08 1.44-2.43-7-4.15v-8.5h-3z" :style {:stroke nil}}]}
    {:name "Home"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M20 40v-12h8v12h10v-16h6l-20-18-20 18h6v16z" :style {:stroke nil}}]}
    {:name "Https"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M36 16h-2v-4c0-5.52-4.48-10-10-10s-10 4.48-10 10v4h-2c-2.21 0-4 1.79-4 4v20c0 2.21 1.79 4 4 4h24c2.21 0 4-1.79 4-4v-20c0-2.21-1.79-4-4-4zm-12 18c-2.21 0-4-1.79-4-4s1.79-4 4-4 4 1.79 4 4-1.79 4-4 4zm6.2-18h-12.4v-4c0-3.42 2.78-6.2 6.2-6.2 3.42 0 6.2 2.78 6.2 6.2v4z" :style {:stroke nil}}]}
    {:name "Info"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M24 4c-11.05 0-20 8.95-20 20s8.95 20 20 20 20-8.95 20-20-8.95-20-20-20zm2 30h-4v-12h4v12zm0-16h-4v-4h4v4z" :style {:stroke nil}}]}
    {:name "Info Outline"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M22 34h4v-12h-4v12zm2-30c-11.05 0-20 8.95-20 20s8.95 20 20 20 20-8.95 20-20-8.95-20-20-20zm0 36c-8.82 0-16-7.18-16-16s7.18-16 16-16 16 7.18 16 16-7.18 16-16 16zm-2-22h4v-4h-4v4z" :style {:stroke nil}}]}
    {:name "Input"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M42 6.02h-36c-2.21 0-4 1.79-4 4v7.98h4v-8.02h36v28.06h-36v-8.04h-4v8.02c0 2.21 1.79 3.96 4 3.96h36c2.21 0 4-1.76 4-3.96v-28c0-2.21-1.79-4-4-4zm-20 25.98l8-8-8-8v6h-20v4h20v6z" :style {:stroke nil}}]}
    {:name "Invert Colors"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M35.31 15.86l-11.31-11.32-11.31 11.32c-6.25 6.25-6.25 16.38 0 22.63 3.12 3.12 7.22 4.69 11.31 4.69s8.19-1.56 11.31-4.69c6.25-6.25 6.25-16.38 0-22.63zm-11.31 23.31c-3.21 0-6.22-1.25-8.48-3.52-2.27-2.26-3.52-5.27-3.52-8.48s1.25-6.22 3.52-8.49l8.48-8.48v28.97z" :style {:stroke nil}}]}
    {:name "Label"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M35.27 11.69c-.73-1.02-1.92-1.69-3.27-1.69l-22 .02c-2.21 0-4 1.77-4 3.98v20c0 2.21 1.79 3.98 4 3.98l22 .02c1.35 0 2.54-.67 3.27-1.69l8.73-12.31-8.73-12.31z" :style {:stroke nil}}]}
    {:name "Label Outline"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M35.27 11.69c-.73-1.02-1.92-1.69-3.27-1.69l-22 .02c-2.21 0-4 1.77-4 3.98v20c0 2.21 1.79 3.98 4 3.98l22 .02c1.35 0 2.54-.67 3.27-1.69l8.73-12.31-8.73-12.31zm-3.27 22.31h-22v-20h22l7.09 10-7.09 10z" :style {:stroke nil}}]}
    {:name "Language"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M23.99 4c-11.05 0-19.99 8.95-19.99 20s8.94 20 19.99 20c11.05 0 20.01-8.95 20.01-20s-8.96-20-20.01-20zm13.85 12h-5.9c-.65-2.5-1.56-4.9-2.76-7.12 3.68 1.26 6.74 3.81 8.66 7.12zm-13.84-7.93c1.67 2.4 2.97 5.07 3.82 7.93h-7.64c.85-2.86 2.15-5.53 3.82-7.93zm-15.48 19.93c-.33-1.28-.52-2.62-.52-4s.19-2.72.52-4h6.75c-.16 1.31-.27 2.64-.27 4 0 1.36.11 2.69.28 4h-6.76zm1.63 4h5.9c.65 2.5 1.56 4.9 2.76 7.13-3.68-1.26-6.74-3.82-8.66-7.13zm5.9-16h-5.9c1.92-3.31 4.98-5.87 8.66-7.13-1.2 2.23-2.11 4.63-2.76 7.13zm7.95 23.93c-1.66-2.4-2.96-5.07-3.82-7.93h7.64c-.86 2.86-2.16 5.53-3.82 7.93zm4.68-11.93h-9.36c-.19-1.31-.32-2.64-.32-4 0-1.36.13-2.69.32-4h9.36c.19 1.31.32 2.64.32 4 0 1.36-.13 2.69-.32 4zm.51 11.12c1.2-2.23 2.11-4.62 2.76-7.12h5.9c-1.93 3.31-4.99 5.86-8.66 7.12zm3.53-11.12c.16-1.31.28-2.64.28-4 0-1.36-.11-2.69-.28-4h6.75c.33 1.28.53 2.62.53 4s-.19 2.72-.53 4h-6.75z" :style {:stroke nil}}]}
    {:name "Launch"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M38 38h-28v-28h14v-4h-14c-2.21 0-4 1.79-4 4v28c0 2.21 1.79 4 4 4h28c2.21 0 4-1.79 4-4v-14h-4v14zm-10-32v4h7.17l-19.66 19.66 2.83 2.83 19.66-19.66v7.17h4v-14h-14z" :style {:stroke nil}}]}
    {:name "List"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M6 26h4v-4h-4v4zm0 8h4v-4h-4v4zm0-16h4v-4h-4v4zm8 8h28v-4h-28v4zm0 8h28v-4h-28v4zm0-20v4h28v-4h-28z" :style {:stroke nil}}]}
    {:name "Lock"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M36 16h-2v-4c0-5.52-4.48-10-10-10s-10 4.48-10 10v4h-2c-2.21 0-4 1.79-4 4v20c0 2.21 1.79 4 4 4h24c2.21 0 4-1.79 4-4v-20c0-2.21-1.79-4-4-4zm-12 18c-2.21 0-4-1.79-4-4s1.79-4 4-4 4 1.79 4 4-1.79 4-4 4zm6.2-18h-12.4v-4c0-3.42 2.78-6.2 6.2-6.2 3.42 0 6.2 2.78 6.2 6.2v4z" :style {:stroke nil}}]}
    {:name "Lock Open"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M24 34c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm12-18h-2v-4c0-5.52-4.48-10-10-10s-10 4.48-10 10h3.8c0-3.42 2.78-6.2 6.2-6.2 3.42 0 6.2 2.78 6.2 6.2v4h-18.2c-2.21 0-4 1.79-4 4v20c0 2.21 1.79 4 4 4h24c2.21 0 4-1.79 4-4v-20c0-2.21-1.79-4-4-4zm0 24h-24v-20h24v20z" :style {:stroke nil}}]}
    {:name "Lock Outline"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M36 16h-2v-4c0-5.52-4.48-10-10-10s-10 4.48-10 10v4h-2c-2.21 0-4 1.79-4 4v20c0 2.21 1.79 4 4 4h24c2.21 0 4-1.79 4-4v-20c0-2.21-1.79-4-4-4zm-12-10.2c3.42 0 6.2 2.78 6.2 6.2v4h-12.2v-4h-.2c0-3.42 2.78-6.2 6.2-6.2zm12 34.2h-24v-20h24v20zm-12-6c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4z" :style {:stroke nil}}]}
    {:name "Loyalty"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M42.82 23.16l-17.99-17.99c-.72-.72-1.72-1.17-2.83-1.17h-14c-2.21 0-4 1.79-4 4v14c0 1.11.45 2.11 1.18 2.83l18 18c.72.72 1.72 1.17 2.82 1.17 1.11 0 2.11-.45 2.83-1.17l14-14c.72-.73 1.17-1.73 1.17-2.83 0-1.11-.45-2.11-1.18-2.84zm-31.82-9.16c-1.66 0-3-1.34-3-3s1.34-3 3-3 3 1.34 3 3-1.34 3-3 3zm23.54 16.54l-8.54 8.54-8.54-8.54c-.9-.91-1.46-2.16-1.46-3.54 0-2.76 2.24-5 5-5 1.38 0 2.64.56 3.54 1.47l1.46 1.46 1.46-1.46c.91-.91 2.16-1.47 3.54-1.47 2.76 0 5 2.24 5 5 0 1.38-.56 2.63-1.46 3.54z" :style {:stroke nil}}]}
    {:name "Markunread mailbox"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M40 12h-20v12h-4v-16h12v-8h-16v12h-4c-2.2 0-4 1.8-4 4v24c0 2.2 1.8 4 4 4h32c2.2 0 4-1.8 4-4v-24c0-2.2-1.8-4-4-4z" :style {:stroke nil}}]}
    {:name "Note Add"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M28 4h-16c-2.21 0-3.98 1.79-3.98 4l-.02 32c0 2.21 1.77 4 3.98 4h24.02c2.21 0 4-1.79 4-4v-24l-12-12zm4 28h-6v6h-4v-6h-6v-4h6v-6h4v6h6v4zm-6-14v-11l11 11h-11z" :style {:stroke nil}}]}
    {:name "Open In Browser"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M38 8h-28c-2.21 0-4 1.79-4 4v24c0 2.21 1.79 4 4 4h8v-4h-8v-20h28v20h-8v4h8c2.21 0 4-1.79 4-4v-24c0-2.21-1.79-4-4-4zm-14 12l-8 8h6v12h4v-12h6l-8-8z" :style {:stroke nil}}]}
    {:name "Open In New"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M38 38h-28v-28h14v-4h-14c-2.21 0-4 1.79-4 4v28c0 2.21 1.79 4 4 4h28c2.21 0 4-1.79 4-4v-14h-4v14zm-10-32v4h7.17l-19.66 19.66 2.83 2.83 19.66-19.66v7.17h4v-14h-14z" :style {:stroke nil}}]}
    {:name "Open With"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M20 18h8v-6h6l-10-10-10 10h6v6zm-2 2h-6v-6l-10 10 10 10v-6h6v-8zm28 4l-10-10v6h-6v8h6v6l10-10zm-18 6h-8v6h-6l10 10 10-10h-6v-6z" :style {:stroke nil}}]}
    {:name "Pageview"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M22 16c-3.31 0-6 2.69-6 6s2.69 6 6 6 6-2.69 6-6-2.69-6-6-6zm16-10h-28c-2.21 0-4 1.79-4 4v28c0 2.21 1.79 4 4 4h28c2.21 0 4-1.79 4-4v-28c0-2.21-1.79-4-4-4zm-2.83 32l-7.66-7.66c-1.58 1.04-3.47 1.66-5.51 1.66-5.52 0-10-4.48-10-10s4.48-10 10-10 10 4.48 10 10c0 2.04-.62 3.93-1.66 5.51l7.66 7.66-2.83 2.83z" :style {:stroke nil}}]}
    {:name "Payment"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M40 8h-32c-2.21 0-3.98 1.79-3.98 4l-.02 24c0 2.21 1.79 4 4 4h32c2.21 0 4-1.79 4-4v-24c0-2.21-1.79-4-4-4zm0 28h-32v-12h32v12zm0-20h-32v-4h32v4z" :style {:stroke nil}}]}
    {:name "Perm Camera Mic"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M40 10h-6.34l-3.66-4h-12l-3.66 4h-6.34c-2.21 0-4 1.79-4 4v24c0 2.21 1.79 4 4 4h14v-4.18c-5.67-.96-10-5.89-10-11.82h4c0 4.41 3.59 8 8 8s8-3.59 8-8h4c0 5.93-4.33 10.86-10 11.82v4.18h14c2.21 0 4-1.79 4-4v-24c0-2.21-1.79-4-4-4zm-12 16c0 2.21-1.79 4-4 4s-4-1.79-4-4v-8c0-2.21 1.79-4 4-4s4 1.79 4 4v8z" :style {:stroke nil}}]}
    {:name "Perm Contact Cal"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M38 6h-2v-4h-4v4h-16v-4h-4v4h-2c-2.21 0-4 1.79-4 4v28c0 2.21 1.79 4 4 4h28c2.21 0 4-1.79 4-4v-28c0-2.21-1.79-4-4-4zm-14 6c3.31 0 6 2.69 6 6 0 3.32-2.69 6-6 6s-6-2.68-6-6c0-3.31 2.69-6 6-6zm12 24h-24v-2c0-4 8-6.2 12-6.2s12 2.2 12 6.2v2z" :style {:stroke nil}}]}
    {:name "Perm Data Setting"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M37.98 23c.68 0 1.36.06 2.02.15v-23.15l-40 40h23.13c-.09-.66-.15-1.32-.15-2 0-8.28 6.72-15 15-15zm7.43 15.98c.04-.32.07-.64.07-.98 0-.33-.03-.66-.07-.98l2.11-1.65c.19-.15.24-.42.12-.64l-2-3.46c-.12-.22-.39-.3-.61-.22l-2.49 1c-.52-.4-1.08-.73-1.69-.98l-.37-2.65c-.04-.24-.25-.42-.5-.42h-4c-.25 0-.46.18-.49.42l-.37 2.65c-.61.25-1.17.59-1.69.98l-2.49-1c-.23-.09-.49 0-.61.22l-2 3.46c-.13.22-.07.49.12.64l2.11 1.65c-.04.32-.07.65-.07.98 0 .33.03.66.07.98l-2.11 1.65c-.19.15-.24.42-.12.64l2 3.46c.13.22.39.3.61.22l2.49-1c.52.4 1.08.73 1.69.98l.37 2.65c.04.24.25.42.49.42h4c.25 0 .45-.18.49-.42l.37-2.65c.61-.25 1.17-.59 1.69-.98l2.49 1c.23.09.49 0 .61-.22l2-3.46c.13-.22.07-.49-.12-.64l-2.1-1.65zm-7.43 2.02c-1.66 0-3-1.34-3-3s1.34-3 3-3 3 1.34 3 3-1.34 3-3 3z" :style {:stroke nil}}]}
    {:name "Perm Device Info"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M26 14h-4v4h4v-4zm0 8h-4v12h4v-12zm8-19.98l-20-.02c-2.21 0-4 1.79-4 4v36c0 2.21 1.79 4 4 4h20c2.21 0 4-1.79 4-4v-36c0-2.21-1.79-3.98-4-3.98zm0 35.98h-20v-28h20v28z" :style {:stroke nil}}]}
    {:name "Perm Identity"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M24 11.8c2.32 0 4.2 1.88 4.2 4.2s-1.88 4.2-4.2 4.2-4.2-1.88-4.2-4.2 1.88-4.2 4.2-4.2m0 18c5.95 0 12.2 2.91 12.2 4.2v2.2h-24.4v-2.2c0-1.29 6.25-4.2 12.2-4.2m0-21.8c-4.42 0-8 3.58-8 8 0 4.41 3.58 8 8 8s8-3.59 8-8c0-4.42-3.58-8-8-8zm0 18c-5.33 0-16 2.67-16 8v6h32v-6c0-5.33-10.67-8-16-8z" :style {:stroke nil}}]}
    {:name "Perm Media"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M4 12h-4v10h.02l-.02 18c0 2.21 1.79 4 4 4h36v-4h-36v-28zm40-4h-16l-4-4h-12c-2.21 0-3.98 1.79-3.98 4l-.02 24c0 2.21 1.79 4 4 4h32c2.21 0 4-1.79 4-4v-20c0-2.21-1.79-4-4-4zm-30 22l9-12 7 9.01 5-6.01 7 9h-28z" :style {:stroke nil}}]}
    {:name "Perm Phone Msg"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M40 31c-2.49 0-4.9-.4-7.14-1.14-.69-.22-1.48-.06-2.03.49l-4.4 4.41c-5.67-2.88-10.29-7.51-13.18-13.17l4.4-4.42c.55-.55.71-1.34.49-2.03-.74-2.24-1.14-4.65-1.14-7.14 0-1.11-.89-2-2-2h-7c-1.1 0-2 .89-2 2 0 18.78 15.22 34 34 34 1.11 0 2-.89 2-2v-7c0-1.11-.89-2-2-2zm-16-25v20l6-6h12v-14h-18z" :style {:stroke nil}}]}
    {:name "Perm Scan Wifi"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M24 6c-10.09 0-17.71 3.7-24 8.47l24 29.53 24-29.5c-6.29-4.76-13.91-8.5-24-8.5zm2 26h-4v-12h4v12zm-4-16v-4h4v4h-4z" :style {:stroke nil}}]}
    {:name "Picture In Picture"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M38 14h-16v12h16v-12zm4-8h-36c-2.21 0-4 1.79-4 4v28c0 2.21 1.79 3.96 4 3.96h36c2.21 0 4-1.76 4-3.96v-28c0-2.21-1.79-4-4-4zm0 32.03h-36v-28.06h36v28.06z" :style {:stroke nil}}]}
    {:name "Polymer"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M38 8h-8l-15.79 25.26-5.21-9.26 9-16h-8l-9 16 9 16h8l15.79-25.26 5.21 9.26-9 16h8l9-16z" :style {:stroke nil}}]}
    {:name "Print"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M38 16h-28c-3.31 0-6 2.69-6 6v12h8v8h24v-8h8v-12c0-3.31-2.69-6-6-6zm-6 22h-16v-10h16v10zm6-14c-1.11 0-2-.89-2-2s.89-2 2-2c1.11 0 2 .89 2 2s-.89 2-2 2zm-2-18h-24v8h24v-8z" :style {:stroke nil}}]}
    {:name "Query Builder"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M23.99 4c-11.05 0-19.99 8.95-19.99 20s8.94 20 19.99 20c11.05 0 20.01-8.95 20.01-20s-8.96-20-20.01-20zm.01 36c-8.84 0-16-7.16-16-16s7.16-16 16-16 16 7.16 16 16-7.16 16-16 16z" :style {:stroke nil}}]}
    {:name "Question Answer"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M42 12h-4v18h-26v4c0 1.1.9 2 2 2h22l8 8v-30c0-1.1-.9-2-2-2zm-8 12v-18c0-1.1-.9-2-2-2h-26c-1.1 0-2 .9-2 2v28l8-8h20c1.1 0 2-.9 2-2z" :style {:stroke nil}}]}
    {:name "Receipt"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M36 34h-24v-4h24v4zm0-8h-24v-4h24v4zm0-8h-24v-4h24v4zm-30 26l3-3 3 3 3-3 3 3 3-3 3 3 3-3 3 3 3-3 3 3 3-3 3 3v-40l-3 3-3-3-3 3-3-3-3 3-3-3-3 3-3-3-3 3-3-3-3 3-3-3v40z" :style {:stroke nil}}]}
    {:name "Redeem"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M40 12h-4.37c.22-.63.37-1.29.37-2 0-3.31-2.69-6-6-6-2.09 0-3.93 1.07-5 2.69l-1 1.36-1-1.36c-1.07-1.62-2.91-2.69-5-2.69-3.31 0-6 2.69-6 6 0 .71.14 1.37.37 2h-4.37c-2.21 0-3.98 1.79-3.98 4l-.02 22c0 2.21 1.79 4 4 4h32c2.21 0 4-1.79 4-4v-22c0-2.21-1.79-4-4-4zm-10-4c1.1 0 2 .9 2 2s-.9 2-2 2-2-.9-2-2 .9-2 2-2zm-12 0c1.1 0 2 .9 2 2s-.9 2-2 2-2-.9-2-2 .9-2 2-2zm22 30h-32v-4h32v4zm0-10h-32v-12h10.16l-4.16 5.67 3.25 2.33 4.75-6.47 2-2.72 2 2.72 4.75 6.47 3.25-2.33-4.16-5.67h10.16v12z" :style {:stroke nil}}]}
    {:name "Reorder"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M3,15h18v-2H3V15z M3,19h18v-2H3V19z M3,11h18V9H3V11z M3,5v2h18V5H3z" :style {:stroke nil}}]}
    {:name "Report Problem"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M2 42h44l-22-38-22 38zm24-6h-4v-4h4v4zm0-8h-4v-8h4v8z" :style {:stroke nil}}]}
    {:name "Restore"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M25.99 6c-9.95 0-17.99 8.06-17.99 18h-6l7.79 7.79.14.29 8.07-8.08h-6c0-7.73 6.27-14 14-14s14 6.27 14 14-6.27 14-14 14c-3.87 0-7.36-1.58-9.89-4.11l-2.83 2.83c3.25 3.26 7.74 5.28 12.71 5.28 9.95 0 18.01-8.06 18.01-18s-8.06-18-18.01-18zm-1.99 10v10l8.56 5.08 1.44-2.43-7-4.15v-8.5h-3z" :style {:stroke nil}}]}
    {:name "Room"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M24 4c-7.73 0-14 6.27-14 14 0 10.5 14 26 14 26s14-15.5 14-26c0-7.73-6.27-14-14-14zm0 19c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5 5-2.24 5-5 5z" :style {:stroke nil}}]}
    {:name "Schedule"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
            [:path {:fill-opacity ".9" :d "M23.99 4c-11.05 0-19.99 8.95-19.99 20s8.94 20 19.99 20c11.05 0 20.01-8.95 20.01-20s-8.96-20-20.01-20zm.01 36c-8.84 0-16-7.16-16-16s7.16-16 16-16 16 7.16 16 16-7.16 16-16 16z" :style {:stroke nil}}]
            [:path {:fill-opacity ".9" :d "M25 14h-3v12l10.49 6.3 1.51-2.46-9-5.34z" :style {:stroke nil}}]]}
    {:name "Search"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M31 28h-1.59l-.55-.55c1.96-2.27 3.14-5.22 3.14-8.45 0-7.18-5.82-13-13-13s-13 5.82-13 13 5.82 13 13 13c3.23 0 6.18-1.18 8.45-3.13l.55.55v1.58l10 9.98 2.98-2.98-9.98-10zm-12 0c-4.97 0-9-4.03-9-9s4.03-9 9-9 9 4.03 9 9-4.03 9-9 9z" :style {:stroke nil}}]}
    {:name "Settings"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M38.86 25.95c.08-.64.14-1.29.14-1.95s-.06-1.31-.14-1.95l4.23-3.31c.38-.3.49-.84.24-1.28l-4-6.93c-.25-.43-.77-.61-1.22-.43l-4.98 2.01c-1.03-.79-2.16-1.46-3.38-1.97l-.75-5.3c-.09-.47-.5-.84-1-.84h-8c-.5 0-.91.37-.99.84l-.75 5.3c-1.22.51-2.35 1.17-3.38 1.97l-4.98-2.01c-.45-.17-.97 0-1.22.43l-4 6.93c-.25.43-.14.97.24 1.28l4.22 3.31c-.08.64-.14 1.29-.14 1.95s.06 1.31.14 1.95l-4.22 3.31c-.38.3-.49.84-.24 1.28l4 6.93c.25.43.77.61 1.22.43l4.98-2.01c1.03.79 2.16 1.46 3.38 1.97l.75 5.3c.08.47.49.84.99.84h8c.5 0 .91-.37.99-.84l.75-5.3c1.22-.51 2.35-1.17 3.38-1.97l4.98 2.01c.45.17.97 0 1.22-.43l4-6.93c.25-.43.14-.97-.24-1.28l-4.22-3.31zm-14.86 5.05c-3.87 0-7-3.13-7-7s3.13-7 7-7 7 3.13 7 7-3.13 7-7 7z" :style {:stroke nil}}]}
    {:name "Settings Applications"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M24 20c-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm14-14h-28c-2.21 0-4 1.79-4 4v28c0 2.21 1.79 4 4 4h28c2.21 0 4-1.79 4-4v-28c0-2.21-1.79-4-4-4zm-3.5 18c0 .46-.04.92-.1 1.37l2.96 2.32c.26.21.34.59.16.89l-2.8 4.85c-.17.3-.54.42-.86.3l-3.49-1.41c-.72.56-1.51 1.02-2.37 1.38l-.52 3.71c-.04.33-.33.59-.68.59h-5.6c-.35 0-.64-.26-.69-.59l-.52-3.71c-.85-.35-1.64-.82-2.37-1.38l-3.48 1.4c-.32.12-.68 0-.86-.3l-2.8-4.85c-.18-.3-.1-.68.16-.89l2.96-2.31c-.06-.45-.1-.9-.1-1.37 0-.46.04-.92.1-1.37l-2.96-2.31c-.26-.21-.34-.59-.16-.89l2.8-4.85c.18-.3.54-.42.86-.3l3.48 1.4c.72-.55 1.51-1.02 2.37-1.38l.52-3.71c.05-.33.34-.59.69-.59h5.6c.35 0 .64.26.69.59l.52 3.71c.85.35 1.64.82 2.37 1.38l3.48-1.4c.32-.12.68 0 .86.3l2.8 4.85c.18.3.1.68-.16.89l-2.96 2.32c.06.44.1.9.1 1.36z" :style {:stroke nil}}]}
    {:name "Settings Backup Restore"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M28 24c0-2.21-1.79-4-4-4s-4 1.79-4 4 1.79 4 4 4 4-1.79 4-4zm-4-18c-9.94 0-18 8.06-18 18h-6l8 8 8-8h-6c0-7.73 6.27-14 14-14s14 6.27 14 14-6.27 14-14 14c-3.03 0-5.82-.97-8.12-2.61l-2.83 2.87c3.04 2.34 6.83 3.74 10.95 3.74 9.94 0 18-8.06 18-18s-8.06-18-18-18z" :style {:stroke nil}}]}
    {:name "Settings Bluetooth"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M22 48h4v-4h-4v4zm-8 0h4v-4h-4v4zm16 0h4v-4h-4v4zm5.41-36.59l-11.41-11.41h-2v15.17l-9.17-9.17-2.83 2.83 11.17 11.17-11.17 11.17 2.83 2.83 9.17-9.17v15.17h2l11.41-11.41-8.58-8.59 8.58-8.59zm-9.41-3.75l3.76 3.76-3.76 3.75v-7.51zm3.76 20.93l-3.76 3.75v-7.51l3.76 3.76z" :style {:stroke nil}}]}
    {:name "Settings Cell"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M14 48h4v-4h-4v4zm8 0h4v-4h-4v4zm8 0h4v-4h-4v4zm2-47.98l-16-.02c-2.21 0-4 1.79-4 4v32c0 2.21 1.79 4 4 4h16c2.21 0 4-1.79 4-4v-32c0-2.21-1.79-3.98-4-3.98zm0 31.98h-16v-24h16v24z" :style {:stroke nil}}]}
    {:name "Settings Display"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M42 6h-36c-2.21 0-4 1.79-4 4v28c0 2.21 1.79 4 4 4h36c2.21 0 4-1.79 4-4v-28c0-2.21-1.79-4-4-4zm0 32.03h-36v-28.06h36v28.06zm-26-6.03h5l3 3 3-3h5v-5l3-3-3-3v-5h-5l-3-3-3 3h-5v5l-3 3 3 3v5zm8-14c3.31 0 6 2.69 6 6s-2.69 6-6 6v-12z" :style {:stroke nil}}]}
    {:name "Settings Ethernet"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M15.54 13.52l-3.08-2.55-10.82 13.03 10.82 13.04 3.08-2.55-8.7-10.49 8.7-10.48zm-1.54 12.48h4v-4h-4v4zm20-4h-4v4h4v-4zm-12 4h4v-4h-4v4zm13.54-15.04l-3.08 2.55 8.7 10.49-8.7 10.48 3.08 2.55 10.82-13.03-10.82-13.04z" :style {:stroke nil}}]}
    {:name "Settings Input Antenna"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M24 10c-7.73 0-14 6.27-14 14h4c0-5.52 4.48-10 10-10s10 4.48 10 10h4c0-7.73-6.27-14-14-14zm2 18.58c1.76-.77 3-2.53 3-4.58 0-2.76-2.24-5-5-5s-5 2.24-5 5c0 2.05 1.24 3.81 3 4.58v6.59l-6.83 6.83 2.83 2.83 6-6 6 6 2.83-2.83-6.83-6.83v-6.59zm-2-26.58c-12.15 0-22 9.85-22 22h4c0-9.94 8.06-18 18-18s18 8.06 18 18h4c0-12.15-9.85-22-22-22z" :style {:stroke nil}}]}
    {:name "Settings Input Component"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M10 4c0-1.1-.89-2-2-2s-2 .9-2 2v8h-4v12h12v-12h-4v-8zm8 28c0 2.61 1.68 4.81 4 5.63v8.37h4v-8.37c2.32-.83 4-3.02 4-5.63v-4h-12v4zm-16 0c0 2.61 1.68 4.81 4 5.63v8.37h4v-8.37c2.32-.83 4-3.02 4-5.63v-4h-12v4zm40-20v-8c0-1.1-.89-2-2-2s-2 .9-2 2v8h-4v12h12v-12h-4zm-16-8c0-1.1-.89-2-2-2s-2 .9-2 2v8h-4v12h12v-12h-4v-8zm8 28c0 2.61 1.68 4.81 4 5.63v8.37h4v-8.37c2.32-.83 4-3.02 4-5.63v-4h-12v4z" :style {:stroke nil}}]}
    {:name "Settings Input Composite"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M10 4c0-1.1-.89-2-2-2s-2 .9-2 2v8h-4v12h12v-12h-4v-8zm8 28c0 2.61 1.68 4.81 4 5.63v8.37h4v-8.37c2.32-.83 4-3.02 4-5.63v-4h-12v4zm-16 0c0 2.61 1.68 4.81 4 5.63v8.37h4v-8.37c2.32-.83 4-3.02 4-5.63v-4h-12v4zm40-20v-8c0-1.1-.89-2-2-2s-2 .9-2 2v8h-4v12h12v-12h-4zm-16-8c0-1.1-.89-2-2-2s-2 .9-2 2v8h-4v12h12v-12h-4v-8zm8 28c0 2.61 1.68 4.81 4 5.63v8.37h4v-8.37c2.32-.83 4-3.02 4-5.63v-4h-12v4z" :style {:stroke nil}}]}
    {:name "Settings Input HDMI"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M36 14v-6c0-2.21-1.79-4-4-4h-16c-2.21 0-4 1.79-4 4v6h-2v12l6 12v6h16v-6l6-12v-12h-2zm-20-6h16v6h-4v-4h-2v4h-4v-4h-2v4h-4v-6z" :style {:stroke nil}}]}
    {:name "Settings Input svideo"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M16 23c0-1.66-1.34-3-3-3s-3 1.34-3 3 1.34 3 3 3 3-1.34 3-3zm14-10c0-1.66-1.34-3-3-3h-6c-1.66 0-3 1.34-3 3s1.34 3 3 3h6c1.66 0 3-1.34 3-3zm-13 17c-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3-1.34-3-3-3zm7-28c-12.13 0-22 9.87-22 22s9.87 22 22 22 22-9.87 22-22-9.87-22-22-22zm0 40c-9.93 0-18-8.08-18-18s8.07-18 18-18 18 8.08 18 18-8.07 18-18 18zm11-22c-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3-1.34-3-3-3zm-4 10c-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3-1.34-3-3-3z" :style {:stroke nil}}]}
    {:name "Settings Overscan"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M24.01 11l-4.01 5h8l-3.99-5zm11.99 9v8l5-3.99-5-4.01zm-24 0l-5 4.01 5 3.99v-8zm16 12h-8l4.01 5 3.99-5zm14-26h-36c-2.21 0-4 1.79-4 4v28c0 2.21 1.79 4 4 4h36c2.21 0 4-1.79 4-4v-28c0-2.21-1.79-4-4-4zm0 32.03h-36v-28.06h36v28.06z" :style {:stroke nil}}]}
    {:name "Settings Phone"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M26 18h-4v4h4v-4zm8 0h-4v4h4v-4zm6 13c-2.49 0-4.89-.4-7.14-1.14-.69-.22-1.48-.06-2.03.49l-4.4 4.41c-5.67-2.88-10.29-7.51-13.18-13.17l4.4-4.41c.55-.55.71-1.34.49-2.03-.74-2.25-1.14-4.66-1.14-7.15 0-1.11-.89-2-2-2h-7c-1.11 0-2 .89-2 2 0 18.78 15.22 34 34 34 1.11 0 2-.89 2-2v-7c0-1.11-.89-2-2-2zm-2-13v4h4v-4h-4z" :style {:stroke nil}}]}
    {:name "Settings Power"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M14 48h4v-4h-4v4zm8 0h4v-4h-4v4zm4-44h-4v20h4v-20zm7.13 4.87l-2.89 2.89c3.45 2.11 5.76 5.9 5.76 10.24 0 6.63-5.37 12-12 12s-12-5.37-12-12c0-4.34 2.31-8.13 5.76-10.24l-2.89-2.89c-4.15 2.89-6.87 7.69-6.87 13.13 0 8.84 7.16 16 16 16s16-7.16 16-16c0-5.44-2.72-10.24-6.87-13.13zm-3.13 39.13h4v-4h-4v4z" :style {:stroke nil}}]}
    {:name "Settings Remote"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M30 18h-12c-1.11 0-2 .9-2 2v24c0 1.1.89 2 2 2h12c1.11 0 2-.9 2-2v-24c0-1.1-.89-2-2-2zm-6 12c-2.21 0-4-1.79-4-4s1.79-4 4-4 4 1.79 4 4-1.79 4-4 4zm-9.9-17.9l2.83 2.83c1.81-1.81 4.31-2.93 7.07-2.93s5.26 1.12 7.07 2.93l2.83-2.83c-2.53-2.53-6.03-4.1-9.9-4.1s-7.37 1.57-9.9 4.1zm9.9-12.1c-6.07 0-11.57 2.46-15.56 6.44l2.83 2.83c3.26-3.26 7.76-5.27 12.73-5.27s9.47 2.01 12.73 5.27l2.83-2.83c-3.99-3.98-9.49-6.44-15.56-6.44z" :style {:stroke nil}}]}
    {:name "Settings Voice"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M14 48h4v-4h-4v4zm10-22c3.31 0 5.98-2.69 5.98-6l.02-12c0-3.32-2.68-6-6-6-3.31 0-6 2.68-6 6v12c0 3.31 2.69 6 6 6zm-2 22h4v-4h-4v4zm8 0h4v-4h-4v4zm8-28h-3.4c0 6-5.07 10.2-10.6 10.2-5.52 0-10.6-4.2-10.6-10.2h-3.4c0 6.83 5.44 12.47 12 13.44v6.56h4v-6.56c6.56-.97 12-6.61 12-13.44z" :style {:stroke nil}}]}
    {:name "Shop Two"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M36 10v-4c0-2.21-1.79-4-4-4h-8c-2.21 0-4 1.79-4 4v4h-10v22c0 2.21 1.79 4 4 4h28c2.21 0 4-1.79 4-4v-22h-10zm-12-4h8v4h-8v-4zm0 24v-14l11 6-11 8zm-18-12h-4v22c0 2.21 1.79 4 4 4h28c2.21 0 4-1.79 4-4h-32v-22z" :style {:stroke nil}}]}
    {:name "Shopping Basket"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M34.42 18l-8.76-13.11c-.38-.58-1.02-.85-1.66-.85-.64 0-1.28.28-1.66.85l-8.76 13.11h-9.58c-1.1 0-2 .9-2 2 0 .19.03.37.07.54l5.07 18.54c.47 1.68 2.02 2.92 3.86 2.92h26c1.84 0 3.39-1.24 3.85-2.93l5.07-18.54c.05-.16.08-.34.08-.53 0-1.1-.9-2-2-2h-9.58zm-16.42 0l6-8.8 6 8.8h-12zm6 16c-2.21 0-4-1.79-4-4s1.79-4 4-4 4 1.79 4 4-1.79 4-4 4z" :style {:stroke nil}}]}
    {:name "Shopping Cart"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M14 36c-2.21 0-3.98 1.79-3.98 4s1.77 4 3.98 4 4-1.79 4-4-1.79-4-4-4zm-12-32v4h4l7.19 15.17-2.7 4.9c-.31.58-.49 1.23-.49 1.93 0 2.21 1.79 4 4 4h24v-4h-23.15c-.28 0-.5-.22-.5-.5 0-.09.02-.17.06-.24l1.79-3.26h14.9c1.5 0 2.81-.83 3.5-2.06l7.15-12.98c.16-.28.25-.61.25-.96 0-1.11-.9-2-2-2h-29.57l-1.9-4h-6.53zm32 32c-2.21 0-3.98 1.79-3.98 4s1.77 4 3.98 4 4-1.79 4-4-1.79-4-4-4z" :style {:stroke nil}}]}
    {:name "Speaker Notes"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M40 4h-32c-2.21 0-3.98 1.79-3.98 4l-.02 36 8-8h28c2.21 0 4-1.79 4-4v-24c0-2.21-1.79-4-4-4zm-24 24h-4v-4h4v4zm0-6h-4v-4h4v4zm0-6h-4v-4h4v4zm14 12h-10v-4h10v4zm6-6h-16v-4h16v4zm0-6h-16v-4h16v4z" :style {:stroke nil}}]}
    {:name "Spellcheck"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M24.89 32h4.18l-10.21-26h-3.71l-10.22 26h4.18l2.25-6h11.29l2.24 6zm-12.03-10l4.14-11.05 4.14 11.05h-8.28zm30.31 1.17l-16.17 16.17-7.34-7.34-2.83 2.83 10.17 10.17 19-19-2.83-2.83z" :style {:stroke nil}}]}
    {:name "Star Rate"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M24 28.6l7.42 5.4-2.84-8.72 7.42-5.28h-9.1l-2.9-9-2.9 9h-9.1l7.42 5.28-2.83 8.72z" :style {:stroke nil}}]}
    {:name "Stars"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M23.99 4c-11.05 0-19.99 8.95-19.99 20s8.94 20 19.99 20c11.05 0 20.01-8.95 20.01-20s-8.96-20-20.01-20zm8.47 32l-8.46-5.1-8.46 5.1 2.24-9.62-7.46-6.47 9.84-.84 3.84-9.07 3.84 9.07 9.84.84-7.46 6.47 2.24 9.62z" :style {:stroke nil}}]}
    {:name "Store"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M40 8h-32v4h32v-4zm2 20v-4l-2-10h-32l-2 10v4h2v12h20v-12h8v12h4v-12h2zm-18 8h-12v-8h12v8z" :style {:stroke nil}}]}
    {:name "Subject"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M28 34h-20v4h20v-4zm12-16h-32v4h32v-4zm-32 12h32v-4h-32v4zm0-20v4h32v-4h-32z" :style {:stroke nil}}]}
    {:name "Supervisor Account"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 2.5c1.24 0 2.25 1.01 2.25 2.25s-1.01 2.25-2.25 2.25-2.25-1.01-2.25-2.25 1.01-2.25 2.25-2.25zm5 10.56v2.5c-.45.41-.96.77-1.5 1.05v-.68c0-.34-.17-.65-.46-.92-.65-.62-1.89-1.02-3.04-1.02-.96 0-1.96.28-2.65.73l-.17.12-.21.17c.78.47 1.63.72 2.54.82l1.33.15c.37.04.66.36.66.75 0 .29-.16.53-.4.66-.28.15-.64.09-.95.09-.35 0-.69-.01-1.03-.05-.5-.06-.99-.17-1.46-.33-.49-.16-.97-.38-1.42-.64-.22-.13-.44-.27-.65-.43l-.31-.24c-.04-.02-.28-.18-.28-.23v-4.28c0-1.58 2.63-2.78 5-2.78s5 1.2 5 2.78v1.78z" :style {:stroke nil}}]}
    {:name "Swap Horiz"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M13.98 22l-7.98 8 7.98 8v-6h14.02v-4h-14.02v-6zm28.02-4l-7.98-8v6h-14.02v4h14.02v6l7.98-8z" :style {:stroke nil}}]}
    {:name "Swap Vert Circle"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M24 4c-11.05 0-20 8.95-20 20s8.95 20 20 20 20-8.95 20-20-8.95-20-20-20zm-11 14l7-7 7 7h-5v8h-4v-8h-5zm22 12l-7 7-7-7h5v-8h4v8h5z" :style {:stroke nil}}]}
    {:name "System Update Tv"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M24 32.5l8-8h-6v-18h-4v18h-6l8 8zm18-26h-12v3.97h12v28.06h-36v-28.06h12v-3.97h-12c-2.21 0-4 1.79-4 4v28c0 2.21 1.79 4 4 4h36c2.21 0 4-1.79 4-4v-28c0-2.21-1.79-4-4-4z" :style {:stroke nil}}]}
    {:name "Tab"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M42 6h-36c-2.21 0-4 1.79-4 4v28c0 2.21 1.79 4 4 4h36c2.21 0 4-1.79 4-4v-28c0-2.21-1.79-4-4-4zm0 32h-36v-28h20v8h16v20z" :style {:stroke nil}}]}
    {:name "Tab Unselected"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M2 18h4v-4h-4v4zm0 8h4v-4h-4v4zm0-16h4v-4c-2.21 0-4 1.79-4 4zm16 32h4v-4h-4v4zm-16-8h4v-4h-4v4zm4 8v-4h-4c0 2.21 1.79 4 4 4zm36-36h-16v12h20v-8c0-2.21-1.79-4-4-4zm0 28h4v-4h-4v4zm-24-24h4v-4h-4v4zm-8 32h4v-4h-4v4zm0-32h4v-4h-4v4zm32 32c2.21 0 4-1.79 4-4h-4v4zm0-16h4v-4h-4v4zm-16 16h4v-4h-4v4zm8 0h4v-4h-4v4z" :style {:stroke nil}}]}
    {:name "Theaters"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M36 6v4h-4v-4h-16v4h-4v-4h-4v36h4v-4h4v4h16v-4h4v4h4v-36h-4zm-20 28h-4v-4h4v4zm0-8h-4v-4h4v4zm0-8h-4v-4h4v4zm20 16h-4v-4h4v4zm0-8h-4v-4h4v4zm0-8h-4v-4h4v4z" :style {:stroke nil}}]}
    {:name "Thumb Down"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M30 6h-18c-1.66 0-3.08 1.01-3.68 2.44l-6.03 14.1c-.18.46-.29.95-.29 1.46v3.83l.02.02-.02.15c0 2.21 1.79 4 4 4h12.63l-1.91 9.14c-.04.2-.07.41-.07.63 0 .83.34 1.58.88 2.12l2.13 2.11 13.17-13.17c.72-.73 1.17-1.73 1.17-2.83v-20c0-2.21-1.79-4-4-4zm8 0v24h8v-24h-8z" :style {:stroke nil}}]}
    {:name "Thumbs Up Down"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M24 12c0-1.1-.9-2-2-2h-10.37l1.33-6.35c.03-.15.05-.31.05-.47 0-.62-.25-1.18-.66-1.59l-1.59-1.59-9.88 9.88c-.54.54-.88 1.29-.88 2.12v13c0 1.66 1.34 3 3 3h13.5c1.24 0 2.31-.75 2.76-1.83l4.53-10.58c.13-.34.21-.7.21-1.09v-2.5zm21 8h-13.5c-1.24 0-2.31.75-2.76 1.83l-4.53 10.58c-.13.34-.21.7-.21 1.09v2.5c0 1.1.9 2 2 2h10.37l-1.33 6.35c-.03.15-.05.31-.05.47 0 .62.25 1.18.66 1.59l1.59 1.59 9.88-9.88c.54-.54.88-1.29.88-2.12v-13c0-1.66-1.34-3-3-3z" :style {:stroke nil}}]}
    {:name "Toc"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M6 18h28v-4h-28v4zm0 8h28v-4h-28v4zm0 8h28v-4h-28v4zm32 0h4v-4h-4v4zm0-20v4h4v-4h-4zm0 12h4v-4h-4v4z" :style {:stroke nil}}]}
    {:name "Today"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M38 6h-2v-4h-4v4h-16v-4h-4v4h-2c-2.21 0-3.98 1.79-3.98 4l-.02 28c0 2.21 1.79 4 4 4h28c2.21 0 4-1.79 4-4v-28c0-2.21-1.79-4-4-4zm0 32h-28v-22h28v22zm-24-18h10v10h-10z" :style {:stroke nil}}]}
    {:name "Track Changes"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:fill "#231F20" :d "M38.14 9.86l-2.83 2.83c2.9 2.89 4.69 6.89 4.69 11.31 0 8.84-7.16 16-16 16s-16-7.16-16-16c0-8.16 6.11-14.88 14-15.86v4.04c-5.67.95-10 5.88-10 11.82 0 6.63 5.37 12 12 12s12-5.37 12-12c0-3.31-1.34-6.31-3.51-8.49l-2.83 2.83c1.44 1.45 2.34 3.45 2.34 5.66 0 4.42-3.58 8-8 8s-8-3.58-8-8c0-3.72 2.56-6.83 6-7.72v4.27c-1.19.69-2 1.97-2 3.45 0 2.21 1.79 4 4 4s4-1.79 4-4c0-1.48-.81-2.75-2-3.45v-16.55h-2c-11.05 0-20 8.95-20 20 0 11.04 8.95 20 20 20 11.04 0 20-8.96 20-20 0-5.52-2.24-10.52-5.86-14.14z" :style {:stroke nil}}]}
    {:name "Translate"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M25.74 30.15l-5.08-5.02.06-.06c3.48-3.88 5.96-8.34 7.42-13.06h5.86v-4.01h-14v-4h-4v4h-14v3.98h22.34c-1.35 3.86-3.46 7.52-6.34 10.72-1.86-2.07-3.4-4.32-4.62-6.7h-4c1.46 3.26 3.46 6.34 5.96 9.12l-10.17 10.05 2.83 2.83 10-10 6.22 6.22 1.52-4.07zm11.26-10.15h-4l-9 24h4l2.25-6h9.5l2.25 6h4l-9-24zm-5.25 14l3.25-8.67 3.25 8.67h-6.5z" :style {:stroke nil}}]}
    {:name "Trending Down"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M32 36l4.59-4.59-9.76-9.75-8 8-14.83-14.83 2.83-2.83 12 12 8-8 12.58 12.59 4.59-4.59v12z" :style {:stroke nil}}]}
    {:name "Trending Neutral"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M44 24l-8-8v6h-30v4h30v6z" :style {:stroke nil}}]}
    {:name "Trending Up"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M32 12l4.59 4.59-9.76 9.75-8-8-14.83 14.83 2.83 2.83 12-12 8 8 12.58-12.59 4.59 4.59v-12z" :style {:stroke nil}}]}
    {:name "Turned In"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M34 6h-20c-2.21 0-3.98 1.79-3.98 4l-.02 32 14-6 14 6v-32c0-2.21-1.79-4-4-4z"  :style {:stroke nil}}]}
    {:name "Turned In Not"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M34 6h-20c-2.21 0-3.98 1.79-3.98 4l-.02 32 14-6 14 6v-32c0-2.21-1.79-4-4-4zm0 30l-10-4.35-10 4.35v-26h20v26z" :style {:stroke nil}}]}
    {:name "Verified User"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M24 2l-18 8v12c0 11.11 7.67 21.47 18 24 10.33-2.53 18-12.89 18-24v-12l-18-8zm-4 32l-8-8 2.83-2.83 5.17 5.17 13.17-13.17 2.83 2.83-16 16z" :style {:stroke nil}}]}
    {:name "View Agenda"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M40 26h-34c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h34c1.1 0 2-.9 2-2v-12c0-1.1-.9-2-2-2zm0-20h-34c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h34c1.1 0 2-.9 2-2v-12c0-1.1-.9-2-2-2z" :style {:stroke nil}}]}
    {:name "View Array"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M8 36h6v-26h-6v26zm28-26v26h6v-26h-6zm-20 26h18v-26h-18v26z" :style {:stroke nil}}]}
    {:name "View Column"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M20 36h10v-26h-10v26zm-12 0h10v-26h-10v26zm24-26v26h10v-26h-10z" :style {:stroke nil}}]}
    {:name "View Day"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M4 42h38v-6h-38v6zm36-26h-34c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h34c1.1 0 2-.9 2-2v-12c0-1.1-.9-2-2-2zm-36-10v6h38v-6h-38z" :style {:stroke nil}}]}
    {:name "View Headline"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M8 30h34v-4h-34v4zm0 8h34v-4h-34v4zm0-16h34v-4h-34v4zm0-12v4h34v-4h-34z" :style {:stroke nil}}]}
    {:name "View List"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M8 28h8v-8h-8v8zm0 10h8v-8h-8v8zm0-20h8v-8h-8v8zm10 10h24v-8h-24v8zm0 10h24v-8h-24v8zm0-28v8h24v-8h-24z" :style {:stroke nil}}]}
    {:name "View Module"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M8 22h10v-12h-10v12zm0 14h10v-12h-10v12zm12 0h10v-12h-10v12zm12 0h10v-12h-10v12zm-12-14h10v-12h-10v12zm12-12v12h10v-12h-10z" :style {:stroke nil}}]}
    {:name "View Quilt"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M20 36h10v-12h-10v12zm-12 0h10v-26h-10v26zm24 0h10v-12h-10v12zm-12-26v12h22v-12h-22z" :style {:stroke nil}}]}
    {:name "View Stream"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M8 36h34v-12h-34v12zm0-26v12h34v-12h-34z" :style {:stroke nil}}]}
    {:name "View Week"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M12 10h-6c-1.1 0-2 .9-2 2v24c0 1.1.9 2 2 2h6c1.1 0 2-.9 2-2v-24c0-1.1-.9-2-2-2zm28 0h-6c-1.1 0-2 .9-2 2v24c0 1.1.9 2 2 2h6c1.1 0 2-.9 2-2v-24c0-1.1-.9-2-2-2zm-14 0h-6c-1.1 0-2 .9-2 2v24c0 1.1.9 2 2 2h6c1.1 0 2-.9 2-2v-24c0-1.1-.9-2-2-2z" :style {:stroke nil}}]}
    {:name "Visibility"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M24 9c-10 0-18.54 6.22-22 15 3.46 8.78 12 15 22 15 10.01 0 18.54-6.22 22-15-3.46-8.78-11.99-15-22-15zm0 25c-5.52 0-10-4.48-10-10s4.48-10 10-10 10 4.48 10 10-4.48 10-10 10zm0-16c-3.31 0-6 2.69-6 6s2.69 6 6 6 6-2.69 6-6-2.69-6-6-6z" :style {:stroke nil}}]}
    {:name "Visibility Off"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M24 14c5.52 0 10 4.48 10 10 0 1.29-.26 2.52-.71 3.65l5.85 5.85c3.02-2.52 5.4-5.78 6.87-9.5-3.47-8.78-12-15-22.01-15-2.8 0-5.48.5-7.97 1.4l4.32 4.31c1.13-.44 2.36-.71 3.65-.71zm-20-5.45l4.56 4.56.91.91c-3.3 2.58-5.91 6.01-7.47 9.98 3.46 8.78 12 15 22 15 3.1 0 6.06-.6 8.77-1.69l.85.85 5.83 5.84 2.55-2.54-35.45-35.46-2.55 2.55zm11.06 11.05l3.09 3.09c-.09.43-.15.86-.15 1.31 0 3.31 2.69 6 6 6 .45 0 .88-.06 1.3-.15l3.09 3.09c-1.33.66-2.81 1.06-4.39 1.06-5.52 0-10-4.48-10-10 0-1.58.4-3.06 1.06-4.4zm8.61-1.57l6.3 6.3.03-.33c0-3.31-2.69-6-6-6l-.33.03z" :style {:stroke nil}}]}
    {:name "Wallet Giftcard"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M40 12h-4.37c.22-.63.37-1.3.37-2 0-3.31-2.69-6-6-6-2.09 0-3.93 1.07-5 2.69l-1 1.36-1-1.36c-1.07-1.62-2.91-2.69-5-2.69-3.31 0-6 2.69-6 6 0 .7.14 1.37.37 2h-4.37c-2.21 0-3.98 1.79-3.98 4l-.02 22c0 2.21 1.79 4 4 4h32c2.21 0 4-1.79 4-4v-22c0-2.21-1.79-4-4-4zm-10-4c1.1 0 2 .9 2 2s-.9 2-2 2-2-.9-2-2 .9-2 2-2zm-12 0c1.1 0 2 .9 2 2s-.9 2-2 2-2-.9-2-2 .9-2 2-2zm22 30h-32v-4h32v4zm0-10h-32v-12h10.16l-4.16 5.67 3.25 2.33 4.75-6.47 2-2.72 2 2.72 4.75 6.47 3.25-2.33-4.16-5.67h10.16v12z" :style {:stroke nil}}]}
    {:name "Wallet Membership"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M40 4h-32c-2.21 0-4 1.79-4 4v22c0 2.21 1.79 4 4 4h8v10l8-4 8 4v-10h8c2.21 0 4-1.79 4-4v-22c0-2.21-1.79-4-4-4zm0 26h-32v-4h32v4zm0-10h-32v-12h32v12z" :style {:stroke nil}}]}
    {:name "Wallet Travel"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M40 12h-6v-4c0-2.21-1.79-4-4-4h-12c-2.21 0-4 1.79-4 4v4h-6c-2.21 0-4 1.79-4 4v22c0 2.21 1.79 4 4 4h32c2.21 0 4-1.79 4-4v-22c0-2.21-1.79-4-4-4zm-22-4h12v4h-12v-4zm22 30h-32v-4h32v4zm0-10h-32v-12h6v4h4v-4h12v4h4v-4h6v12z" :style {:stroke nil}}]}
    {:name "Work"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M40 12h-8v-4c0-2.21-1.79-4-4-4h-8c-2.21 0-4 1.79-4 4v4h-8c-2.21 0-3.98 1.79-3.98 4l-.02 22c0 2.21 1.79 4 4 4h32c2.21 0 4-1.79 4-4v-22c0-2.21-1.79-4-4-4zm-12 0h-8v-4h8v4z" :style {:stroke nil}}]}
    ])
diff --git a/src/uxbox/library/icons/material/alerts.cljs b/src/uxbox/library/icons/material/alerts.cljs
index 6b21afca2..d7e43dbaa 100644
--- a/src/uxbox/library/icons/material/alerts.cljs
+++ b/src/uxbox/library/icons/material/alerts.cljs
@@ -7,14 +7,14 @@
 (def +icons+
   [{:name "Error"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:xmlns "http://www.w3.org/2000/svg"
                   :d "M24 4c-11.04 0-20 8.95-20 20s8.96 20 20 20 20-8.95 20-20-8.96-20-20-20zm2 30h-4v-4h4v4zm0-8h-4v-12h4v12z"
                   :style {:stroke nil}}]}
    {:name "Warning"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:xmlns "http://www.w3.org/2000/svg"
                   :d "M2 42h44l-22-38-22 38zm24-6h-4v-4h4v4zm0-8h-4v-8h4v8z"
diff --git a/src/uxbox/library/icons/material/av.cljs b/src/uxbox/library/icons/material/av.cljs
index 2514e0f7d..6cda4b551 100644
--- a/src/uxbox/library/icons/material/av.cljs
+++ b/src/uxbox/library/icons/material/av.cljs
@@ -7,7 +7,7 @@
 (def +icons+
   [{:name "Album"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -16,7 +16,7 @@
 
    {:name "AV Timer"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -25,7 +25,7 @@
 
    {:name "Closed Caption"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -34,7 +34,7 @@
 
    {:name "Equalizer"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -42,7 +42,7 @@
 
    {:name "Explicit"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -51,7 +51,7 @@
 
    {:name "Fast Forward"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -59,7 +59,7 @@
 
    {:name "Fast Rewind"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -67,7 +67,7 @@
 
    {:name "Games"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -76,7 +76,7 @@
 
    {:name "Hearing"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -85,7 +85,7 @@
 
    {:name "High Quality"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -94,7 +94,7 @@
 
    {:name "Loop"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -103,7 +103,7 @@
 
    {:name "Mic"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -112,7 +112,7 @@
 
    {:name "Mic None"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -121,7 +121,7 @@
 
    {:name "Mic Off"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -130,7 +130,7 @@
 
    {:name "Movie"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -139,7 +139,7 @@
 
    {:name "My Library Add"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -148,7 +148,7 @@
 
    {:name "My Library Books"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -157,7 +157,7 @@
 
    {:name "My Library Music"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -166,7 +166,7 @@
 
    {:name "New Releases"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -175,7 +175,7 @@
 
    {:name "Not Interested"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -184,7 +184,7 @@
 
    {:name "Pause"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -192,7 +192,7 @@
 
    {:name "Pause Circle Fill"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -201,7 +201,7 @@
 
    {:name "Pause Circle Outline"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -210,13 +210,13 @@
 
    {:name "Play"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:style {:stroke nil} :d "M16 10v28l22-14z"}]}
 
    {:name "Play Circle Fill"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -225,7 +225,7 @@
 
    {:name "Play Circle Outline"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -234,7 +234,7 @@
 
    {:name "Play Shopping Bag"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -243,7 +243,7 @@
 
    {:name "Playlist Add"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -252,7 +252,7 @@
 
    {:name "Queue"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -261,7 +261,7 @@
 
    {:name "Queue Music"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -270,7 +270,7 @@
 
    {:name "Radio"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -279,7 +279,7 @@
 
    {:name "Recent Actors"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -288,7 +288,7 @@
 
    {:name "Repeat"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -297,7 +297,7 @@
 
    {:name "Repeat One"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -306,7 +306,7 @@
 
    {:name "Replay"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -315,7 +315,7 @@
 
    {:name "Shuffle"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -324,7 +324,7 @@
 
    {:name "Skip Next"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -332,14 +332,14 @@
 
    {:name "Skip Previous"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil} :d "M12 12h4v24h-4zm7 12l17 12V12z"}]}
 
    {:name "Snooze"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -348,13 +348,13 @@
 
    {:name "Stop"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:style {:stroke nil} :d "M12 12h24v24H12z"}]}
 
    {:name "Subtitles"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -363,7 +363,7 @@
 
    {:name "Surround Sound"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -372,7 +372,7 @@
 
    {:name "Video Collection"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -381,7 +381,7 @@
 
    {:name "Videocam"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -390,7 +390,7 @@
 
    {:name "Videocam Off"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -399,7 +399,7 @@
 
    {:name "Volume Down"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -408,13 +408,13 @@
 
    {:name "Volume Mute"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:style {:stroke nil} :d "M14 18v12h8l10 10V8L22 18h-8z"}]}
 
    {:name "Volume Off"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -423,7 +423,7 @@
 
    {:name "Volume Up"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -432,7 +432,7 @@
 
    {:name "Web"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -443,7 +443,7 @@
    ;; communication
    {:name "Business"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -452,7 +452,7 @@
 
    {:name "Call"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -461,7 +461,7 @@
 
    {:name "Call End"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -470,7 +470,7 @@
 
    {:name "Call Made"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -479,7 +479,7 @@
 
    {:name "Call Merge"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -488,7 +488,7 @@
 
    {:name "Call Missed"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -497,7 +497,7 @@
 
    {:name "Call Received"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -506,7 +506,7 @@
 
    {:name "Call Split"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -515,7 +515,7 @@
 
    {:name "Chat"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -524,7 +524,7 @@
 
    {:name "Contacts"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -533,7 +533,7 @@
 
    {:name "Dialer Sip"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -542,7 +542,7 @@
 
    {:name "Dialpad"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -551,7 +551,7 @@
 
    {:name "Dnd On"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -560,7 +560,7 @@
 
    {:name "Email"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -569,7 +569,7 @@
 
    {:name "Forum"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -578,7 +578,7 @@
 
    {:name "Import Export"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -587,7 +587,7 @@
 
    {:name "Invert Colors Off"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -596,7 +596,7 @@
 
    {:name "Invert Colors On"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -605,7 +605,7 @@
 
    {:name "Live Help"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -614,7 +614,7 @@
 
    {:name "Location Off"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -623,7 +623,7 @@
 
    {:name "Location On"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -632,7 +632,7 @@
 
    {:name "Message"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -641,7 +641,7 @@
 
    {:name "Messenger"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -650,7 +650,7 @@
 
    {:name "No Sim"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -659,7 +659,7 @@
 
    {:name "Phone"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -668,7 +668,7 @@
 
    {:name "Portable Wifi off"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -677,7 +677,7 @@
 
    {:name "Quick Contacts Dialer"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -686,7 +686,7 @@
 
    {:name "Ring Volume"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -695,7 +695,7 @@
 
    {:name "Stay Current Landscape"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -704,7 +704,7 @@
 
    {:name "Stay Current Portrait"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -713,7 +713,7 @@
 
    {:name "Stay Primary Landscape"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -722,7 +722,7 @@
 
    {:name "Stay Primary Portrait"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -731,7 +731,7 @@
 
    {:name "Swap Calls"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -740,7 +740,7 @@
 
    {:name "Textsms"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -749,7 +749,7 @@
 
    {:name "Voicemail"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -758,7 +758,7 @@
 
    {:name "VPN Key"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
diff --git a/src/uxbox/library/icons/material/communication.cljs b/src/uxbox/library/icons/material/communication.cljs
index a8aafd04f..bcabd34c6 100644
--- a/src/uxbox/library/icons/material/communication.cljs
+++ b/src/uxbox/library/icons/material/communication.cljs
@@ -7,7 +7,7 @@
 (def +icons+
   [{:name "Business"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -16,7 +16,7 @@
 
    {:name "Call"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -25,7 +25,7 @@
 
    {:name "Call End"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -34,7 +34,7 @@
 
    {:name "Call Made"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -43,7 +43,7 @@
 
    {:name "Call Merge"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -52,7 +52,7 @@
 
    {:name "Call Missed"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -61,7 +61,7 @@
 
    {:name "Call Received"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -70,7 +70,7 @@
 
    {:name "Call Split"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -79,7 +79,7 @@
 
    {:name "Chat"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -88,7 +88,7 @@
 
    {:name "Contacts"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -97,7 +97,7 @@
 
    {:name "Dialer Sip"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -106,7 +106,7 @@
 
    {:name "Dialpad"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -115,7 +115,7 @@
 
    {:name "Dnd On"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -124,7 +124,7 @@
 
    {:name "Email"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -133,7 +133,7 @@
 
    {:name "Forum"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -142,7 +142,7 @@
 
    {:name "Import Export"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -151,7 +151,7 @@
 
    {:name "Invert Colors Off"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -160,7 +160,7 @@
 
    {:name "Invert Colors On"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -169,7 +169,7 @@
 
    {:name "Live Help"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -178,7 +178,7 @@
 
    {:name "Location Off"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -187,7 +187,7 @@
 
    {:name "Location On"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -196,7 +196,7 @@
 
    {:name "Message"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -205,7 +205,7 @@
 
    {:name "Messenger"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -214,7 +214,7 @@
 
    {:name "No Sim"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -223,7 +223,7 @@
 
    {:name "Phone"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -232,7 +232,7 @@
 
    {:name "Portable Wifi off"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -241,7 +241,7 @@
 
    {:name "Quick Contacts Dialer"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -250,7 +250,7 @@
 
    {:name "Ring Volume"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -259,7 +259,7 @@
 
    {:name "Stay Current Landscape"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -268,7 +268,7 @@
 
    {:name "Stay Current Portrait"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -277,7 +277,7 @@
 
    {:name "Stay Primary Landscape"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -286,7 +286,7 @@
 
    {:name "Stay Primary Portrait"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -295,7 +295,7 @@
 
    {:name "Swap Calls"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -304,7 +304,7 @@
 
    {:name "Textsms"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -313,7 +313,7 @@
 
    {:name "Voicemail"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -322,7 +322,7 @@
 
    {:name "VPN Key"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
diff --git a/src/uxbox/library/icons/material/content.cljs b/src/uxbox/library/icons/material/content.cljs
index 93efa0a00..dd290c5ea 100644
--- a/src/uxbox/library/icons/material/content.cljs
+++ b/src/uxbox/library/icons/material/content.cljs
@@ -7,7 +7,7 @@
 (def +icons+
   [{:name "Add"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -15,7 +15,7 @@
 
    {:name "Add Box"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -24,7 +24,7 @@
 
    {:name "Add Circle"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -33,7 +33,7 @@
 
    {:name "Add Circle Outline"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -42,7 +42,7 @@
 
    {:name "Archive"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -51,7 +51,7 @@
 
    {:name "Archive"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -60,7 +60,7 @@
 
    {:name "Block"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -69,7 +69,7 @@
 
    {:name "Clear"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -78,7 +78,7 @@
 
    {:name "Content Copy"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -87,7 +87,7 @@
 
    {:name "Content Cut"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -96,7 +96,7 @@
 
    {:name "Content Paste"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -105,7 +105,7 @@
 
    {:name "Create"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -114,7 +114,7 @@
 
    {:name "Drafts"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -123,7 +123,7 @@
 
    {:name "Filter List"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -131,7 +131,7 @@
 
    {:name "Flag"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -139,7 +139,7 @@
 
    {:name "Forward"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -147,7 +147,7 @@
 
    {:name "Gesture"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -156,7 +156,7 @@
 
    {:name "Inbox"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -165,7 +165,7 @@
 
    {:name "Link"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -174,7 +174,7 @@
 
    {:name "Mail"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -183,7 +183,7 @@
 
    {:name "Redo"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -192,14 +192,14 @@
 
    {:name "Remove"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:style {:stroke nil}
                   :d "M38 26h-28v-4h28v4z"}]}
 
    {:name "Remove Outline"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -208,7 +208,7 @@
 
    {:name "Remove Outline Circle"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -217,7 +217,7 @@
 
    {:name "Reply"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -226,7 +226,7 @@
 
    {:name "Reply All"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -235,7 +235,7 @@
 
    {:name "Report"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -244,7 +244,7 @@
 
    {:name "Save"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -253,7 +253,7 @@
 
    {:name "Select All"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -262,7 +262,7 @@
 
    {:name "Send"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -270,7 +270,7 @@
 
    {:name "Sort"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -278,7 +278,7 @@
 
    {:name "Text Format"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -287,7 +287,7 @@
 
    {:name "Undo"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
diff --git a/src/uxbox/library/icons/material/device.cljs b/src/uxbox/library/icons/material/device.cljs
index 2870b9faf..db2e42042 100644
--- a/src/uxbox/library/icons/material/device.cljs
+++ b/src/uxbox/library/icons/material/device.cljs
@@ -8,7 +8,7 @@
 (def +icons+
   [{:name "Access Alarm"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -17,7 +17,7 @@
 
    {:name "Access Alarms"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -26,7 +26,7 @@
 
    {:name "Access Times"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g {}
            [:path
@@ -43,7 +43,7 @@
 
    {:name "Add Alarm"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -52,7 +52,7 @@
 
    {:name "Airplanemode Off"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -61,7 +61,7 @@
 
    {:name "Airplanemode On"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -70,7 +70,7 @@
 
    {:name "Battery 20"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g [:path
                {:style {:stroke nil}
@@ -84,7 +84,7 @@
 
    {:name "Battery 30"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
            [:path
@@ -99,7 +99,7 @@
 
    {:name "Battery 50"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
            [:path
@@ -114,7 +114,7 @@
 
    {:name "Battery 60"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
            [:path
@@ -129,7 +129,7 @@
 
    {:name "Battery 80"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
            [:path
@@ -144,7 +144,7 @@
 
    {:name "Battery 90"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
            [:path
@@ -159,7 +159,7 @@
 
    {:name "Battery Alert"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -168,7 +168,7 @@
 
    {:name "Battery Charging 20"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
            [:path
@@ -183,7 +183,7 @@
 
    {:name "Battery Charging 30"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
            [:path
@@ -198,7 +198,7 @@
 
    {:name "Battery Charging 50"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
            [:path
@@ -213,7 +213,7 @@
 
    {:name "Battery Charging 60"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
            [:path
@@ -228,7 +228,7 @@
 
    {:name "Battery Charging 80"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
            [:path
@@ -243,7 +243,7 @@
 
    {:name "Battery Charging 90"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
            [:path
@@ -258,7 +258,7 @@
 
    {:name "Battery Charging Full"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -267,7 +267,7 @@
 
    {:name "Battery Full"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -276,7 +276,7 @@
 
    {:name "Battery Std"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -285,7 +285,7 @@
 
    {:name "Battery Unknown"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -294,7 +294,7 @@
 
    {:name "Bluetooth"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -303,7 +303,7 @@
 
    {:name "Bluetooth Connected"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -312,7 +312,7 @@
 
    {:name "Bluetooth Disabled"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -321,7 +321,7 @@
 
    {:name "Bluetooth Searching"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -330,7 +330,7 @@
 
    {:name "Brightness Auto"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -339,7 +339,7 @@
 
    {:name "Brightness High"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -348,7 +348,7 @@
 
    {:name "Brightness Low"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -357,7 +357,7 @@
 
    {:name "Brightness Medium"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -366,7 +366,7 @@
 
    {:name "Data Usage"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -375,7 +375,7 @@
 
    {:name "Developer Mode"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -384,7 +384,7 @@
 
    {:name "Devices"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -393,7 +393,7 @@
 
    {:name "DVR"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -402,7 +402,7 @@
 
    {:name "GPS Fixed"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -411,7 +411,7 @@
 
    {:name "GPS Not Fixed"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -420,7 +420,7 @@
 
    {:name "GPS Off"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -429,7 +429,7 @@
 
    {:name "Location Disabled"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -438,7 +438,7 @@
 
    {:name "Location Searching"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -447,7 +447,7 @@
 
    {:name "Multitrack Audio"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -456,7 +456,7 @@
 
    {:name "Network Cell"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
            [:path {:style {:stroke nil}
@@ -467,7 +467,7 @@
 
    {:name "Network Wifi"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
            [:path
@@ -482,7 +482,7 @@
 
    {:name "NFC"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -491,7 +491,7 @@
 
    {:name "Now Wallpaper"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -500,7 +500,7 @@
 
    {:name "Now Widgets"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -509,7 +509,7 @@
 
    {:name "Screen Lock Landscape"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -518,7 +518,7 @@
 
    {:name "Screen Lock Portrait"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -527,7 +527,7 @@
 
    {:name "Screen Lock Rotation"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -536,7 +536,7 @@
 
    {:name "Screen Rotation"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -545,7 +545,7 @@
 
    {:name "SD Storage"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -554,7 +554,7 @@
 
    {:name "System Settings Daydream"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -563,7 +563,7 @@
 
    {:name "Signal Cellular 0 Bar"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -572,7 +572,7 @@
 
    {:name "Signal Cellular 1 Bar"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
            [:path {:style {:stroke nil}
@@ -583,7 +583,7 @@
 
    {:name "Signal Cellular 2 Bar"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
            [:path {:style {:stroke nil}
@@ -594,7 +594,7 @@
 
    {:name "Signal Cellular 3 Bar"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
            [:path {:style {:stroke nil}
@@ -605,14 +605,14 @@
 
    {:name "Signal Cellular 4 Bar"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:style {:stroke nil}
                   :d "M4 44h40v-40z"}]}
 
    {:name "Signal Cellular Connected No Internet 0 Bar"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
            [:path {:style {:stroke nil}
@@ -624,7 +624,7 @@
 
    {:name "Signal Cellular Connected No Internet 1 Bar"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
            [:path
@@ -637,7 +637,7 @@
 
    {:name "Signal Cellular Connected No Internet 2 Bar"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
            [:path
@@ -650,7 +650,7 @@
 
    {:name "Signal Cellular Connected No Internet 3 Bar"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
            [:path
@@ -663,7 +663,7 @@
 
    {:name "Signal Cellular No Sim"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -672,7 +672,7 @@
 
    {:name "Signal Cellular Null"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -680,7 +680,7 @@
 
    {:name "Signal Cellular Off"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -689,7 +689,7 @@
 
    {:name "Signal Wifi 0 Bar"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -699,7 +699,7 @@
 
    {:name "Signal Wifi 1 Bar"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
            [:path
@@ -714,7 +714,7 @@
 
    {:name "Signal Wifi 2 Bar"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
            [:path
@@ -729,7 +729,7 @@
 
    {:name "Signal Wifi 3 Bar"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
            [:path
@@ -744,7 +744,7 @@
 
    {:name "Signal Wifi 4 Bar"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -753,7 +753,7 @@
 
    {:name "Signal Wifi Off"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -762,7 +762,7 @@
 
    {:name "Signal Wifi Statusbar 0 Bar"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -772,7 +772,7 @@
 
    {:name "Signal Wifi Statusbar 1 Bar"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
            [:path
@@ -787,7 +787,7 @@
 
    {:name "Signal Wifi Statusbar 2 Bar"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
            [:path
@@ -802,7 +802,7 @@
 
    {:name "Signal Wifi Statusbar 3 Bar"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
            [:path
@@ -817,7 +817,7 @@
 
    {:name "Signal Wifi Statusbar 4 Bar"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -826,7 +826,7 @@
 
    {:name "Signal Wifi Statusbar Null"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -835,7 +835,7 @@
 
    {:name "Storage"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -844,7 +844,7 @@
 
    {:name "Usb"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -853,7 +853,7 @@
 
    {:name "Wifi Lock"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -862,7 +862,7 @@
 
    {:name "Wifi Tethering"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
diff --git a/src/uxbox/library/icons/material/editor.cljs b/src/uxbox/library/icons/material/editor.cljs
index 359f54c3f..8c6f334d4 100644
--- a/src/uxbox/library/icons/material/editor.cljs
+++ b/src/uxbox/library/icons/material/editor.cljs
@@ -7,7 +7,7 @@
 (def +icons+
   [{:name "Attach File"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -16,7 +16,7 @@
 
    {:name "Attach Money"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -25,7 +25,7 @@
 
    {:name "Border All"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -34,7 +34,7 @@
 
    {:name "Border Bottom"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -43,7 +43,7 @@
 
    {:name "Border Clear"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -52,7 +52,7 @@
 
    {:name "Border Color"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
            [:path
@@ -66,7 +66,7 @@
 
    {:name "Border Horizontal"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -75,7 +75,7 @@
 
    {:name "Border Inner"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -84,7 +84,7 @@
 
    {:name "Border Left"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -93,7 +93,7 @@
 
    {:name "Border Outer"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -102,7 +102,7 @@
 
    {:name "Border Right"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -111,7 +111,7 @@
 
    {:name "Border Style"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -120,7 +120,7 @@
 
    {:name "Border Top"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -129,7 +129,7 @@
 
    {:name "Border Vertical"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -138,7 +138,7 @@
 
    {:name "Format Align Center"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -147,7 +147,7 @@
 
    {:name "Format Align Justify"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -156,7 +156,7 @@
 
    {:name "Format Align Left"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -165,7 +165,7 @@
 
    {:name "Format Align Right"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -174,7 +174,7 @@
 
    {:name "Format Bold"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -183,7 +183,7 @@
 
    {:name "Format Clear"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -192,7 +192,7 @@
 
    {:name "Format Color Fill"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -201,7 +201,7 @@
 
    {:name "Format Color Reset"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -210,7 +210,7 @@
 
    {:name "Format Color Text"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -219,7 +219,7 @@
 
    {:name "Format Indent Decrease"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -228,7 +228,7 @@
 
    {:name "Format Italic"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -237,7 +237,7 @@
 
    {:name "Format Line Spacing"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -246,7 +246,7 @@
 
    {:name "Format List Bulleted"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -255,7 +255,7 @@
 
    {:name "Format List Numbered"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -264,7 +264,7 @@
 
    {:name "Format Paint"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -273,7 +273,7 @@
 
    {:name "Format Quote"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -281,7 +281,7 @@
 
    {:name "Format Size"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -290,7 +290,7 @@
 
    {:name "Format Strikethrough"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -299,7 +299,7 @@
 
    {:name "Format Text Direction l To r"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -307,7 +307,7 @@
 
    {:name "Format Underline"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -316,7 +316,7 @@
 
    {:name "Functions"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -325,7 +325,7 @@
 
    {:name "Insert Chart"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -334,7 +334,7 @@
 
    {:name "Insert Comment"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -343,7 +343,7 @@
 
    {:name "Insert Drive File"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -352,7 +352,7 @@
 
    {:name "Insert Emoticon"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -361,7 +361,7 @@
 
    {:name "Insert Invitation"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -370,7 +370,7 @@
 
    {:name "Insert Link"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -379,7 +379,7 @@
 
    {:name "Insert Photo"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -388,7 +388,7 @@
 
    {:name "Merge Type"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -397,7 +397,7 @@
 
    {:name "Mode Comment"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -406,7 +406,7 @@
 
    {:name "Publish"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -414,7 +414,7 @@
 
    {:name "Vertical Align Bottom"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -422,7 +422,7 @@
 
    {:name "Vertical Align Center"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -431,7 +431,7 @@
 
    {:name "Vertical Align Top"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -439,7 +439,7 @@
 
    {:name "Wrap Text"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
diff --git a/src/uxbox/library/icons/material/file.cljs b/src/uxbox/library/icons/material/file.cljs
index ad77ef2fd..aa1c0548b 100644
--- a/src/uxbox/library/icons/material/file.cljs
+++ b/src/uxbox/library/icons/material/file.cljs
@@ -7,7 +7,7 @@
 (def +icons+
   [{:name "Attachment"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:d
@@ -15,7 +15,7 @@
 
    {:name "Cloud"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:d
@@ -23,7 +23,7 @@
 
    {:name "Cloud Circle"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:d
@@ -31,7 +31,7 @@
 
    {:name "Cloud Done"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:d
@@ -39,7 +39,7 @@
 
    {:name "Cloud Download"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:d
@@ -47,7 +47,7 @@
 
    {:name "Cloud Off"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -56,7 +56,7 @@
 
    {:name "Cloud Queue"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -65,7 +65,7 @@
 
    {:name "Cloud Upload"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -74,7 +74,7 @@
 
    {:name "File Download"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -82,7 +82,7 @@
 
    {:name "File Upload"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -90,7 +90,7 @@
 
    {:name "Folder"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -99,7 +99,7 @@
 
    {:name "Folder Open"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -108,7 +108,7 @@
 
    {:name "Folder Shared"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
diff --git a/src/uxbox/library/icons/material/hardware.cljs b/src/uxbox/library/icons/material/hardware.cljs
index d4e2e5d6b..34e911454 100644
--- a/src/uxbox/library/icons/material/hardware.cljs
+++ b/src/uxbox/library/icons/material/hardware.cljs
@@ -7,7 +7,7 @@
 (def +icons+
   [{:name "Cast"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -16,7 +16,7 @@
 
    {:name "Cast Connected"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -25,7 +25,7 @@
 
    {:name "Computer"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -34,7 +34,7 @@
 
    {:name "Desktop Mac"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -43,7 +43,7 @@
 
    {:name "Desktop Windows"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -52,7 +52,7 @@
 
    {:name "Dock"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -61,7 +61,7 @@
 
    {:name "Gamepad"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -70,7 +70,7 @@
 
    {:name "Headset"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -79,7 +79,7 @@
 
    {:name "Headset Mic"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -88,7 +88,7 @@
 
    {:name "Keyboard"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -97,7 +97,7 @@
 
    {:name "Keyboard Alt"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -106,7 +106,7 @@
 
    {:name "Keyboard Arrow Down"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -114,7 +114,7 @@
 
    {:name "Keyboard Arrow Left"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -122,7 +122,7 @@
 
    {:name "Keyboard Arrow Right"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -130,7 +130,7 @@
 
    {:name "Keyboard Arrow Up"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -138,7 +138,7 @@
 
    {:name "Keyboard Capslock"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -147,7 +147,7 @@
 
    {:name "Keyboard Control"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -156,7 +156,7 @@
 
    {:name "Keyboard Hide"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -165,7 +165,7 @@
 
    {:name "Keyboard Return"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -174,7 +174,7 @@
 
    {:name "Keyboard Tab"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -183,7 +183,7 @@
 
    {:name "Keyboard Voice"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -192,7 +192,7 @@
 
    {:name "Laptop"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -201,7 +201,7 @@
 
    {:name "Laptop Chromebook"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -210,7 +210,7 @@
 
    {:name "Laptop Mac"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -219,7 +219,7 @@
 
    {:name "Laptop Windows"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -228,7 +228,7 @@
 
    {:name "Memory"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -237,7 +237,7 @@
 
    {:name "Mouse"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -246,7 +246,7 @@
 
    {:name "Phone android"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -255,7 +255,7 @@
 
    {:name "Phone iPhone"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -264,7 +264,7 @@
 
    {:name "Phonelink"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -273,7 +273,7 @@
 
    {:name "Phonelink Off"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -282,7 +282,7 @@
 
    {:name "Security"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -291,7 +291,7 @@
 
    {:name "Sim Card"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -300,7 +300,7 @@
 
    {:name "Smartphone"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -309,7 +309,7 @@
 
    {:name "Speaker"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -318,7 +318,7 @@
 
    {:name "Tablet"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -327,7 +327,7 @@
 
    {:name "Tablet Android"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -336,7 +336,7 @@
 
    {:name "Tablet Mac"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -345,7 +345,7 @@
 
    {:name "TV"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -354,7 +354,7 @@
 
    {:name "Clock"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
diff --git a/src/uxbox/library/icons/material/image.cljs b/src/uxbox/library/icons/material/image.cljs
index 905c3b04a..cd83fba8c 100644
--- a/src/uxbox/library/icons/material/image.cljs
+++ b/src/uxbox/library/icons/material/image.cljs
@@ -7,7 +7,7 @@
 (def +icons+
   [{:name "Add To photos"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -16,7 +16,7 @@
 
    {:name "Adjust"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -25,7 +25,7 @@
 
    {:name "Assistant Photo"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -33,7 +33,7 @@
 
    {:name "Audiotrack"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -42,7 +42,7 @@
 
    {:name "Blur Circular"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -51,7 +51,7 @@
 
    {:name "Blur Linear"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -60,7 +60,7 @@
 
    {:name "Blur Off"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -69,7 +69,7 @@
 
    {:name "Blur On"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -78,7 +78,7 @@
 
    {:name "Brightness"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:circle {:style {:stroke nil}
                     :r "20"
@@ -87,7 +87,7 @@
 
    {:name "Brightness 2"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -96,7 +96,7 @@
 
    {:name "Brightness 3"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -105,7 +105,7 @@
 
    {:name "Brightness 4"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -114,7 +114,7 @@
 
    {:name "Brightness 5"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -123,7 +123,7 @@
 
    {:name "Brightness 6"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -132,7 +132,7 @@
 
    {:name "Brightness 7"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -141,7 +141,7 @@
 
    {:name "Brush"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -150,7 +150,7 @@
 
    {:name "Camera"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -159,7 +159,7 @@
 
    {:name "Camera Alt"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -168,7 +168,7 @@
 
    {:name "Camera Front"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -177,7 +177,7 @@
 
    {:name "Camera Rear"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -186,7 +186,7 @@
 
    {:name "Camera Roll"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -195,7 +195,7 @@
 
    {:name "Center Focus Strong"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -204,7 +204,7 @@
 
    {:name "Center Focus Weak"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -213,7 +213,7 @@
 
    {:name "Collections"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -222,7 +222,7 @@
 
    {:name "Color Lens"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -231,7 +231,7 @@
 
    {:name "Colorize"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -240,7 +240,7 @@
 
    {:name "Compare"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -249,7 +249,7 @@
 
    {:name "Control Point"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -258,7 +258,7 @@
 
    {:name "Control Point Duplicate"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -267,7 +267,7 @@
 
    {:name "Crop 16:9"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -276,7 +276,7 @@
 
    {:name "Crop"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -285,7 +285,7 @@
 
    {:name "Crop 3:2"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -294,7 +294,7 @@
 
    {:name "Crop 5:4"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -303,7 +303,7 @@
 
    {:name "Crop 7:5"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -312,7 +312,7 @@
 
    {:name "Crop Din"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -321,7 +321,7 @@
 
    {:name "Crop Free"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -330,7 +330,7 @@
 
    {:name "Crop Landscape"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -339,7 +339,7 @@
 
    {:name "Crop Original"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -348,7 +348,7 @@
 
    {:name "Crop Portrait"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -357,7 +357,7 @@
 
    {:name "Crop Square"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -366,7 +366,7 @@
 
    {:name "Dehaze"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -374,7 +374,7 @@
 
    {:name "Details"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -382,7 +382,7 @@
 
    {:name "Edit"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -391,7 +391,7 @@
 
    {:name "Exposure"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -400,7 +400,7 @@
 
    {:name "Exposure Minus 1"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -409,7 +409,7 @@
 
    {:name "Exposure Minus 2"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -418,7 +418,7 @@
 
    {:name "Exposure Plus 1"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -427,7 +427,7 @@
 
    {:name "Exposure Plus 2"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -436,7 +436,7 @@
 
    {:name "Exposure Zero"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -445,7 +445,7 @@
 
    {:name "Filter 1"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -454,7 +454,7 @@
 
    {:name "Filter 2"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -463,7 +463,7 @@
 
    {:name "Filter 3"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -472,7 +472,7 @@
 
    {:name "Filter 4"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -481,7 +481,7 @@
 
    {:name "Filter 5"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -490,7 +490,7 @@
 
    {:name "Filter 6"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -499,7 +499,7 @@
 
    {:name "Filter 7"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -508,7 +508,7 @@
 
    {:name "Filter 8"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -517,7 +517,7 @@
 
    {:name "Filter b and w"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -526,7 +526,7 @@
 
    {:name "Filter Center Focus"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -535,7 +535,7 @@
 
    {:name "Filter Drama"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -544,7 +544,7 @@
 
    {:name "Filter Frames"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -553,7 +553,7 @@
 
    {:name "Filter HDR"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -562,7 +562,7 @@
 
    {:name "Filter None"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -571,7 +571,7 @@
 
    {:name "Filter Tilt Shift"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -580,7 +580,7 @@
 
    {:name "Filter Vintage"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -589,7 +589,7 @@
 
    {:name "Flare"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -598,7 +598,7 @@
 
    {:name "Flash Auto"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -607,7 +607,7 @@
 
    {:name "Flash Off"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -616,14 +616,14 @@
 
    {:name "Flash On"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:style {:stroke nil}
                   :d "M14 4v22h6v18l14-24h-8l8-16z"}]}
 
    {:name "Flip"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -632,7 +632,7 @@
 
    {:name "Gradient"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -641,7 +641,7 @@
 
    {:name "Grain"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -650,7 +650,7 @@
 
    {:name "Grid Off"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -659,7 +659,7 @@
 
    {:name "Grid On"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -668,7 +668,7 @@
 
    {:name "HDR Off"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -677,7 +677,7 @@
 
    {:name "HDR On"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -686,7 +686,7 @@
 
    {:name "HDR Strong"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -695,7 +695,7 @@
 
    {:name "HDR Weak"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -704,7 +704,7 @@
 
    {:name "Healing"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -713,7 +713,7 @@
 
    {:name "Image"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -722,7 +722,7 @@
 
    {:name "Image Aspect Ratio"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -731,7 +731,7 @@
 
    {:name "Iso"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -740,7 +740,7 @@
 
    {:name "Landscape"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -749,7 +749,7 @@
 
    {:name "Leak Add"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -758,7 +758,7 @@
 
    {:name "Leak Remove"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -767,7 +767,7 @@
 
    {:name "Lens"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -776,7 +776,7 @@
 
    {:name "Looks 3"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -785,7 +785,7 @@
 
    {:name "Looks 4"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -794,7 +794,7 @@
 
    {:name "Looks 5"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -803,7 +803,7 @@
 
    {:name "Looks 6"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -812,7 +812,7 @@
 
    {:name "Looks"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -821,7 +821,7 @@
 
    {:name "Looks One"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -830,7 +830,7 @@
 
    {:name "Looks Two"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -839,7 +839,7 @@
 
    {:name "Loupe"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -848,7 +848,7 @@
 
    {:name "Movie Creation"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -857,7 +857,7 @@
 
    {:name "Nature"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -866,7 +866,7 @@
 
    {:name "Navigate Before"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -874,7 +874,7 @@
 
    {:name "Navigate Next"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -882,7 +882,7 @@
 
    {:name "Palette"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -891,7 +891,7 @@
 
    {:name "Panorama"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -900,7 +900,7 @@
 
    {:name "Panorama Fisheye"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -909,7 +909,7 @@
 
    {:name "Panorama Horizontal"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -918,7 +918,7 @@
 
    {:name "Panorama Vertical"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -927,7 +927,7 @@
 
    {:name "Panorama Wide Angle"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -936,7 +936,7 @@
 
    {:name "Photo"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -945,7 +945,7 @@
 
    {:name "Photo Album"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -954,7 +954,7 @@
 
    {:name "Photo Camera"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
            [:circle {:r "6.4"
@@ -967,7 +967,7 @@
 
    {:name "Photo Library"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -976,7 +976,7 @@
 
    {:name "Portrait"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -985,7 +985,7 @@
 
    {:name "Remove Red Eye"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -994,7 +994,7 @@
 
    {:name "Rotate Left"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -1003,7 +1003,7 @@
 
    {:name "Rotate Right"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -1012,7 +1012,7 @@
 
    {:name "Slideshow"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -1021,7 +1021,7 @@
 
    {:name "Straighten"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -1030,7 +1030,7 @@
 
    {:name "Style"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -1039,7 +1039,7 @@
 
    {:name "Switch Camera"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -1048,7 +1048,7 @@
 
    {:name "Switch Video"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -1057,7 +1057,7 @@
 
    {:name "Tag Faces"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -1066,7 +1066,7 @@
 
    {:name "Texture"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -1075,7 +1075,7 @@
 
    {:name "Timelapse"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -1084,7 +1084,7 @@
 
    {:name "Timer 3"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -1093,7 +1093,7 @@
 
    {:name "Timer"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -1102,7 +1102,7 @@
 
    {:name "Timer Auto"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -1111,7 +1111,7 @@
 
    {:name "Timer Off"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -1120,7 +1120,7 @@
 
    {:name "Tonality"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -1129,7 +1129,7 @@
 
    {:name "Transform"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -1138,7 +1138,7 @@
 
    {:name "Tune"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -1147,7 +1147,7 @@
 
    {:name "WB Auto"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -1156,7 +1156,7 @@
 
    {:name "WB Cloudy"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -1165,7 +1165,7 @@
 
    {:name "WB Incandescent"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -1174,7 +1174,7 @@
 
    {:name "WB Irradescent"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -1183,7 +1183,7 @@
 
    {:name "WB Sunny"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
diff --git a/src/uxbox/library/icons/material/maps.cljs b/src/uxbox/library/icons/material/maps.cljs
index 81cd13c5c..d9e138e49 100644
--- a/src/uxbox/library/icons/material/maps.cljs
+++ b/src/uxbox/library/icons/material/maps.cljs
@@ -7,7 +7,7 @@
 (def +icons+
   [{:name "Been Here"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -16,7 +16,7 @@
 
     {:name "Direction"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -25,7 +25,7 @@
 
     {:name "Direction Bike"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -34,7 +34,7 @@
 
     {:name "Direction Bus"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -43,7 +43,7 @@
 
     {:name "Direction Car"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -52,7 +52,7 @@
 
     {:name "Direction Ferry"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -61,7 +61,7 @@
 
     {:name "Direction Subway"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -70,7 +70,7 @@
 
     {:name "Direction Train"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -79,7 +79,7 @@
 
     {:name "Direction Transit"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -88,7 +88,7 @@
 
     {:name "Direction Walk"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -97,7 +97,7 @@
 
     {:name "Flight"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
      [:path {:d "M20.36 18"}]
@@ -108,7 +108,7 @@
 
     {:name "Hotel"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -117,7 +117,7 @@
 
     {:name "Layers"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -126,7 +126,7 @@
 
     {:name "Layers Clear"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -135,7 +135,7 @@
 
     {:name "Local Airport"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -144,7 +144,7 @@
 
     {:name "Local ATM"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -153,7 +153,7 @@
 
     {:name "Local Attraction"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -162,7 +162,7 @@
 
     {:name "Local Bar"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -171,7 +171,7 @@
 
     {:name "Local Cafe"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -180,7 +180,7 @@
 
     {:name "Local Car Wash"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -189,7 +189,7 @@
 
     {:name "Local Convenience Store"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -198,7 +198,7 @@
 
     {:name "Local Drink"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -207,7 +207,7 @@
 
     {:name "Local Florist"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -216,7 +216,7 @@
 
     {:name "Local Gas Station"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -225,7 +225,7 @@
 
     {:name "Local Grocery Store"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -234,7 +234,7 @@
 
     {:name "Local Hospital"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -243,7 +243,7 @@
 
     {:name "Local Hotel"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -252,7 +252,7 @@
 
     {:name "Local Laundry Service"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -261,7 +261,7 @@
 
     {:name "Local Library"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -270,7 +270,7 @@
 
     {:name "Local Mall"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -279,7 +279,7 @@
 
     {:name "Local Movies"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -288,7 +288,7 @@
 
     {:name "Local Offer"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -297,7 +297,7 @@
 
     {:name "Local Parking"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -306,7 +306,7 @@
 
     {:name "Local Pharmacy"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -315,7 +315,7 @@
 
     {:name "Local Phone"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -324,7 +324,7 @@
 
     {:name "Local Pizza"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -333,7 +333,7 @@
 
     {:name "Local Play"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -342,7 +342,7 @@
 
     {:name "Local Post Office"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -351,7 +351,7 @@
 
     {:name "Local Print Shop"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -360,7 +360,7 @@
 
     {:name "Local Restaurant"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -369,7 +369,7 @@
 
     {:name "Local See"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:g
      [:circle {:r "6.4"
@@ -382,7 +382,7 @@
 
     {:name "Local Shipping"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -391,7 +391,7 @@
 
     {:name "Local Taxi"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -400,7 +400,7 @@
 
     {:name "Location History"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -409,7 +409,7 @@
 
     {:name "Map"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -418,7 +418,7 @@
 
     {:name "My Location"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -427,7 +427,7 @@
 
     {:name "Navigation"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -435,7 +435,7 @@
 
     {:name "Pin Drop"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -444,7 +444,7 @@
 
     {:name "Place"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -453,7 +453,7 @@
 
     {:name "Rate Review"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -462,7 +462,7 @@
 
     {:name "Restaurant Menu"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -471,7 +471,7 @@
 
     {:name "Satellite"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -480,7 +480,7 @@
 
     {:name "Store Mall Directory"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -489,7 +489,7 @@
 
     {:name "Terrain"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
@@ -498,7 +498,7 @@
 
     {:name "Traffic"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
      {:style {:stroke nil}
diff --git a/src/uxbox/library/icons/material/navigation.cljs b/src/uxbox/library/icons/material/navigation.cljs
index d21f5b4ff..26936a1d9 100644
--- a/src/uxbox/library/icons/material/navigation.cljs
+++ b/src/uxbox/library/icons/material/navigation.cljs
@@ -7,7 +7,7 @@
 (def +icons+
   [{:name "Apps"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -16,7 +16,7 @@
 
    {:name "Arrow Back"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -25,14 +25,14 @@
 
    {:name "Arrow Drop Down"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:style {:stroke nil}
                   :d "M14 20l10 10 10-10z"}]}
 
    {:name "Arrow Drop Down Circle"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -41,14 +41,14 @@
 
    {:name "Arrow Drop Up"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:style {:stroke nil}
                   :d "M14 28l10-10 10 10z"}]}
 
    {:name "Arrow Forward"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -57,7 +57,7 @@
 
    {:name "Cancel"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -66,7 +66,7 @@
 
    {:name "Check"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -74,7 +74,7 @@
 
    {:name "Chevron Left"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -82,7 +82,7 @@
 
    {:name "Chevron Right"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -90,7 +90,7 @@
 
    {:name "Close"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -99,7 +99,7 @@
 
    {:name "Expand Less"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -107,7 +107,7 @@
 
    {:name "Expand More"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -115,7 +115,7 @@
 
    {:name "Fullscreen"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -124,7 +124,7 @@
 
    {:name "Fullscreen Exit"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -133,7 +133,7 @@
 
    {:name "Menu"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -141,7 +141,7 @@
 
    {:name "More Horiz"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -150,7 +150,7 @@
 
    {:name "More Vert"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -159,7 +159,7 @@
 
    {:name "Refresh"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -168,7 +168,7 @@
 
    {:name "Unfold Less"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -177,7 +177,7 @@
 
    {:name "Unfold More"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
diff --git a/src/uxbox/library/icons/material/notification.cljs b/src/uxbox/library/icons/material/notification.cljs
index 0cbf48043..b5402cf67 100644
--- a/src/uxbox/library/icons/material/notification.cljs
+++ b/src/uxbox/library/icons/material/notification.cljs
@@ -7,7 +7,7 @@
 (def +icons+
   [{:name "ADB"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -16,7 +16,7 @@
 
    {:name "Bluetooth Audio"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -25,7 +25,7 @@
 
    {:name "Disc Full"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -34,7 +34,7 @@
 
    {:name "DND Forwardslash"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -43,7 +43,7 @@
 
    {:name "Do Not Disturb"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -52,7 +52,7 @@
 
    {:name "Drive ETA"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -61,7 +61,7 @@
 
    {:name "Event Available"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -70,7 +70,7 @@
 
    {:name "Event Busy"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -79,7 +79,7 @@
 
    {:name "Event Note"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -88,7 +88,7 @@
 
    {:name "Folder Special"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -97,7 +97,7 @@
 
    {:name "MMS"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -106,7 +106,7 @@
 
    {:name "More"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -115,7 +115,7 @@
 
    {:name "Network Locked"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -124,7 +124,7 @@
 
    {:name "Network Blueooth Speaker"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -133,7 +133,7 @@
 
    {:name "Phone Forwarded"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -142,7 +142,7 @@
 
    {:name "Phone In Talk"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -151,7 +151,7 @@
 
    {:name "Phone Locked"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -160,7 +160,7 @@
 
    {:name "Phone Missed"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -169,7 +169,7 @@
 
    {:name "Phone Paused"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -178,7 +178,7 @@
 
    {:name "Play Download"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -187,7 +187,7 @@
 
    {:name "Play Install"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -196,7 +196,7 @@
 
    {:name "SD Card"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -205,7 +205,7 @@
 
    {:name "Sim Card Alert"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -214,7 +214,7 @@
 
    {:name "SMS"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -223,7 +223,7 @@
 
    {:name "SMS Failed"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -232,7 +232,7 @@
 
    {:name "Sync"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -241,7 +241,7 @@
 
    {:name "Sync Disabled"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -250,7 +250,7 @@
 
    {:name "Sync Problem"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -259,7 +259,7 @@
 
    {:name "System Update"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -268,7 +268,7 @@
 
    {:name "Tap And Play"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -277,7 +277,7 @@
 
    {:name "Time To Leave"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -286,7 +286,7 @@
 
    {:name "Vibration"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -295,7 +295,7 @@
 
    {:name "Voice Chat"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -304,7 +304,7 @@
 
    {:name "VPN Lock"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
diff --git a/src/uxbox/library/icons/material/social.cljs b/src/uxbox/library/icons/material/social.cljs
index 34287cf6b..1a3a512dc 100644
--- a/src/uxbox/library/icons/material/social.cljs
+++ b/src/uxbox/library/icons/material/social.cljs
@@ -7,144 +7,144 @@
 (def +icons+
   [{:name "Cake"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M24 12c2.21 0 4-1.79 4-4 0-.75-.21-1.46-.57-2.06L24 0l-3.43 5.94C20.21 6.54 20 7.25 20 8c0 2.21 1.79 4 4 4zm9.19 19.97l-2.15-2.15-2.16 2.15c-2.61 2.61-7.17 2.61-9.78 0l-2.15-2.15-2.16 2.15C13.5 33.28 11.77 34 9.92 34c-1.45 0-2.8-.46-3.92-1.23V42c0 1.1.9 2 2 2h32c1.1 0 2-.9 2-2v-9.23c-1.12.77-2.46 1.23-3.92 1.23-1.85 0-3.58-.72-4.89-2.03zM36 18H26v-4h-4v4H12c-3.31 0-6 2.69-6 6v3.08C6 29.24 7.76 31 9.92 31c1.05 0 2.03-.41 2.77-1.15l4.28-4.27 4.27 4.26c1.48 1.48 4.06 1.48 5.54 0l4.28-4.26 4.27 4.26c.74.74 1.72 1.15 2.77 1.15 2.16 0 3.92-1.76 3.92-3.92V24c-.02-3.31-2.71-6-6.02-6z" :style {:stroke nil}}]}
 
    {:name "Domain"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M24 14V6H4v36h40V14H24zM12 38H8v-4h4v4zm0-8H8v-4h4v4zm0-8H8v-4h4v4zm0-8H8v-4h4v4zm8 24h-4v-4h4v4zm0-8h-4v-4h4v4zm0-8h-4v-4h4v4zm0-8h-4v-4h4v4zm20 24H24v-4h4v-4h-4v-4h4v-4h-4v-4h16v20zm-4-16h-4v4h4v-4zm0 8h-4v4h4v-4z" :style {:stroke nil}}]}
 
    {:name "Group"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M32 22c3.31 0 5.98-2.69 5.98-6s-2.67-6-5.98-6c-3.31 0-6 2.69-6 6s2.69 6 6 6zm-16 0c3.31 0 5.98-2.69 5.98-6s-2.67-6-5.98-6c-3.31 0-6 2.69-6 6s2.69 6 6 6zm0 4c-4.67 0-14 2.34-14 7v5h28v-5c0-4.66-9.33-7-14-7zm16 0c-.58 0-1.23.04-1.93.11C32.39 27.78 34 30.03 34 33v5h12v-5c0-4.66-9.33-7-14-7z" :style {:stroke nil}}]}
 
    {:name "Group Add"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M16 20h-6v-6H6v6H0v4h6v6h4v-6h6v-4zm20 2c3.31 0 5.98-2.69 5.98-6s-2.67-6-5.98-6c-.64 0-1.25.1-1.83.29 1.13 1.62 1.81 3.59 1.81 5.71s-.68 4.09-1.81 5.71c.58.19 1.19.29 1.83.29zm-10 0c3.31 0 5.98-2.69 5.98-6s-2.67-6-5.98-6c-3.31 0-6 2.69-6 6s2.69 6 6 6zm13.24 4.32C40.9 27.77 42 29.64 42 32v4h6v-4c0-3.08-4.75-4.97-8.76-5.68zM26 26c-4 0-12 2-12 6v4h24v-4c0-4-8-6-12-6z" :style {:stroke nil}}]}
 
    {:name "Location City"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M30 22V10l-6-6-6 6v4H6v28h36V22H30zM14 38h-4v-4h4v4zm0-8h-4v-4h4v4zm0-8h-4v-4h4v4zm12 16h-4v-4h4v4zm0-8h-4v-4h4v4zm0-8h-4v-4h4v4zm0-8h-4v-4h4v4zm12 24h-4v-4h4v4zm0-8h-4v-4h4v4z" :style {:stroke nil}}]}
 
    {:name "Mood"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M23.99 4C12.94 4 4 12.95 4 24s8.94 20 19.99 20C35.04 44 44 35.05 44 24S35.04 4 23.99 4zM24 40c-8.84 0-16-7.16-16-16S15.16 8 24 8s16 7.16 16 16-7.16 16-16 16zm7-18c1.66 0 3-1.34 3-3s-1.34-3-3-3-3 1.34-3 3 1.34 3 3 3zm-14 0c1.66 0 3-1.34 3-3s-1.34-3-3-3-3 1.34-3 3 1.34 3 3 3zm7 13c4.66 0 8.61-2.91 10.21-7H13.79c1.6 4.09 5.55 7 10.21 7z" :style {:stroke nil}}]}
 
    {:name "Notifications"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M23 44c2.21 0 4-1.79 4-4h-8c0 2.21 1.79 4 4 4zm13-12V21c0-6.15-4.27-11.28-10-12.64V7c0-1.66-1.34-3-3-3s-3 1.34-3 3v1.36C14.27 9.72 10 14.85 10 21v11l-4 4v2h34v-2l-4-4z" :style {:stroke nil}}]}
 
    {:name "Notifications None"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M23 44c2.21 0 4-1.79 4-4h-8c0 2.21 1.79 4 4 4zm13-12V21c0-6.15-4.27-11.28-10-12.64V7c0-1.66-1.34-3-3-3s-3 1.34-3 3v1.36C14.27 9.72 10 14.85 10 21v11l-4 4v2h34v-2l-4-4zm-4 2H14V21c0-4.97 4.03-9 9-9s9 4.03 9 9v13z" :style {:stroke nil}}]}
 
    {:name "Notifications Off"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M23 44c2.21 0 4-1.79 4-4h-8c0 2.21 1.79 4 4 4zm13-23c0-6.15-4.27-11.28-10-12.64V7c0-1.66-1.34-3-3-3s-3 1.34-3 3v1.36c-1.02.24-1.98.64-2.89 1.11L36 28.36V21zm-.54 17l4 4L42 39.45 8.55 6 6 8.55l5.84 5.84C10.68 16.32 10 18.58 10 21v11l-4 4v2h29.46z" :style {:stroke nil}}]}
 
    {:name "Notifications On"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M13.16 7.16L10.3 4.3C5.51 7.95 2.35 13.59 2.05 20h4c.31-5.3 3.04-9.94 7.11-12.84zM39.95 20h4c-.3-6.41-3.46-12.05-8.25-15.7l-2.85 2.85c4.06 2.91 6.79 7.55 7.1 12.85zM36 21c0-6.15-4.27-11.28-10-12.64V7c0-1.66-1.34-3-3-3s-3 1.34-3 3v1.36C14.27 9.72 10 14.85 10 21v11l-4 4v2h34v-2l-4-4V21zM23 44c.28 0 .55-.03.81-.08 1.3-.27 2.37-1.17 2.88-2.36.2-.48.31-1 .31-1.56h-8c0 2.21 1.79 4 4 4z" :style {:stroke nil}}]}
 
    {:name "Notifications Paused"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M23 44c2.21 0 4-1.79 4-4h-8c0 2.21 1.79 4 4 4zm13-12V21c0-6.15-4.27-11.28-10-12.64V7c0-1.66-1.34-3-3-3s-3 1.34-3 3v1.36C14.27 9.72 10 14.85 10 21v11l-4 4v2h34v-2l-4-4zm-8-12.4l-5.6 6.8H28V30H18v-3.6l5.6-6.8H18V16h10v3.6z" :style {:stroke nil}}]}
 
    {:name "Pages"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M6 10v12h10l-2-8 8 2V6H10c-2.21 0-4 1.79-4 4zm10 16H6v12c0 2.21 1.79 4 4 4h12V32l-8 2 2-8zm18 8l-8-2v10h12c2.21 0 4-1.79 4-4V26H32l2 8zm4-28H26v10l8-2-2 8h10V10c0-2.21-1.79-4-4-4z" :style {:stroke nil}}]}
 
    {:name "Party Mode"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M40 8h-6.34L30 4H18l-3.66 4H8c-2.21 0-4 1.79-4 4v24c0 2.21 1.79 4 4 4h32c2.21 0 4-1.79 4-4V12c0-2.21-1.79-4-4-4zm-16 6c3.26 0 6.13 1.59 7.96 4H24c-3.31 0-6 2.69-6 6 0 .71.14 1.37.37 2H14.2c-.13-.65-.2-1.31-.2-2 0-5.52 4.48-10 10-10zm0 20c-3.26 0-6.13-1.58-7.95-4H24c3.31 0 6-2.69 6-6 0-.7-.14-1.37-.37-2h4.17c.13.65.2 1.31.2 2 0 5.52-4.48 10-10 10z" :style {:stroke nil}}]}
 
    {:name "People"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M32 22c3.31 0 5.98-2.69 5.98-6s-2.67-6-5.98-6c-3.31 0-6 2.69-6 6s2.69 6 6 6zm-16 0c3.31 0 5.98-2.69 5.98-6s-2.67-6-5.98-6c-3.31 0-6 2.69-6 6s2.69 6 6 6zm0 4c-4.67 0-14 2.34-14 7v5h28v-5c0-4.66-9.33-7-14-7zm16 0c-.58 0-1.23.04-1.93.11C32.39 27.78 34 30.03 34 33v5h12v-5c0-4.66-9.33-7-14-7z" :style {:stroke nil}}]}
 
    {:name "People Outline"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M33 26c-2.41 0-6.15.67-9 2.01-2.85-1.34-6.59-2.01-9-2.01-4.33 0-13 2.17-13 6.5V38h44v-5.5c0-4.33-8.67-6.5-13-6.5zm-8 9H5v-2.5c0-1.07 5.12-3.5 10-3.5s10 2.43 10 3.5V35zm18 0H28v-2.5c0-.91-.4-1.72-1.04-2.44C28.73 29.46 30.89 29 33 29c4.88 0 10 2.43 10 3.5V35zM15 24c3.87 0 7-3.14 7-7s-3.13-7-7-7c-3.86 0-7 3.14-7 7s3.14 7 7 7zm0-11c2.21 0 4 1.79 4 4s-1.79 4-4 4-4-1.79-4-4 1.79-4 4-4zm18 11c3.87 0 7-3.14 7-7s-3.13-7-7-7c-3.86 0-7 3.14-7 7s3.14 7 7 7zm0-11c2.21 0 4 1.79 4 4s-1.79 4-4 4-4-1.79-4-4 1.79-4 4-4z" :style {:stroke nil}}]}
 
    {:name "Person"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M24 24c4.42 0 8-3.59 8-8 0-4.42-3.58-8-8-8s-8 3.58-8 8c0 4.41 3.58 8 8 8zm0 4c-5.33 0-16 2.67-16 8v4h32v-4c0-5.33-10.67-8-16-8z" :style {:stroke nil}}]}
 
    {:name "Person Add"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M30 24c4.42 0 8-3.59 8-8 0-4.42-3.58-8-8-8s-8 3.58-8 8c0 4.41 3.58 8 8 8zm-18-4v-6H8v6H2v4h6v6h4v-6h6v-4h-6zm18 8c-5.33 0-16 2.67-16 8v4h32v-4c0-5.33-10.67-8-16-8z" :style {:stroke nil}}]}
 
    {:name "Person Outline"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M24 11.8c2.32 0 4.2 1.88 4.2 4.2s-1.88 4.2-4.2 4.2-4.2-1.88-4.2-4.2 1.88-4.2 4.2-4.2m0 18c5.95 0 12.2 2.91 12.2 4.2v2.2H11.8V34c0-1.29 6.25-4.2 12.2-4.2M24 8c-4.42 0-8 3.58-8 8 0 4.41 3.58 8 8 8s8-3.59 8-8c0-4.42-3.58-8-8-8zm0 18c-5.33 0-16 2.67-16 8v6h32v-6c0-5.33-10.67-8-16-8z" :style {:stroke nil}}]}
 
    {:name "Plus One"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M20 16h-4v8H8v4h8v8h4v-8h8v-4h-8zm9-3.84v3.64l5-1V36h4V10z" :style {:stroke nil}}]}
 
    {:name "Poll"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M38 6H10c-2.21 0-4 1.79-4 4v28c0 2.21 1.79 4 4 4h28c2.21 0 4-1.79 4-4V10c0-2.21-1.79-4-4-4zM18 34h-4V20h4v14zm8 0h-4V14h4v20zm8 0h-4v-8h4v8z" :style {:stroke nil}}]}
 
    {:name "Public"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M24 4C12.95 4 4 12.95 4 24s8.95 20 20 20 20-8.95 20-20S35.05 4 24 4zm-2 35.86C14.11 38.88 8 32.16 8 24c0-1.23.15-2.43.42-3.58L18 30v2c0 2.21 1.79 4 4 4v3.86zm13.79-5.07C35.28 33.17 33.78 32 32 32h-2v-6c0-1.1-.9-2-2-2H16v-4h4c1.1 0 2-.9 2-2v-4h4c2.21 0 4-1.79 4-4v-.83c5.86 2.37 10 8.11 10 14.83 0 4.16-1.6 7.94-4.21 10.79z" :style {:stroke nil}}]}
 
    {:name "School"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M10 26.36v8L24 42l14-7.64v-8L24 34l-14-7.64zM24 6L2 18l22 12 18-9.82V34h4V18L24 6z" :style {:stroke nil}}]}
 
    {:name "Share"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M36 32.17c-1.52 0-2.89.59-3.93 1.54L17.82 25.4c.11-.45.18-.92.18-1.4s-.07-.95-.18-1.4l14.1-8.23c1.07 1 2.5 1.62 4.08 1.62 3.31 0 6-2.69 6-6s-2.69-6-6-6-6 2.69-6 6c0 .48.07.95.18 1.4l-14.1 8.23c-1.07-1-2.5-1.62-4.08-1.62-3.31 0-6 2.69-6 6s2.69 6 6 6c1.58 0 3.01-.62 4.08-1.62l14.25 8.31c-.1.42-.16.86-.16 1.31 0 3.22 2.61 5.83 5.83 5.83s5.83-2.61 5.83-5.83-2.61-5.83-5.83-5.83z" :style {:stroke nil}}]}
 
    {:name "Whats Hot"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path {:d "M27 1.34s1.48 5.3 1.48 9.6c0 4.12-2.7 7.47-6.83 7.47s-7.25-3.34-7.25-7.47l.05-.72C10.43 15.03 8 21.23 8 28c0 8.84 7.16 16 16 16s16-7.16 16-16c0-10.79-5.19-20.41-13-26.66zM23.42 38c-3.56 0-6.45-2.81-6.45-6.28 0-3.25 2.09-5.53 5.63-6.24s7.2-2.41 9.23-5.15c.78 2.58 1.19 5.3 1.19 8.07 0 5.29-4.3 9.6-9.6 9.6z" :style {:stroke nil}}]}])
diff --git a/src/uxbox/library/icons/material/toggle.cljs b/src/uxbox/library/icons/material/toggle.cljs
index f80e2cc48..b7207096e 100644
--- a/src/uxbox/library/icons/material/toggle.cljs
+++ b/src/uxbox/library/icons/material/toggle.cljs
@@ -7,7 +7,7 @@
 (def +icons+
   [{:name "Check Box"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -16,7 +16,7 @@
 
    {:name "Check Box Outline Blank"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -25,7 +25,7 @@
 
    {:name "Radio Button Off"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -34,7 +34,7 @@
 
    {:name "Radio Button On"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -43,7 +43,7 @@
 
    {:name "Star"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -52,7 +52,7 @@
 
    {:name "Star Half"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
@@ -61,7 +61,7 @@
 
    {:name "Star Outline"
     :id (gensym "icon")
-    :type :builtin/icon
+    :type :icon
     :view-box [0 0 48 48]
     :data [:path
            {:style {:stroke nil}
diff --git a/src/uxbox/schema.cljs b/src/uxbox/schema.cljs
index fe88c70c5..0f3769df1 100644
--- a/src/uxbox/schema.cljs
+++ b/src/uxbox/schema.cljs
@@ -9,7 +9,7 @@
   (:refer-clojure :exclude [keyword uuid vector boolean map set])
   (:require [struct.core :as st]
             [uxbox.locales :refer (tr)]
-            [uxbox.shapes :refer (shape?)]))
+            [uxbox.util.geom :refer (shape?)]))
 
 ;; (def datetime
 ;;   {:message "must be an instant"
diff --git a/src/uxbox/shapes.cljs b/src/uxbox/shapes.cljs
deleted file mode 100644
index 9bd948871..000000000
--- a/src/uxbox/shapes.cljs
+++ /dev/null
@@ -1,570 +0,0 @@
-;; This Source Code Form is subject to the terms of the Mozilla Public
-;; 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-2016 Andrey Antukh <niwi@niwi.nz>
-;; Copyright (c) 2015-2016 Juan de la Cruz <delacruzgarciajuan@gmail.com>
-
-(ns uxbox.shapes
-  (:require [uxbox.util.geom.matrix :as gmt]
-            [uxbox.util.geom.point :as gpt]
-            [uxbox.util.math :as mth]
-            [uxbox.state :as st]))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Types
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(def ^:static +hierarchy+
-  (as-> (make-hierarchy) $
-    (derive $ ::rect ::shape)
-    (derive $ :builtin/icon ::rect)
-    (derive $ :builtin/rect ::rect)
-    (derive $ :builtin/line ::shape)
-    (derive $ :builtin/circle ::shape)
-    (derive $ :builtin/text ::rect)
-    (derive $ :builtin/group ::rect)))
-
-(defn shape?
-  [type]
-  {:pre [(keyword? type)]}
-  (isa? +hierarchy+ type ::shape))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Implementation Api
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn dispatch-by-type
-  [shape & params]
-  (:type shape))
-
-(defmulti move
-  dispatch-by-type
-  :hierarchy #'+hierarchy+)
-
-(defmulti move'
-  dispatch-by-type
-  :hierarchy #'+hierarchy+)
-
-(defmulti move-vertex
-  dispatch-by-type
-  :hierarchy #'+hierarchy+)
-
-(defmulti resize
-  dispatch-by-type
-  :hierarchy #'+hierarchy+)
-
-(defmulti resize'
-  dispatch-by-type
-  :hierarchy #'+hierarchy+)
-
-(defmulti size
-  dispatch-by-type
-  :hierarchy #'+hierarchy+)
-
-(defmulti rotate
-  dispatch-by-type
-  :hierarchy #'+hierarchy+)
-
-;; Used for calculate the outer rect that wraps
-;; up the whole underlying shape. Mostly used
-;; for calculate the shape or shapes selection
-;; rectangle.
-
-(defmulti outer-rect'
-  dispatch-by-type
-  :hierarchy #'+hierarchy+)
-
-;; Used for create the final shape data structure
-;; from initial shape data structure and final
-;; canvas position.
-
-(defmulti initialize
-  dispatch-by-type
-  :hierarchy #'+hierarchy+)
-
-(defmulti transformation
-  dispatch-by-type
-  :hierarchy #'+hierarchy+)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Implementation
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; Initialize
-
-(defmethod initialize ::shape
-  [shape {:keys [x1 y1 x2 y2]}]
-  (assoc shape
-         :x1 x1
-         :y1 y1
-         :x2 x2
-         :y2 y2))
-         ;; :width (- x2 x1)
-         ;; :height (- y2 y1)))
-
-(defmethod initialize :builtin/group
-  [shape {:keys [x1 y1 x2 y2] :as props}]
-  (assoc shape ::initial props))
-
-(defmethod initialize :builtin/line
-  [shape {:keys [x1 y1 x2 y2]}]
-  (assoc shape
-         :x1 x1
-         :y1 y1
-         :x2 x2
-         :y2 y2))
-
-(defmethod initialize :builtin/circle
-  [shape {:keys [x1 y1 x2 y2]}]
-  (assoc shape
-         :cx x1
-         :cy y1
-         :rx (mth/abs (- x2 x1))
-         :ry (mth/abs (- y2 y1))))
-
-(defmethod move-vertex ::rect
-  [shape vid {dx :x dy :y lock :lock}]
-  (let [{:keys [x1 x2 y1 y2]} shape]
-    (case vid
-      1 (assoc shape
-               :x1 (min x2 (+ x1 dx))
-               :y1 (min y2 (+ y1 dy)))
-      2 (assoc shape
-               :x2 (max x1 (+ x2 dx))
-               :y1 (min y2 (+ y1 dy)))
-      3 (assoc shape
-               :x1 (min x2 (+ x1 dx))
-               :y2 (max y1 (+ y2 dy)))
-      4 (assoc shape
-               :x2 (max x1 (+ x2 dx))
-               :y2 (max y1 (+ y2 dy))))))
-
-(defmethod move-vertex :builtin/circle
-  [shape vid {dx :x dy :y lock :lock}]
-  (let [[dx dy] (if lock [dx dx] [dx dy])]
-    (case vid
-      1 (assoc shape
-               :rx (- (:rx shape) dx)
-               :ry (- (:ry shape) dy))
-      2 (assoc shape
-               :rx (+ (:rx shape) dx)
-               :ry (- (:ry shape) dy))
-      3 (assoc shape
-               :rx (- (:rx shape) dx)
-               :ry (+ (:ry shape) dy))
-      4 (assoc shape
-               :rx (+ (:rx shape) dx)
-               :ry (+ (:ry shape) dy)))))
-
-;; FIXME: lock mode
-
-(defmethod resize :builtin/line
-  [shape {:keys [x y] :as pos}]
-  (assoc shape :x2 x :y2 y))
-
-(defmethod resize :builtin/circle
-  [shape {:keys [x y lock] :as pos}]
-  (let [cx (:cx shape)
-        cy (:cy shape)
-
-        rx (mth/abs (- x cx))
-        ry (mth/abs (- y cy))]
-    (if lock
-      (assoc shape :rx rx :ry rx)
-      (assoc shape :rx rx :ry ry))))
-
-(defn correct-shape
-  [shape]
-    (let [x1 (min (:x1 shape) (:x2 shape))
-          y1 (min (:y1 shape) (:y2 shape))
-          x2 (max (:x1 shape) (:x2 shape))
-          y2 (max (:y1 shape) (:y2 shape))]
-      (assoc shape :x1 x1 :x2 x2 :y1 y1 :y2 y2)))
-
-(defn equalize-sides
-  [shape]
-    (let [{:keys [x1 x2 y1 y2]} shape
-          x-side (mth/abs (- x2 x1))
-          y-side (mth/abs (- y2 y1))
-          max-side (max x-side y-side)]
-      (cond
-        (and (> x1 x2) (> y1 y2))
-          (assoc shape :x2 (- x1 max-side) :y2 (- y1 max-side))
-
-        (and (< x1 x2) (< y1 y2))
-          (assoc shape :x2 (+ x1 max-side) :y2 (+ y1 max-side))
-
-        (and (> x1 x2) (< y1 y2))
-          (assoc shape :x2 (- x1 max-side) :y2 (+ y1 max-side))
-
-        (and (< x1 x2) (> y1 y2))
-          (assoc shape :x2 (+ x1 max-side) :y2 (- y1 max-side)))))
-
-
-(defmethod resize :builtin/rect
-  [shape {:keys [x y lock] :as pos}]
-  (if lock
-    (-> shape
-        (assoc :x2 x :y2 y)
-        equalize-sides
-        correct-shape)
-    (correct-shape (assoc shape :x2 x :y2 y))))
-
-(defmethod resize :builtin/text
-  [shape {:keys [x y lock] :as pos}]
-  (if lock
-    (-> shape
-        (assoc :x2 x :y2 y)
-        equalize-sides
-        correct-shape)
-    (correct-shape (assoc shape :x2 x :y2 y))))
-
-(defmethod resize :default
-  [shape _]
-  (throw (ex-info "Not implemented (resize)" (select-keys shape [:type]))))
-
-(defmethod resize' ::rect
-  [shape {:keys [width height] :as size}]
-  (let [x1 (:x1 shape)
-        y1 (:y1 shape)]
-    (assoc shape
-           :x2 (+ x1 width)
-           :y2 (+ y1 height))))
-
-(defmethod resize' :default
-  [shape _]
-  (throw (ex-info "Not implemented (resize')" (select-keys shape [:type]))))
-
-(defmethod size ::rect
-  [{:keys [x1 y1 x2 y2] :as shape}]
-  {:width (- x2 x1)
-   :height (- y2 y1)})
-
-(defmethod size :default
-  [shape _]
-  (throw (ex-info "Not implemented (size)" (select-keys shape [:type]))))
-
-;; Move (with deltas)
-
-(defmethod move ::rect
-  [shape {dx :x dy :y}]
-  (assoc shape
-         :x1 (+ (:x1 shape) dx)
-         :y1 (+ (:y1 shape) dy)
-         :x2 (+ (:x2 shape) dx)
-         :y2 (+ (:y2 shape) dy)))
-
-(defmethod move :builtin/group
-  [shape {dx :x dy :y}]
-  (assoc shape
-         :dx (+ (:dx shape 0) dx)
-         :dy (+ (:dy shape 0) dy)))
-
-(defmethod move :builtin/line
-  [shape {dx :x dy :y}]
-  (assoc shape
-         :x1 (+ (:x1 shape) dx)
-         :y1 (+ (:y1 shape) dy)
-         :x2 (+ (:x2 shape) dx)
-         :y2 (+ (:y2 shape) dy)))
-
-(defmethod move :builtin/circle
-  [shape {dx :x dy :y}]
-  (assoc shape
-         :cx (+ (:cx shape) dx)
-         :cy (+ (:cy shape) dy)))
-
-(defmethod move :default
-  [shape _]
-  (throw (ex-info "Not implemented (move)" (select-keys shape [:type]))))
-
-(defmethod move' ::rect
-  [shape {:keys [x y] :as pos}]
-  (let [dx (if x (- (:x1 shape) x) 0)
-        dy (if y (- (:y1 shape) y) 0)]
-    (move shape (gpt/point dx dy))))
-
-(defmethod move' :builtin/line
-  [shape {:keys [x y] :as pos}]
-  (let [dx (if x (- (:x1 shape) x) 0)
-        dy (if y (- (:y1 shape) y) 0)]
-    (move shape (gpt/point dx dy))))
-
-(defmethod move' :builtin/circle
-  [shape {:keys [x y] :as pos}]
-  (let [dx (if x (- (:cx shape) x) 0)
-        dy (if y (- (:cy shape) y) 0)]
-    (move shape (gpt/point dx dy))))
-
-(defmethod move' :default
-  [shape _]
-  (throw (ex-info "Not implemented (move')" (select-keys shape [:type]))))
-
-(defmethod rotate ::shape
-  [shape rotation]
-  (assoc shape :rotation rotation))
-
-(declare container-rect)
-
-(defmethod outer-rect' ::shape
-  [{:keys [group] :as shape}]
-  (as-> shape $
-    (assoc $ :x (:x1 shape) :y (:y1 shape))
-    (merge $ (size $))
-    (container-rect $)))
-
-(defmethod outer-rect' :builtin/line
-  [{:keys [x1 y1 x2 y2 group] :as shape}]
-  (let [group (get-in @st/state [:shapes-by-id group])
-        props {:x (+ x1 (:dx group 0))
-               :y (+ y1 (:dy group 0))
-               :width (- x2 x1)
-               :height (- y2 y1)}]
-    (-> (merge shape props)
-        (container-rect))))
-
-(defmethod outer-rect' :builtin/circle
-  [{:keys [cx cy rx ry group] :as shape}]
-  (let [group (get-in @st/state [:shapes-by-id group])
-        props {:x (+ (- cx rx) (:dx group 0))
-               :y (+ (- cy ry) (:dy group 0))
-               :width (* rx 2)
-               :height (* ry 2)}]
-    (-> (merge shape props)
-        (container-rect))))
-
-(defmethod outer-rect' :builtin/group
-  [{:keys [id group rotation dx dy] :as shape}]
-  (let [shapes (->> (:items shape)
-                    (map #(get-in @st/state [:shapes-by-id %]))
-                    (map outer-rect'))
-        x (apply min (map :x shapes))
-        y (apply min (map :y shapes))
-        x' (apply max (map (fn [{:keys [x width]}] (+ x width)) shapes))
-        y' (apply max (map (fn [{:keys [y height]}] (+ y height)) shapes))
-        width (- x' x)
-        height (- y' y)
-        x (+ x dx)
-        y (+ y dy)]
-    (as-> shape $
-      (merge $ {:width width
-                :height height
-                :x x
-                :y y})
-      (container-rect $))))
-
-(defmethod outer-rect' :default
-  [shape _]
-  (throw (ex-info "Not implemented (outer-rect')" (select-keys shape [:type]))))
-
-(defmethod transformation :builtin/icon
-  [{:keys [x1 y1 rotation view-box] :or {rotation 0} :as shape}]
-  (let [{:keys [width height]} (size shape)
-        orig-width (nth view-box 2)
-        orig-height (nth view-box 3)
-        scale-x (/ width orig-width)
-        scale-y (/ height orig-height)
-        center-x (- width (/ width 2))
-        center-y (- height (/ height 2))]
-    (-> (gmt/matrix)
-        (gmt/translate x1 y1)
-        (gmt/translate center-x center-y)
-        (gmt/rotate rotation)
-        (gmt/translate (- center-x) (- center-y))
-        (gmt/scale scale-x scale-y))))
-
-(defmethod transformation :builtin/rect
-  [{:keys [x1 y1 rotation] :or {rotation 0} :as shape}]
-  (let [{:keys [width height]} (size shape)
-        center-x (+ x1 (/ width 2))
-        center-y (+ y1 (/ height 2))]
-    (-> (gmt/matrix)
-        (gmt/translate center-x center-y)
-        (gmt/rotate rotation)
-        (gmt/translate (- center-x) (- center-y)))))
-
-
-(defmethod transformation :builtin/text
-  [{:keys [x1 y1 rotation] :or {rotation 0} :as shape}]
-  (let [{:keys [width height]} (size shape)
-        center-x (+ x1 (/ width 2))
-        center-y (+ y1 (/ height 2))]
-    (-> (gmt/matrix)
-        (gmt/translate center-x center-y)
-        (gmt/rotate rotation)
-        (gmt/translate (- center-x) (- center-y)))))
-
-
-(defmethod transformation :builtin/circle
-  [{:keys [cx cy rx ry rotation] :or {rotation 0} :as shape}]
-  (-> (gmt/matrix)
-      (gmt/translate cx cy)
-      (gmt/rotate rotation)
-      (gmt/translate (- cx) (- cy))))
-
-(declare outer-rect)
-
-(defmethod transformation :builtin/group
-  [{:keys [dx dy rotation items] :or {rotation 0} :as shape}]
-  (let [shapes-by-id (get @st/state :shapes-by-id)
-        shapes (map #(get shapes-by-id %) items)
-        {:keys [x y width height]} (outer-rect shapes)
-        center-x (+ x (/ width 2))
-        center-y (+ y (/ height 2))]
-    (-> (gmt/matrix)
-        (gmt/translate (or dx 0) (or dy 0))
-        (gmt/translate center-x center-y)
-        (gmt/rotate rotation)
-        (gmt/translate (- center-x) (- center-y)))))
-
-(defmethod transformation :default
-  [shape _]
-  (throw (ex-info "Not implemented (transformation)" (select-keys shape [:type]))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Helpers
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn apply-rotation
-  [[x y :as v] rotation]
-  (let [angle (mth/radians rotation)
-        rx (- (* x (mth/cos angle))
-              (* y (mth/sin angle)))
-        ry (+ (* x (mth/sin angle))
-              (* y (mth/cos angle)))]
-    (let [r [(mth/precision rx 6)
-             (mth/precision ry 6)]]
-      r)))
-
-(defn container-rect
-  [{:keys [x y width height rotation] :as shape}]
-  (let [center-x (+ x (/ width 2))
-        center-y (+ y (/ height 2))
-
-        angle (mth/radians (or rotation 0))
-        x1 (- x center-x)
-        y1 (- y center-y)
-
-        x2 (- (+ x width) center-x)
-        y2 (- y center-y)
-
-        [rx1 ry1] (apply-rotation [x1 y1] rotation)
-        [rx2 ry2] (apply-rotation [x2 y2] rotation)
-
-        [d1 d2] (cond
-                  (and (>= rotation 0)
-                       (< rotation 90))
-                  [(mth/abs ry1)
-                   (mth/abs rx2)]
-
-                  (and (>= rotation 90)
-                       (< rotation 180))
-                  [(mth/abs ry2)
-                   (mth/abs rx1)]
-
-                  (and (>= rotation 180)
-                       (< rotation 270))
-                  [(mth/abs ry1)
-                   (mth/abs rx2)]
-
-                  (and (>= rotation 270)
-                       (<= rotation 360))
-                  [(mth/abs ry2)
-                   (mth/abs rx1)])
-        final-x (- center-x d2)
-        final-y (- center-y d1)
-        final-width (* d2 2)
-        final-height (* d1 2)]
-    (merge shape
-           {:x final-x
-            :y final-y
-            :width final-width
-            :height final-height})))
-
-;; (defn group-dimensions
-;;   "Given a collection of shapes, calculates the
-;;   dimensions of the resultant group."
-;;   [shapes]
-;;   {:pre [(seq shapes)]}
-;;   (let [shapes (map container-rect shapes)
-;;         x (apply min (map :x shapes))
-;;         y (apply min (map :y shapes))
-;;         x' (apply max (map (fn [{:keys [x width]}] (+ x width)) shapes))
-;;         y' (apply max (map (fn [{:keys [y height]}] (+ y height)) shapes))
-;;         width (- x' x)
-;;         height (- y' y)]
-;;     {:width width
-;;      :height height
-;;      :view-box [0 0 width height]
-;;      :x x
-;;      :y y}))
-
-(defn outer-rect
-  [shapes]
-  {:pre [(seq shapes)]}
-  (let [shapes (map outer-rect' shapes)
-        x (apply min (map :x shapes))
-        y (apply min (map :y shapes))
-        x' (apply max (map (fn [{:keys [x width]}] (+ x width)) shapes))
-        y' (apply max (map (fn [{:keys [y height]}] (+ y height)) shapes))
-        width (- x' x)
-        height (- y' y)]
-    {:width width
-     :height height
-     :x x
-     :y y}))
-
-(defn translate-coords
-  "Given a shape and initial coords, transform
-  it mapping its coords to new provided initial coords."
-  ([shape x y]
-   (translate-coords shape x y -))
-  ([shape x y op]
-   (let [x' (:x shape)
-         y' (:y shape)]
-     (assoc shape :x (op x' x) :y (op y' y)))))
-
-(defn resolve-parent
-  "Recursively resolve the real shape parent."
-  [{:keys [group] :as shape}]
-  (if group
-    (resolve-parent (get-in @st/state [:shapes-by-id group]))
-    shape))
-
-(defn parent-satisfies?
-  "Resolve the first parent that satisfies a condition."
-  [{:keys [group] :as shape} pred]
-  (let [shapes-by-id (:shapes-by-id @st/state)]
-    (if group
-      (loop [parent (get shapes-by-id group)]
-        (cond
-          (pred parent) true
-          (:group parent) (recur (get shapes-by-id (:group parent)))
-          :else false))
-      false)))
-
-(defn contained-in?
-  "Check if a shape is contained in the
-  provided selection rect."
-  [shape selrect]
-  (let [sx1 (:x selrect)
-        sx2 (+ sx1 (:width selrect))
-        sy1 (:y selrect)
-        sy2 (+ sy1 (:height selrect))
-        rx1 (:x shape)
-        rx2 (+ rx1 (:width shape))
-        ry1 (:y shape)
-        ry2 (+ ry1 (:height shape))]
-    (and (neg? (- (:y selrect) (:y shape)))
-         (neg? (- (:x selrect) (:x shape)))
-         (pos? (- (+ (:y selrect)
-                     (:height selrect))
-                  (+ (:y shape)
-                     (:height shape))))
-         (pos? (- (+ (:x selrect)
-                     (:width selrect))
-                  (+ (:x shape)
-                     (:width shape)))))))
-
-
diff --git a/src/uxbox/state/shapes.cljs b/src/uxbox/state/shapes.cljs
index 8ccb38bfa..8a1cc94ab 100644
--- a/src/uxbox/state/shapes.cljs
+++ b/src/uxbox/state/shapes.cljs
@@ -1,7 +1,7 @@
 (ns uxbox.state.shapes
   "A collection of functions for manage shapes insinde the state."
-  (:require [uxbox.shapes :as sh]
-            [uxbox.util.data :refer (index-of)]))
+  (:require [uxbox.util.data :refer (index-of)]
+            [uxbox.util.geom :as geom]))
 
 ;; --- Shape Creation
 
@@ -18,7 +18,7 @@
    (duplicate-shapes' state shapes page nil))
   ([state shapes page group]
    (letfn [(duplicate-shape [state shape page group]
-             (if (= (:type shape) :builtin/group)
+             (if (= (:type shape) :group)
                (let [id (random-uuid)
                      items (:items shape)
                      shape (assoc shape :id id :page page :items [])
@@ -75,7 +75,7 @@
   "A function that dissoc shape from the indexed
   data structure of shapes from the state."
   [state {:keys [id type] :as shape}]
-  (if (= :builtin/group type)
+  (if (= :group type)
     (let [items (map #(get-in state [:shapes-by-id %]) (:items shape))]
       (as-> state $
         (update-in $ [:shapes-by-id] dissoc id)
@@ -236,24 +236,30 @@
     :bottom (drop-relative state :last shape)
     (throw (ex-info "Invalid data" {}))))
 
-;; --- Shape Packing
+;; --- Shape Selection
 
-;; (defn- deep-scan-shape-ids
-;;   [state acc id]
-;;   (let [shape (get-in state [:shapes-by-id id])]
-;;     (if (= (:type shape) :builtin/group)
-;;       (reduce (partial deep-scan-shape-ids state)
-;;               (conj acc id)
-;;               (:items shape))
-;;       (conj acc id))))
+(defn- try-match-shape
+  [xf selrect acc {:keys [type id items] :as shape}]
+  (cond
+    (geom/contained-in? shape selrect)
+    (conj acc id)
 
-;; (defn pack-shape
-;;   [state id]
-;;   (let [ids (deep-scan-shape-ids state #{} id)
-;;         index (reduce (fn [acc id]
-;;                         (let [shape (get-in state [:shapes-by-id id])]
-;;                           (assoc acc id shape)))
-;;                       {} ids)]
-;;     {:type :builtin/packed-shape
-;;      :index index
-;;      :id id}))
+    (:locked shape)
+    acc
+
+    (= type :group)
+    (reduce (partial try-match-shape xf selrect)
+            acc (sequence xf items))
+
+    :else
+    acc))
+
+(defn match-by-selrect
+  [state page selrect]
+  (let [xf (comp (map #(get-in state [:shapes-by-id %]))
+                 (remove :hidden)
+                 (remove :blocked)
+                 (map geom/outer-rect))
+        match (partial try-match-shape xf selrect)
+        shapes (get-in state [:pages-by-id page :shapes])]
+    (reduce match #{} (sequence xf shapes))))
diff --git a/src/uxbox/ui/shapes/circle.cljs b/src/uxbox/ui/shapes/circle.cljs
index 715362baa..443d028a6 100644
--- a/src/uxbox/ui/shapes/circle.cljs
+++ b/src/uxbox/ui/shapes/circle.cljs
@@ -5,13 +5,13 @@
             [lentes.core :as l]
             [uxbox.rstore :as rs]
             [uxbox.state :as st]
-            [uxbox.shapes :as ush]
             [uxbox.data.workspace :as dw]
             [uxbox.ui.core :as uuc]
             [uxbox.ui.mixins :as mx]
             [uxbox.ui.keyboard :as kbd]
             [uxbox.ui.shapes.core :as uusc]
             [uxbox.ui.shapes.icon :as uusi]
+            [uxbox.util.geom :as geom]
             [uxbox.util.dom :as dom]))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -20,7 +20,7 @@
 
 (declare handlers)
 
-;; (defmethod uusc/render-component :default ;; :builtin/icon
+;; (defmethod uusc/render-component :default ;; :icon
 ;;   [own shape]
 ;;   (let [{:keys [id x y width height group]} shape
 ;;         selected (rum/react uusc/selected-shapes-l)
@@ -49,7 +49,7 @@
           (on-mouse-up [vid event]
             (dom/stop-propagation event)
             (uuc/release-action! "ui.shape.resize"))]
-    (let [{:keys [x y width height]} (ush/outer-rect' shape)]
+    (let [{:keys [x y width height]} (geom/outer-rect shape)]
       (html
        [:g.controls
         [:rect {:x x :y y :width width :height height :stroke-dasharray "5,5"
@@ -90,10 +90,10 @@
 ;; Shape
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defmethod uusc/render-shape :builtin/circle
+(defmethod uusc/render-shape :circle
   [{:keys [id] :as shape}]
   (let [key (str id)
-        rfm (ush/transformation shape)
+        rfm (geom/transformation-matrix shape)
         props (select-keys shape [:cx :cy :rx :ry])
         attrs (-> (uusc/extract-style-attrs shape)
                   (merge {:id key :key key :transform (str rfm)})
diff --git a/src/uxbox/ui/shapes/core.cljs b/src/uxbox/ui/shapes/core.cljs
index 0851d8492..49fce455f 100644
--- a/src/uxbox/ui/shapes/core.cljs
+++ b/src/uxbox/ui/shapes/core.cljs
@@ -2,10 +2,9 @@
   (:require [lentes.core :as l]
             [cuerdas.core :as str]
             [rum.core :as rum]
-            [beicon.core :as rx]
             [uxbox.state :as st]
-            [uxbox.shapes :as sh]
-            [uxbox.ui.mixins :as mx]))
+            [uxbox.ui.mixins :as mx]
+            [uxbox.util.geom :as geom]))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Common constants
@@ -23,17 +22,21 @@
 ;; Implementation Api
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(defn dispatch-by-type
+  [shape & params]
+  (:type shape))
+
 (defmulti render-component
   (fn [own shape] (:type shape))
-  :hierarchy #'sh/+hierarchy+)
+  :hierarchy #'geom/+hierarchy+)
 
 (defmulti render-shape
-  sh/dispatch-by-type
-  :hierarchy #'sh/+hierarchy+)
+  dispatch-by-type
+  :hierarchy #'geom/+hierarchy+)
 
 (defmulti render-shape-svg
-  sh/dispatch-by-type
-  :hierarchy #'sh/+hierarchy+)
+  dispatch-by-type
+  :hierarchy #'geom/+hierarchy+)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Lenses
diff --git a/src/uxbox/ui/shapes/group.cljs b/src/uxbox/ui/shapes/group.cljs
index a8a03f8e8..a1fae973a 100644
--- a/src/uxbox/ui/shapes/group.cljs
+++ b/src/uxbox/ui/shapes/group.cljs
@@ -5,17 +5,17 @@
             [lentes.core :as l]
             [uxbox.rstore :as rs]
             [uxbox.state :as st]
-            [uxbox.shapes :as ush]
             [uxbox.data.workspace :as dw]
             [uxbox.ui.core :as uuc]
             [uxbox.ui.keyboard :as kbd]
             [uxbox.ui.shapes.core :as uusc]
+            [uxbox.util.geom :as geom]
             [uxbox.util.dom :as dom]))
 
-(defmethod uusc/render-shape :builtin/group
+(defmethod uusc/render-shape :group
   [{:keys [items id dx dy rotation] :as shape} factory]
   (let [key (str "group-" id)
-        rfm (ush/transformation shape)
+        rfm (geom/transformation-matrix shape)
         attrs (merge {:id key :key key :transform (str rfm)}
                      (uusc/extract-style-attrs shape)
                      (uusc/make-debug-attrs shape))
diff --git a/src/uxbox/ui/shapes/icon.cljs b/src/uxbox/ui/shapes/icon.cljs
index d2e396288..6b46882a8 100644
--- a/src/uxbox/ui/shapes/icon.cljs
+++ b/src/uxbox/ui/shapes/icon.cljs
@@ -5,13 +5,13 @@
             [lentes.core :as l]
             [uxbox.rstore :as rs]
             [uxbox.state :as st]
-            [uxbox.shapes :as ush]
             [uxbox.data.workspace :as dw]
             [uxbox.data.shapes :as uds]
             [uxbox.ui.core :as uuc]
             [uxbox.ui.mixins :as mx]
             [uxbox.ui.keyboard :as kbd]
             [uxbox.ui.shapes.core :as uusc]
+            [uxbox.util.geom :as geom]
             [uxbox.util.dom :as dom]))
 
 ;; --- Icon Component
@@ -23,7 +23,7 @@
     (when-not (:blocked shape)
       (cond
         (or drawing?
-            (and group (:locked (ush/resolve-parent shape))))
+            (and group (:locked (geom/resolve-parent shape))))
         nil
 
         (and (not selected?) (empty? selected))
@@ -50,7 +50,7 @@
 (defn on-mouse-up
   [event {:keys [id group] :as shape}]
   (cond
-    (and group (:locked (ush/resolve-parent shape)))
+    (and group (:locked (geom/resolve-parent shape)))
     nil
 
     :else
@@ -60,7 +60,7 @@
 
 (declare handlers)
 
-(defmethod uusc/render-component :default ;; :builtin/icon
+(defmethod uusc/render-component :default ;; :icon
   [own shape]
   (let [{:keys [id x y width height group]} shape
         selected (rum/react uusc/selected-shapes-l)
@@ -87,7 +87,7 @@
           (on-mouse-up [vid event]
             (dom/stop-propagation event)
             (uuc/release-action! "ui.shape.resize"))]
-    (let [{:keys [x y width height]} (ush/outer-rect' shape)]
+    (let [{:keys [x y width height]} (geom/inner-rect shape)]
       (html
        [:g.controls
         [:rect {:x x :y y :width width :height height :stroke-dasharray "5,5"
@@ -126,17 +126,17 @@
 
 ;; --- Shape & Shape Svg
 
-(defmethod uusc/render-shape :builtin/icon
+(defmethod uusc/render-shape :icon
   [{:keys [data id] :as shape} _]
   (let [key (str id)
-        rfm (ush/transformation shape)
+        rfm (geom/transformation-matrix shape)
         attrs (merge {:id key :key key :transform (str rfm)}
                      (uusc/extract-style-attrs shape)
                      (uusc/make-debug-attrs shape))]
     (html
      [:g attrs data])))
 
-(defmethod uusc/render-shape-svg :builtin/icon
+(defmethod uusc/render-shape-svg :icon
   [{:keys [data id view-box] :as shape}]
   (let [key (str "icon-svg-" id)
         view-box (apply str (interpose " " view-box))
diff --git a/src/uxbox/ui/shapes/line.cljs b/src/uxbox/ui/shapes/line.cljs
index 9d5fa8084..cec16ca28 100644
--- a/src/uxbox/ui/shapes/line.cljs
+++ b/src/uxbox/ui/shapes/line.cljs
@@ -5,14 +5,13 @@
             [lentes.core :as l]
             [uxbox.rstore :as rs]
             [uxbox.state :as st]
-            [uxbox.shapes :as ush]
             [uxbox.data.workspace :as dw]
             [uxbox.ui.core :as uuc]
             [uxbox.ui.keyboard :as kbd]
             [uxbox.ui.shapes.core :as uusc]
             [uxbox.util.dom :as dom]))
 
-(defmethod uusc/render-shape :builtin/line
+(defmethod uusc/render-shape :line
   [{:keys [id x1 y1 x2 y2] :as shape}]
   (let [key (str id)
         props (select-keys shape [:x1 :x2 :y2 :y1])
diff --git a/src/uxbox/ui/shapes/rect.cljs b/src/uxbox/ui/shapes/rect.cljs
index 7fb7a1281..a3157434e 100644
--- a/src/uxbox/ui/shapes/rect.cljs
+++ b/src/uxbox/ui/shapes/rect.cljs
@@ -5,18 +5,18 @@
             [lentes.core :as l]
             [uxbox.rstore :as rs]
             [uxbox.state :as st]
-            [uxbox.shapes :as ush]
             [uxbox.data.workspace :as dw]
             [uxbox.ui.core :as uuc]
             [uxbox.ui.keyboard :as kbd]
             [uxbox.ui.shapes.core :as uusc]
+            [uxbox.util.geom :as geom]
             [uxbox.util.dom :as dom]))
 
-(defmethod uusc/render-shape :builtin/rect
+(defmethod uusc/render-shape :rect
   [{:keys [id x1 y1 x2 y2] :as shape}]
   (let [key (str id)
-        rfm (ush/transformation shape)
-        size (ush/size shape)
+        rfm (geom/transformation-matrix shape)
+        size (geom/size shape)
         props {:x x1 :y y1 :id key :key key :transform (str rfm)}
         attrs (-> (uusc/extract-style-attrs shape)
                   (merge props size))]
diff --git a/src/uxbox/ui/shapes/text.cljs b/src/uxbox/ui/shapes/text.cljs
index 0f58f8091..00c0de545 100644
--- a/src/uxbox/ui/shapes/text.cljs
+++ b/src/uxbox/ui/shapes/text.cljs
@@ -6,7 +6,6 @@
             [goog.events :as events]
             [uxbox.rstore :as rs]
             [uxbox.state :as st]
-            [uxbox.shapes :as ush]
             [uxbox.data.shapes :as uds]
             [uxbox.data.workspace :as dw]
             [uxbox.ui.core :as uuc]
@@ -14,6 +13,7 @@
             [uxbox.ui.keyboard :as kbd]
             [uxbox.ui.shapes.core :as uusc]
             [uxbox.ui.shapes.icon :as uusi]
+            [uxbox.util.geom :as geom]
             [uxbox.util.color :as color]
             [uxbox.util.dom :as dom])
   (:import goog.events.EventType))
@@ -27,7 +27,7 @@
       (cond
         (or drawing?
             (:edition @local)
-            (and group (:locked (ush/resolve-parent shape))))
+            (and group (:locked (geom/resolve-parent shape))))
         nil
 
         (and (not selected?) (empty? selected))
@@ -52,7 +52,7 @@
 (defn on-mouse-up
   [event {:keys [id group] :as shape}]
   (cond
-    (and group (:locked (ush/resolve-parent shape)))
+    (and group (:locked (geom/resolve-parent shape)))
     nil
 
     :else
@@ -129,7 +129,7 @@
     :transfer-state text-component-transfer-state
     :mixins [mx/static rum/reactive (mx/local)]}))
 
-(defmethod uusc/render-component :builtin/text
+(defmethod uusc/render-component :text
   [own shape]
   (text-component shape))
 
@@ -164,11 +164,11 @@
      (when line-height {:lineHeight line-height})
      (when letter-spacing {:letterSpacing letter-spacing}))))
 
-(defmethod uusc/render-shape :builtin/text
+(defmethod uusc/render-shape :text
   [{:keys [id x1 y1 x2 y2 content drawing? editing?] :as shape}]
   (let [key (str id)
-        rfm (ush/transformation shape)
-        size (ush/size shape)
+        rfm (geom/transformation-matrix shape)
+        size (geom/size shape)
         props {:x x1 :y y1
                :transform (str rfm)}
         attrs (merge props size)
diff --git a/src/uxbox/ui/workspace/align.cljs b/src/uxbox/ui/workspace/align.cljs
index 0eb28517f..1640b2549 100644
--- a/src/uxbox/ui/workspace/align.cljs
+++ b/src/uxbox/ui/workspace/align.cljs
@@ -9,7 +9,6 @@
   (:require [beicon.core :as rx]
             [lentes.core :as l]
             [uxbox.state :as st]
-            [uxbox.shapes :as sh]
             [uxbox.data.core :refer (worker)]
             [uxbox.ui.workspace.base :as wb]
             [uxbox.util.geom.point :as gpt]
diff --git a/src/uxbox/ui/workspace/base.cljs b/src/uxbox/ui/workspace/base.cljs
index b1c1c49c1..477bd134a 100644
--- a/src/uxbox/ui/workspace/base.cljs
+++ b/src/uxbox/ui/workspace/base.cljs
@@ -28,7 +28,7 @@
   (letfn [(getter [state]
             (let [project (get-in state [:workspace :project])]
               (get-in state [:projects-by-id project])))]
-    (as-> (ul/getter getter) $
+    (as-> (l/getter getter) $
       (l/focus-atom $ st/state))))
 
 (def ^:const page-l
diff --git a/src/uxbox/ui/workspace/canvas.cljs b/src/uxbox/ui/workspace/canvas.cljs
index 794e35453..dcc825d6f 100644
--- a/src/uxbox/ui/workspace/canvas.cljs
+++ b/src/uxbox/ui/workspace/canvas.cljs
@@ -13,7 +13,6 @@
             [goog.events :as events]
             [uxbox.constants :as c]
             [uxbox.rstore :as rs]
-            [uxbox.shapes :as sh]
             [uxbox.data.projects :as dp]
             [uxbox.data.workspace :as dw]
             [uxbox.data.shapes :as uds]
diff --git a/src/uxbox/ui/workspace/drawarea.cljs b/src/uxbox/ui/workspace/drawarea.cljs
index 63de16dce..21453e727 100644
--- a/src/uxbox/ui/workspace/drawarea.cljs
+++ b/src/uxbox/ui/workspace/drawarea.cljs
@@ -6,13 +6,11 @@
 ;; Copyright (c) 2015-2016 Juan de la Cruz <delacruzgarciajuan@gmail.com>
 
 (ns uxbox.ui.workspace.drawarea
-  (:require-macros [uxbox.util.syntax :refer [define-once]])
   (:require [sablono.core :as html :refer-macros [html]]
             [rum.core :as rum]
             [beicon.core :as rx]
             [lentes.core :as l]
             [uxbox.rstore :as rs]
-            [uxbox.shapes :as ush]
             [uxbox.state :as st]
             [uxbox.data.workspace :as udw]
             [uxbox.data.shapes :as uds]
@@ -20,6 +18,7 @@
             [uxbox.ui.shapes.core :as uusc]
             [uxbox.ui.workspace.base :as wb]
             [uxbox.ui.mixins :as mx]
+            [uxbox.util.geom :as geom]
             [uxbox.util.geom.point :as gpt]
             [uxbox.util.dom :as dom]))
 
@@ -38,7 +37,7 @@
         position (rum/react drawing-position)]
     (when shape
       (-> (assoc shape :drawing? true)
-          (ush/resize position)
+          (geom/resize position)
           (uusc/render-shape identity)))))
 
 (defn- draw-area-will-mount
@@ -72,7 +71,7 @@
   []
   (letfn [(initialize [shape]
             (println "initialize" shape)
-            (if (= (:type shape) :builtin/icon)
+            (if (= (:type shape) :icon)
               (initialize-icon-drawing shape)
               (initialize-shape-drawing shape)))]
     (as-> uuc/actions-s $
@@ -88,7 +87,7 @@
   [shape]
   (let [{:keys [x y]} (gpt/divide @wb/mouse-canvas-a @wb/zoom-l)
         props {:x1 x :y1 y :x2 (+ x 100) :y2 (+ y 100)}
-        shape (ush/initialize shape props)]
+        shape (geom/setup shape props)]
     (rs/emit! (uds/add-shape shape)
               (udw/select-for-drawing nil)
               (uds/select-first-shape))))
@@ -103,7 +102,7 @@
           (on-complete []
             (let [shape @drawing-shape
                   shpos @drawing-position
-                  shape (ush/resize shape shpos)]
+                  shape (geom/resize shape shpos)]
               (rs/emit! (uds/add-shape shape)
                         (udw/select-for-drawing nil)
                         (uds/select-first-shape))
@@ -111,7 +110,7 @@
               (reset! drawing-shape nil)))]
 
   (let [{:keys [x y] :as pt} (gpt/divide @wb/mouse-canvas-a @wb/zoom-l)
-        shape (ush/initialize shape {:x1 x :y1 y :x2 x :y2 y})
+        shape (geom/setup shape {:x1 x :y1 y :x2 x :y2 y})
         stoper (->> uuc/actions-s
                     (rx/map :type)
                     (rx/filter #(empty? %))
diff --git a/src/uxbox/ui/workspace/movement.cljs b/src/uxbox/ui/workspace/movement.cljs
index d7ae197ce..fb464a7f6 100644
--- a/src/uxbox/ui/workspace/movement.cljs
+++ b/src/uxbox/ui/workspace/movement.cljs
@@ -12,26 +12,30 @@
             [uxbox.constants :as c]
             [uxbox.rstore :as rs]
             [uxbox.state :as st]
-            [uxbox.shapes :as sh]
             [uxbox.ui.core :as uuc]
             [uxbox.ui.workspace.base :as wb]
             [uxbox.ui.workspace.align :as align]
             [uxbox.data.shapes :as uds]
+            [uxbox.util.geom :as geom]
             [uxbox.util.geom.point :as gpt]))
 
-(declare initialize)
-(declare handle-movement)
 
 ;; --- Lenses
 
-(declare translate-to-viewport)
+;; (declare translate-to-viewport)
+
+;; (defn- resolve-selected
+;;   [state]
+;;   (let [selected (get-in state [:workspace :selected])
+;;         xf (comp
+;;             (map #(get-in state [:shapes-by-id %]))
+;;             (map translate-to-viewport))]
+;;     (into #{} xf selected)))
 
 (defn- resolve-selected
   [state]
   (let [selected (get-in state [:workspace :selected])
-        xf (comp
-            (map #(get-in state [:shapes-by-id %]))
-            (map translate-to-viewport))]
+        xf (map #(get-in state [:shapes-by-id %]))]
     (into #{} xf selected)))
 
 (def ^:const ^:private selected-shapes-l
@@ -48,6 +52,8 @@
 
 ;; --- Public Api
 
+(declare initialize)
+
 (defn watch-move-actions
   []
   (as-> uuc/actions-s $
@@ -56,62 +62,77 @@
 
 ;; --- Implementation
 
-(def coords
-  (gpt/point c/canvas-start-x
-             c/canvas-start-y))
+;; (def coords
+;;   (gpt/point c/canvas-start-x
+;;              c/canvas-start-y))
 
-(defn- translate-to-viewport
-  [shape]
-  (let [dx (- (:x2 shape) (:x1 shape))
-        dy (- (:y2 shape) (:y1 shape))
-        p1 (gpt/point (:x1 shape) (:y1 shape))
-        p2 (gpt/add p1 coords)
-        p3 (gpt/add p2 [dx dy])]
-    (assoc shape
-           :x1 (:x p2)
-           :y1 (:y p2)
-           :x2 (:x p3)
-           :y2 (:y p3))))
+;; (defn- translate-to-viewport
+;;   [shape]
+;;   (let [dx (- (:x2 shape) (:x1 shape))
+;;         dy (- (:y2 shape) (:y1 shape))
+;;         p1 (gpt/point (:x1 shape) (:y1 shape))
+;;         p2 (gpt/add p1 coords)
+;;         p3 (gpt/add p2 [dx dy])]
+;;     (assoc shape
+;;            :x1 (:x p2)
+;;            :y1 (:y p2)
+;;            :x2 (:x p3)
+;;            :y2 (:y p3))))
 
-(defn- translate-to-canvas
-  [shape]
-  (let [dx (- (:x2 shape) (:x1 shape))
-        dy (- (:y2 shape) (:y1 shape))
-        p1 (gpt/point (:x1 shape) (:y1 shape))
-        p2 (gpt/subtract p1 coords)
-        p3 (gpt/add p2 [dx dy])]
-    (assoc shape
-           :x1 (:x p2)
-           :y1 (:y p2)
-           :x2 (:x p3)
-           :y2 (:y p3))))
+;; (defn- translate-to-canvas
+;;   [shape]
+;;   (let [dx (- (:x2 shape) (:x1 shape))
+;;         dy (- (:y2 shape) (:y1 shape))
+;;         p1 (gpt/point (:x1 shape) (:y1 shape))
+;;         p2 (gpt/subtract p1 coords)
+;;         p3 (gpt/add p2 [dx dy])]
+;;     (assoc shape
+;;            :x1 (:x p2)
+;;            :y1 (:y p2)
+;;            :x2 (:x p3)
+;;            :y2 (:y p3))))
+
+;; (defn- initialize
+;;   []
+;;   (let [shapes @selected-shapes-l
+;;         align? @alignment-l
+;;         stoper (->> uuc/actions-s
+;;                     (rx/map :type)
+;;                     (rx/filter empty?)
+;;                     (rx/take 1))]
+;;     (as-> wb/mouse-delta-s $
+;;       (rx/take-until stoper $)
+;;       (rx/map #(gpt/divide % @wb/zoom-l) $)
+;;       (rx/scan (fn [acc delta]
+;;                  (let [xf (map #(geom/move % delta))]
+;;                    (into [] xf acc))) shapes $)
+;;       (rx/mapcat (fn [items]
+;;                    (if align?
+;;                      (->> (apply rx/of items)
+;;                           (rx/mapcat align/translate)
+;;                           (rx/reduce conj []))
+;;                      (rx/of items))) $)
+;;       (rx/map (fn [items]
+;;                 (mapv translate-to-canvas items)) $)
+;;       (rx/subscribe $ handle-movement))))
+
+(defn- handle-movement
+  [{:keys [id] :as shape} delta]
+  (rs/emit! (uds/move-shape id delta)))
+
+(defn- watch-movement
+  [stoper shape]
+  (as-> wb/mouse-delta-s $
+    (rx/take-until stoper $)
+    (rx/map #(gpt/divide % @wb/zoom-l) $)
+    (rx/subscribe $ (partial handle-movement shape))))
 
 (defn- initialize
   []
-  (let [shapes @selected-shapes-l
-        align? @alignment-l
+  (let [;; align? @alignment-l
         stoper (->> uuc/actions-s
                     (rx/map :type)
                     (rx/filter empty?)
                     (rx/take 1))]
-    (as-> wb/mouse-delta-s $
-      (rx/take-until stoper $)
-      (rx/map #(gpt/divide % @wb/zoom-l) $)
-      (rx/scan (fn [acc delta]
-                 (let [xf (map #(sh/move % delta))]
-                   (into [] xf acc))) shapes $)
-      (rx/mapcat (fn [items]
-                   (if align?
-                     (->> (apply rx/of items)
-                          (rx/mapcat align/translate)
-                          (rx/reduce conj []))
-                     (rx/of items))) $)
-      (rx/map (fn [items]
-                (mapv translate-to-canvas items)) $)
-
-      (rx/subscribe $ handle-movement))))
-
-(defn- handle-movement
-  [delta]
-  (doseq [shape delta]
-    (rs/emit! (uds/update-shape shape))))
+    (run! (partial watch-movement stoper)
+          (deref selected-shapes-l))))
diff --git a/src/uxbox/ui/workspace/resize.cljs b/src/uxbox/ui/workspace/resize.cljs
index e5cb4714c..e60e5158f 100644
--- a/src/uxbox/ui/workspace/resize.cljs
+++ b/src/uxbox/ui/workspace/resize.cljs
@@ -8,7 +8,6 @@
 (ns uxbox.ui.workspace.resize
   (:require [beicon.core :as rx]
             [uxbox.rstore :as rs]
-            [uxbox.shapes :as ush]
             [uxbox.data.shapes :as uds]
             [uxbox.ui.core :as uuc]
             [uxbox.ui.workspace.base :as uuwb]
diff --git a/src/uxbox/ui/workspace/selection.cljs b/src/uxbox/ui/workspace/selection.cljs
index a66cecf4c..5ea58e20d 100644
--- a/src/uxbox/ui/workspace/selection.cljs
+++ b/src/uxbox/ui/workspace/selection.cljs
@@ -11,8 +11,8 @@
             [rum.core :as rum]
             [lentes.core :as l]
             [uxbox.state :as st]
-            [uxbox.shapes :as ush]
-            [uxbox.ui.mixins :as mx]))
+            [uxbox.ui.mixins :as mx]
+            [uxbox.util.geom :as geom]))
 
 ;; --- Lenses
 
@@ -29,7 +29,7 @@
   [own]
   (let [shapes (rum/react selected-shapes-l)]
     (when (> (count shapes) 1)
-      (let [{:keys [width height x y]} (ush/outer-rect shapes)]
+      (let [{:keys [width height x y]} (geom/outer-rect-coll shapes)]
         (html
          [:g.controls
           [:rect {:x x :y y :width width :height height
diff --git a/src/uxbox/ui/workspace/selrect.cljs b/src/uxbox/ui/workspace/selrect.cljs
index a1a168440..a0aaa1392 100644
--- a/src/uxbox/ui/workspace/selrect.cljs
+++ b/src/uxbox/ui/workspace/selrect.cljs
@@ -12,7 +12,6 @@
             [beicon.core :as rx]
             [uxbox.constants :as c]
             [uxbox.rstore :as rs]
-            [uxbox.shapes :as sh]
             [uxbox.data.workspace :as dw]
             [uxbox.data.shapes :as uds]
             [uxbox.ui.core :as uuc]
diff --git a/src/uxbox/ui/workspace/sidebar/drawtools.cljs b/src/uxbox/ui/workspace/sidebar/drawtools.cljs
index 47c3810db..3ba78a841 100644
--- a/src/uxbox/ui/workspace/sidebar/drawtools.cljs
+++ b/src/uxbox/ui/workspace/sidebar/drawtools.cljs
@@ -13,7 +13,6 @@
             [uxbox.router :as r]
             [uxbox.rstore :as rs]
             [uxbox.state :as st]
-            [uxbox.shapes :as shapes]
             [uxbox.library :as library]
             [uxbox.util.data :refer (read-string)]
             [uxbox.data.workspace :as dw]
@@ -42,20 +41,20 @@
   {:rect
    {:icon i/box
     :help (tr "ds.help.rect")
-    :shape {:type :builtin/rect
+    :shape {:type :rect
             :name "Rect"
             :stroke "#000000"}
     :priority 1}
    :circle
    {:icon i/circle
     :help (tr "ds.help.circle")
-    :shape {:type :builtin/circle
+    :shape {:type :circle
             :name "Circle"}
     :priority 2}
    :line
    {:icon i/line
     :help (tr "ds.help.line")
-    :shape {:type :builtin/line
+    :shape {:type :line
             :name "Line"
             :stroke-type :solid
             :stroke "#000000"}
@@ -63,7 +62,7 @@
    :text
    {:icon i/text
     :help (tr "ds.help.text")
-    :shape {:type :builtin/text
+    :shape {:type :text
             :name "Text"
             :content "Hello world"}
     :priority 4}})
diff --git a/src/uxbox/ui/workspace/sidebar/history.cljs b/src/uxbox/ui/workspace/sidebar/history.cljs
index c4ead997d..8bfb8c98a 100644
--- a/src/uxbox/ui/workspace/sidebar/history.cljs
+++ b/src/uxbox/ui/workspace/sidebar/history.cljs
@@ -13,7 +13,6 @@
             [uxbox.router :as r]
             [uxbox.rstore :as rs]
             [uxbox.state :as st]
-            [uxbox.shapes :as shapes]
             [uxbox.library :as library]
             [uxbox.data.workspace :as dw]
             [uxbox.data.pages :as udp]
diff --git a/src/uxbox/ui/workspace/sidebar/layers.cljs b/src/uxbox/ui/workspace/sidebar/layers.cljs
index f8642d454..dad2fb593 100644
--- a/src/uxbox/ui/workspace/sidebar/layers.cljs
+++ b/src/uxbox/ui/workspace/sidebar/layers.cljs
@@ -94,12 +94,12 @@
 (defn- element-icon
   [item]
   (case (:type item)
-    :builtin/icon (uusc/render-shape-svg item)
-    :builtin/line i/line
-    :builtin/circle i/circle
-    :builtin/rect i/box
-    :builtin/text i/text
-    :builtin/group i/folder))
+    :icon (uusc/render-shape-svg item)
+    :line i/line
+    :circle i/circle
+    :rect i/box
+    :text i/text
+    :group i/folder))
 
 (defn- get-hover-position
   [event group?]
@@ -270,7 +270,7 @@
           [:ul
            (for [shape (map #(get shapes-by-id %) (:items item))
                  :let [key (str (:id shape))]]
-             (if (= (:type shape) :builtin/group)
+             (if (= (:type shape) :group)
                (-> (layer-group shape selected)
                    (rum/with-key key))
                (-> (layer-element shape selected)
@@ -307,7 +307,7 @@
        [:ul.element-list {}
         (for [shape (map #(get shapes-by-id %) (:shapes page))
               :let [key (str (:id shape))]]
-          (if (= (:type shape) :builtin/group)
+          (if (= (:type shape) :group)
             (-> (layer-group shape selected)
                 (rum/with-key key))
             (-> (layer-element shape selected)
diff --git a/src/uxbox/ui/workspace/sidebar/options.cljs b/src/uxbox/ui/workspace/sidebar/options.cljs
index ee77321f2..8651ae41e 100644
--- a/src/uxbox/ui/workspace/sidebar/options.cljs
+++ b/src/uxbox/ui/workspace/sidebar/options.cljs
@@ -13,7 +13,6 @@
             [uxbox.router :as r]
             [uxbox.rstore :as rs]
             [uxbox.state :as st]
-            [uxbox.shapes :as sh]
             [uxbox.library :as library]
             [uxbox.data.workspace :as udw]
             [uxbox.data.shapes :as uds]
@@ -23,6 +22,7 @@
             [uxbox.ui.colorpicker :refer (colorpicker)]
             [uxbox.ui.workspace.recent-colors :refer (recent-colors)]
             [uxbox.ui.workspace.base :as wb]
+            [uxbox.util.geom :as geom]
             [uxbox.util.lens :as ul]
             [uxbox.util.dom :as dom]
             [uxbox.util.data :refer (parse-int parse-float read-string)]))
@@ -32,12 +32,12 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (def ^:const ^:private +menus-map+
-  {:builtin/icon [:menu/icon-measures :menu/fill :menu/stroke]
-   :builtin/rect [:menu/rect-measures :menu/fill :menu/stroke]
-   :builtin/line [:menu/line-measures :menu/stroke]
-   :builtin/circle [:menu/circle-measures :menu/fill :menu/stroke]
-   :builtin/text [:menu/fill :menu/text]
-   :builtin/group []})
+  {:icon [:menu/icon-measures :menu/fill :menu/stroke]
+   :rect [:menu/rect-measures :menu/fill :menu/stroke]
+   :line [:menu/line-measures :menu/stroke]
+   :circle [:menu/circle-measures :menu/fill :menu/stroke]
+   :text [:menu/fill :menu/text]
+   :group []})
 
 (def ^:const ^:private +menus-by-id+
   {:menu/icon-measures
@@ -216,7 +216,7 @@
                   sid (:id shape)
                   props {attr value}]
               (rs/emit! (uds/update-radius-attrs sid props))))]
-    (let [size (sh/size shape)]
+    (let [size (geom/size shape)]
       (html
        [:div.element-set {:key (str (:id menu))}
         [:div.element-set-title (:name menu)]
@@ -308,7 +308,7 @@
                   sid (:id shape)
                   props {attr value}]
               (rs/emit! (uds/update-position sid props))))]
-    (let [size (sh/size shape)]
+    (let [size (geom/size shape)]
       (html
        [:div.element-set {:key (str (:id menu))}
         [:div.element-set-title (:name menu)]
diff --git a/src/uxbox/ui/workspace/sidebar/sitemap.cljs b/src/uxbox/ui/workspace/sidebar/sitemap.cljs
index 33560971f..ea291ec6b 100644
--- a/src/uxbox/ui/workspace/sidebar/sitemap.cljs
+++ b/src/uxbox/ui/workspace/sidebar/sitemap.cljs
@@ -15,7 +15,6 @@
             [uxbox.rstore :as rs]
             [uxbox.state :as st]
             [uxbox.state.project :as stpr]
-            [uxbox.shapes :as shapes]
             [uxbox.library :as library]
             [uxbox.data.projects :as dp]
             [uxbox.data.pages :as udp]
diff --git a/src/uxbox/util/geom.cljs b/src/uxbox/util/geom.cljs
new file mode 100644
index 000000000..38a35b6a2
--- /dev/null
+++ b/src/uxbox/util/geom.cljs
@@ -0,0 +1,635 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; 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) 2016 Andrey Antukh <niwi@niwi.nz>
+
+(ns uxbox.util.geom
+  (:require [uxbox.util.geom.matrix :as gmt]
+            [uxbox.util.geom.point :as gpt]
+            [uxbox.util.math :as mth]
+            [uxbox.state :as st]))
+
+;; --- Types
+
+(def ^:const +hierarchy+
+  (-> (make-hierarchy)
+      (derive ::rect ::shape)
+      (derive :icon ::rect)
+      (derive :rect ::rect)
+      (derive :line ::shape)
+      (derive :circle ::shape)
+      (derive :text ::rect)
+      (derive :group ::rect)))
+
+(defn shape?
+  [type]
+  (isa? +hierarchy+ type ::shape))
+
+;; --- Relative Movement
+
+(declare move-rect)
+(declare move-circle)
+(declare move-group)
+
+(defn move
+  "Move the shape relativelly to its current
+  position applying the provided delta."
+  [shape dpoint]
+  (case (:type shape)
+    :icon (move-rect shape dpoint)
+    :rect (move-rect shape dpoint)
+    :text (move-rect shape dpoint)
+    :line (move-rect shape dpoint)
+    :circle (move-circle shape dpoint)
+    :group (move-group shape dpoint)))
+
+(defn- move-rect
+  "A specialized function for relative movement
+  for rect-like shapes."
+  [shape {dx :x dy :y}]
+  (assoc shape
+         :x1 (+ (:x1 shape) dx)
+         :y1 (+ (:y1 shape) dy)
+         :x2 (+ (:x2 shape) dx)
+         :y2 (+ (:y2 shape) dy)))
+
+(defn- move-circle
+  "A specialized function for relative movement
+  for circle shapes."
+  [shape {dx :x dy :y}]
+  (assoc shape
+         :cx (+ (:cx shape) dx)
+         :cy (+ (:cy shape) dy)))
+
+(defn- move-group
+  "A specialized function for relative movement
+  for group shapes."
+  [shape {dx :x dy :y}]
+  (assoc shape
+         :dx (+ (:dx shape 0) dx)
+         :dy (+ (:dy shape 0) dy)))
+
+;; --- Absolute Movement
+
+(declare absolute-move-rect)
+(declare absolute-move-circle)
+(declare absolute-move-group)
+
+(defn absolute-move
+  "Move the shape to the exactly specified position."
+  [shape point]
+  (case (:type shape)
+    :icon (absolute-move-rect shape point)
+    :rect (absolute-move-rect shape point)
+    :line (absolute-move-rect shape point)
+    :circle (absolute-move-circle shape point)
+    :group (absolute-move-group shape point)))
+
+(defn- absolute-move-rect
+  "A specialized function for absolute moviment
+  for rect-like shapes."
+  [shape {:keys [x y] :as pos}]
+  (let [dx (if x (- (:x1 shape) x) 0)
+        dy (if y (- (:y1 shape) y) 0)]
+    (move shape (gpt/point dx dy))))
+
+(defn- absolute-move-circle
+  "A specialized function for absolute moviment
+  for rect-like shapes."
+  [shape {:keys [x y] :as pos}]
+  (let [dx (if x (- (:cx shape) x) 0)
+        dy (if y (- (:cy shape) y) 0)]
+    (move shape (gpt/point dx dy))))
+
+(defn- absolute-move-group
+  "A specialized function for absolute moviment
+  for rect-like shapes."
+  [shape {:keys [x y] :as pos}]
+  (throw (ex-info "Not implemented (TODO)" {})))
+
+;; --- Rotation
+
+;; TODO: maybe we can consider apply the rotation
+;;       directly to the shape coordinates?
+
+(defn rotate
+  "Apply the rotation to the shape."
+  [shape rotation]
+  (assoc shape :rotation rotation))
+
+;; --- Size
+
+(declare rect-size)
+
+(defn size
+  "Calculate the size of the shape."
+  [shape]
+  (case (:type shape)
+    :text (rect-size shape)
+    :rect (rect-size shape)
+    :icon (rect-size shape)
+    :line (rect-size shape)))
+
+(defn- rect-size
+  "A specialized function for calculate size
+  for rect-like shapes."
+  [{:keys [x1 y1 x2 y2] :as shape}]
+  {:width (- x2 x1)
+   :height (- y2 y1)})
+
+;; --- Vertex Movement (Relative)
+
+(declare move-rect-vertex)
+(declare move-circle-vertex)
+
+(defn move-vertex
+  "Resize the shape moving one of its vertex using
+  relative delta."
+  [shape vid dpoint]
+  (case (:type shape)
+    :rect (move-rect-vertex shape vid dpoint)
+    :text (move-rect-vertex shape vid dpoint)
+    :icon (move-rect-vertex shape vid dpoint)
+    :circle (move-circle-vertex shape vid dpoint)))
+
+(defn- move-rect-vertex
+  "A specialized function for vertex movement
+  for rect-like shapes."
+  [shape vid {dx :x dy :y}]
+  (let [{:keys [x1 x2 y1 y2]} shape]
+    (case vid
+      1 (assoc shape
+               :x1 (min x2 (+ x1 dx))
+               :y1 (min y2 (+ y1 dy)))
+      2 (assoc shape
+               :x2 (max x1 (+ x2 dx))
+               :y1 (min y2 (+ y1 dy)))
+      3 (assoc shape
+               :x1 (min x2 (+ x1 dx))
+               :y2 (max y1 (+ y2 dy)))
+      4 (assoc shape
+               :x2 (max x1 (+ x2 dx))
+               :y2 (max y1 (+ y2 dy))))))
+
+(defn- move-circle-vertex
+  "A specialized function for vertex movement
+  for circle shapes."
+  [shape vid {dx :x dy :y lock :lock}]
+  (let [[dx dy] (if lock [dx dx] [dx dy])]
+    (case vid
+      1 (assoc shape
+               :rx (- (:rx shape) dx)
+               :ry (- (:ry shape) dy))
+      2 (assoc shape
+               :rx (+ (:rx shape) dx)
+               :ry (- (:ry shape) dy))
+      3 (assoc shape
+               :rx (- (:rx shape) dx)
+               :ry (+ (:ry shape) dy))
+      4 (assoc shape
+               :rx (+ (:rx shape) dx)
+               :ry (+ (:ry shape) dy)))))
+
+;; --- Resize (Absolute)
+
+(declare resize-rect)
+(declare resize-line)
+(declare resize-circle)
+(declare normalize-shape)
+(declare equalize-sides)
+
+(defn resize
+  "Resize the shape using absolute position.
+  NOTE: used in draw operation."
+  [shape point]
+  (case (:type shape)
+    :rect (resize-rect shape point)
+    :icon (resize-rect shape point)
+    :text (resize-rect shape point)
+    :line (resize-line shape point)
+    :circle (resize-circle shape point)))
+
+(defn- resize-rect
+  "A specialized function for absolute resize
+  for rect-like shapes."
+  [shape {:keys [x y lock] :as pos}]
+  (if lock
+    (-> (assoc shape :x2 x :y2 y)
+        (equalize-sides)
+        (normalize-shape))
+    (normalize-shape (assoc shape :x2 x :y2 y))))
+
+(defn- resize-circle
+  "A specialized function for absolute resize
+  for circle shapes."
+  [shape {:keys [x y lock] :as pos}]
+  (let [cx (:cx shape)
+        cy (:cy shape)
+
+        rx (mth/abs (- x cx))
+        ry (mth/abs (- y cy))]
+    (if lock
+      (assoc shape :rx rx :ry rx)
+      (assoc shape :rx rx :ry ry))))
+
+(defn- resize-line
+  "A specialized function for absolute resize
+  for line shapes."
+  [shape {:keys [x y] :as pos}]
+  (assoc shape :x2 x :y2 y))
+
+(defn- normalize-shape
+  "Normalize shape coordinates."
+  [shape]
+  (let [x1 (min (:x1 shape) (:x2 shape))
+        y1 (min (:y1 shape) (:y2 shape))
+        x2 (max (:x1 shape) (:x2 shape))
+        y2 (max (:y1 shape) (:y2 shape))]
+    (assoc shape :x1 x1 :x2 x2 :y1 y1 :y2 y2)))
+
+(defn- equalize-sides
+  "Fix shape sides to be equal according to the lock mode."
+  [shape]
+  (let [{:keys [x1 x2 y1 y2]} shape
+        x-side (mth/abs (- x2 x1))
+        y-side (mth/abs (- y2 y1))
+        max-side (max x-side y-side)]
+    (cond
+      (and (> x1 x2) (> y1 y2))
+      (assoc shape :x2 (- x1 max-side) :y2 (- y1 max-side))
+
+      (and (< x1 x2) (< y1 y2))
+      (assoc shape :x2 (+ x1 max-side) :y2 (+ y1 max-side))
+
+      (and (> x1 x2) (< y1 y2))
+      (assoc shape :x2 (- x1 max-side) :y2 (+ y1 max-side))
+
+      (and (< x1 x2) (> y1 y2))
+      (assoc shape :x2 (+ x1 max-side) :y2 (- y1 max-side)))))
+
+;; --- Setup (Initialize)
+
+(declare setup-rect)
+(declare setup-circle)
+(declare setup-group)
+
+(defn setup
+  "A function that initializes the first coordinates for
+  the shape. Used mainly for draw operations."
+  [shape props]
+  (case (:type shape)
+    :rect (setup-rect shape props)
+    :icon (setup-rect shape props)
+    :line (setup-rect shape props)
+    :text (setup-rect shape props)
+    :circle (setup-circle shape props)
+    :group (setup-group shape props)))
+
+(defn- setup-rect
+  "A specialized function for setup rect-like shapes."
+  [shape {:keys [x1 y1 x2 y2]}]
+  (assoc shape
+         :x1 x1
+         :y1 y1
+         :x2 x2
+         :y2 y2))
+
+(defn- setup-group
+  "A specialized function for setup group shapes."
+  [shape {:keys [x1 y1 x2 y2] :as props}]
+  (assoc shape :initial props))
+
+(defn- setup-circle
+  "A specialized function for setup circle shapes."
+  [shape {:keys [x1 y1 x2 y2]}]
+  (assoc shape
+         :cx x1
+         :cy y1
+         :rx (mth/abs (- x2 x1))
+         :ry (mth/abs (- y2 y1))))
+
+;; --- Inner Rect
+
+(declare apply-rotation-transformation)
+(declare generic-inner-rect)
+(declare circle-inner-rect)
+(declare group-inner-rect)
+
+(defn inner-rect
+  ([shape] (inner-rect @st/state shape))
+  ([state shape]
+   (case (:type shape)
+     :icon (generic-inner-rect state shape)
+     :rect (generic-inner-rect state shape)
+     :text (generic-inner-rect shape shape)
+     :line (generic-inner-rect state shape)
+     :circle (circle-inner-rect state shape)
+     :group (group-inner-rect state shape))))
+
+(defn- generic-inner-rect
+  [state {:keys [x1 y1] :as shape}]
+  (-> (assoc shape :x x1 :y y1)
+      (merge (size shape))
+      (apply-rotation-transformation)))
+
+(defn- circle-inner-rect
+  [state {:keys [cx cy rx ry group] :as shape}]
+  (let [props {:x (- cx rx)
+               :y (- cy ry)
+               :width (* rx 2)
+               :height (* ry 2)}]
+    (-> (merge shape props)
+        (apply-rotation-transformation))))
+
+(defn- group-inner-rect
+  [state {:keys [id group rotation dx dy] :as shape}]
+  (let [shapes (->> (:items shape)
+                    (map #(get-in state [:shapes-by-id %]))
+                    (map #(inner-rect state %)))
+        x (apply min (map :x shapes))
+        y (apply min (map :y shapes))
+        x' (apply max (map (fn [{:keys [x width]}] (+ x width)) shapes))
+        y' (apply max (map (fn [{:keys [y height]}] (+ y height)) shapes))
+        width (- x' x)
+        height (- y' y)
+        x (+ x dx)
+        y (+ y dy)]
+    (-> (merge shape {:width width :height height :x x :y y})
+        (apply-rotation-transformation))))
+
+;; --- Outer Rect
+
+(declare generic-outer-rect)
+(declare circle-outer-rect)
+(declare group-outer-rect)
+(declare apply-rotation-transformation)
+(declare apply-parent-deltas)
+
+(defn outer-rect
+  ([shape]
+   (outer-rect @st/state shape))
+  ([state shape]
+   (let [shape (case (:type shape)
+                 :rect (generic-outer-rect state shape)
+                 :text (generic-outer-rect state shape)
+                 :icon (generic-outer-rect state shape)
+                 :line (generic-outer-rect state shape)
+                 :circle (circle-outer-rect state shape)
+                 :group (group-outer-rect state shape))]
+     (if (:group shape)
+       (let [group (get-in state [:shapes-by-id (:group shape)])]
+         (apply-parent-deltas state shape (:group group)))
+       shape))))
+
+(defn- apply-parent-deltas
+  [state {:keys [x y] :as shape} id]
+  (if-let [group (get-in state [:shapes-by-id id])]
+    (let [props {:x (+ x (:dx group 0))
+                 :y (+ y (:dy group 0))}]
+      (apply-parent-deltas state (merge shape props) (:group group)))
+    shape))
+
+(defn- generic-outer-rect
+  [state {:keys [x1 y1 x2 y2 group] :as shape}]
+  (let [group (get-in state [:shapes-by-id group])
+        props {:x (+ x1 (:dx group 0))
+               :y (+ y1 (:dy group 0))
+               :width (- x2 x1)
+               :height (- y2 y1)}]
+    (-> (merge shape props)
+        (apply-rotation-transformation))))
+
+(defn- circle-outer-rect
+  [state {:keys [cx cy rx ry group] :as shape}]
+  (let [group (get-in state [:shapes-by-id group])
+        props {:x (+ (- cx rx) (:dx group 0))
+               :y (+ (- cy ry) (:dy group 0))
+               :width (* rx 2)
+               :height (* ry 2)}]
+    (-> (merge shape props)
+        (apply-rotation-transformation))))
+
+(defn- group-outer-rect
+  [state {:keys [id group rotation dx dy] :as shape}]
+  (let [shapes (->> (:items shape)
+                    (map #(get-in state [:shapes-by-id %]))
+                    (map #(outer-rect state %)))
+        x (apply min (map :x shapes))
+        y (apply min (map :y shapes))
+        x' (apply max (map (fn [{:keys [x width]}] (+ x width)) shapes))
+        y' (apply max (map (fn [{:keys [y height]}] (+ y height)) shapes))
+        width (- x' x)
+        height (- y' y)]
+    (-> (merge shape {:width width :height height :x x :y y})
+        (apply-rotation-transformation))))
+
+(declare apply-rotation)
+
+(defn- apply-rotation-transformation
+  [{:keys [x y width height rotation] :as shape}]
+  (let [center-x (+ x (/ width 2))
+        center-y (+ y (/ height 2))
+
+        angle (mth/radians (or rotation 0))
+        x1 (- x center-x)
+        y1 (- y center-y)
+
+        x2 (- (+ x width) center-x)
+        y2 (- y center-y)
+
+        [rx1 ry1] (apply-rotation [x1 y1] rotation)
+        [rx2 ry2] (apply-rotation [x2 y2] rotation)
+
+        [d1 d2] (cond
+                  (and (>= rotation 0)
+                       (< rotation 90))
+                  [(mth/abs ry1)
+                   (mth/abs rx2)]
+
+                  (and (>= rotation 90)
+                       (< rotation 180))
+                  [(mth/abs ry2)
+                   (mth/abs rx1)]
+
+                  (and (>= rotation 180)
+                       (< rotation 270))
+                  [(mth/abs ry1)
+                   (mth/abs rx2)]
+
+                  (and (>= rotation 270)
+                       (<= rotation 360))
+                  [(mth/abs ry2)
+                   (mth/abs rx1)])
+        final-x (- center-x d2)
+        final-y (- center-y d1)
+        final-width (* d2 2)
+        final-height (* d1 2)]
+    (merge shape
+           {:x final-x
+            :y final-y
+            :width final-width
+            :height final-height})))
+
+;; --- Outer Rect Coll
+
+(defn outer-rect-coll
+  [shapes]
+  {:pre [(seq shapes)]}
+  (let [shapes (map outer-rect shapes)
+        x (apply min (map :x shapes))
+        y (apply min (map :y shapes))
+        x' (apply max (map (fn [{:keys [x width]}] (+ x width)) shapes))
+        y' (apply max (map (fn [{:keys [y height]}] (+ y height)) shapes))
+        width (- x' x)
+        height (- y' y)]
+    {:width width
+     :height height
+     :x x
+     :y y}))
+
+;; --- Transformation Matrix
+
+(declare rect-transformation-matrix)
+(declare text-transformation-matrix)
+(declare circle-transformation-matrix)
+(declare icon-transformation-matrix)
+(declare group-transformation-matrix)
+
+(defn transformation-matrix
+  ([shape]
+   (transformation-matrix @st/state shape))
+  ([state shape]
+   (case (:type shape)
+     :rect (rect-transformation-matrix state shape)
+     :text (text-transformation-matrix state shape)
+     :circle (circle-transformation-matrix state shape)
+     :icon (icon-transformation-matrix state shape)
+     :group (group-transformation-matrix state shape))))
+
+(defn- rect-transformation-matrix
+  [state {:keys [x1 y1 rotation] :or {rotation 0} :as shape}]
+  (let [{:keys [width height]} (size shape)
+        center-x (+ x1 (/ width 2))
+        center-y (+ y1 (/ height 2))]
+    (-> (gmt/matrix)
+        (gmt/translate center-x center-y)
+        (gmt/rotate rotation)
+        (gmt/translate (- center-x) (- center-y)))))
+
+(defn- text-transformation-matrix
+  [state {:keys [x1 y1 rotation] :or {rotation 0} :as shape}]
+  (let [{:keys [width height]} (size shape)
+        center-x (+ x1 (/ width 2))
+        center-y (+ y1 (/ height 2))]
+    (-> (gmt/matrix)
+        (gmt/translate center-x center-y)
+        (gmt/rotate rotation)
+        (gmt/translate (- center-x) (- center-y)))))
+
+(defn- icon-transformation-matrix
+  [state {:keys [x1 y1 rotation view-box] :or {rotation 0} :as shape}]
+  (let [{:keys [width height]} (size shape)
+        orig-width (nth view-box 2)
+        orig-height (nth view-box 3)
+        scale-x (/ width orig-width)
+        scale-y (/ height orig-height)
+        center-x (- width (/ width 2))
+        center-y (- height (/ height 2))]
+    (-> (gmt/matrix)
+        (gmt/translate x1 y1)
+        (gmt/translate center-x center-y)
+        (gmt/rotate rotation)
+        (gmt/translate (- center-x) (- center-y))
+        (gmt/scale scale-x scale-y))))
+
+(defn- circle-transformation-matrix
+  [state {:keys [cx cy rx ry rotation] :or {rotation 0} :as shape}]
+  (-> (gmt/matrix)
+      (gmt/translate cx cy)
+      (gmt/rotate rotation)
+      (gmt/translate (- cx) (- cy))))
+
+(defn- group-transformation-matrix
+  [state {:keys [dx dy rotation items] :or {rotation 0} :as shape}]
+  (let [shapes-by-id (get state :shapes-by-id)
+        shapes (map #(get shapes-by-id %) items)
+        {:keys [x y width height]} (outer-rect-coll shapes)
+        center-x (+ x (/ width 2))
+        center-y (+ y (/ height 2))]
+    (-> (gmt/matrix)
+        (gmt/translate (or dx 0) (or dy 0))
+        (gmt/translate center-x center-y)
+        (gmt/rotate rotation)
+        (gmt/translate (- center-x) (- center-y)))))
+
+;; --- Helpers
+
+(defn apply-rotation
+  [[x y :as v] rotation]
+  (let [angle (mth/radians rotation)
+        rx (- (* x (mth/cos angle))
+              (* y (mth/sin angle)))
+        ry (+ (* x (mth/sin angle))
+              (* y (mth/cos angle)))]
+    (let [r [(mth/precision rx 6)
+             (mth/precision ry 6)]]
+      r)))
+
+(defn resolve-parent
+  "Recursively resolve the real shape parent."
+  ([shape]
+   (resolve-parent @st/state shape))
+  ([state {:keys [group] :as shape}]
+   (if group
+     (resolve-parent state (get-in state [:shapes-by-id group]))
+     shape)))
+
+(defn contained-in?
+  "Check if a shape is contained in the
+  provided selection rect."
+  [shape selrect]
+  (let [sx1 (:x selrect)
+        sx2 (+ sx1 (:width selrect))
+        sy1 (:y selrect)
+        sy2 (+ sy1 (:height selrect))
+        rx1 (:x shape)
+        rx2 (+ rx1 (:width shape))
+        ry1 (:y shape)
+        ry2 (+ ry1 (:height shape))]
+    (and (neg? (- (:y selrect) (:y shape)))
+         (neg? (- (:x selrect) (:x shape)))
+         (pos? (- (+ (:y selrect)
+                     (:height selrect))
+                  (+ (:y shape)
+                     (:height shape))))
+         (pos? (- (+ (:x selrect)
+                     (:width selrect))
+                  (+ (:x shape)
+                     (:width shape)))))))
+
+;; TODO: maybe remove, seems it not used anymore.
+
+(defn translate-coords
+  "Given a shape and initial coords, transform
+  it mapping its coords to new provided initial coords."
+  ([shape x y]
+   (translate-coords shape x y -))
+  ([shape x y op]
+   (let [x' (:x shape)
+         y' (:y shape)]
+     (assoc shape :x (op x' x) :y (op y' y)))))
+
+;; This function will be deleted when selrect is implemented properly
+
+(defn parent-satisfies?
+  "Resolve the first parent that satisfies a condition."
+  [{:keys [group] :as shape} pred]
+  (let [shapes-by-id (:shapes-by-id @st/state)]
+    (if group
+      (loop [parent (get shapes-by-id group)]
+        (cond
+          (pred parent) true
+          (:group parent) (recur (get shapes-by-id (:group parent)))
+          :else false))
+      false)))
diff --git a/test/uxbox/state/shapes_tests.cljs b/test/uxbox/state/shapes_tests.cljs
index 3d389c0cf..9276c9ed2 100644
--- a/test/uxbox/state/shapes_tests.cljs
+++ b/test/uxbox/state/shapes_tests.cljs
@@ -35,7 +35,7 @@
 (t/deftest duplicate-shapes-test2
   (let [initial {:pages-by-id {1 {:id 1 :shapes [1]}}
                  :shapes-by-id {1 {:id 1 :page 1
-                                   :type :builtin/group
+                                   :type :group
                                    :items [2 3]}
                                 2 {:id 2 :page 1 :group 1}
                                 3 {:id 3 :page 1 :group 1}}}
@@ -55,7 +55,7 @@
 (t/deftest duplicate-shapes-test3
   (let [initial {:pages-by-id {1 {:id 1 :shapes [1 4]}}
                  :shapes-by-id {1 {:id 1 :page 1
-                                   :type :builtin/group
+                                   :type :group
                                    :items [2 3]}
                                 2 {:id 2 :page 1 :group 1}
                                 3 {:id 3 :page 1 :group 1}
@@ -76,14 +76,14 @@
 (t/deftest duplicate-shapes-test4
   (let [initial {:pages-by-id {1 {:id 1 :shapes [1]}}
                  :shapes-by-id {1 {:id 1 :page 1
-                                   :type :builtin/group
+                                   :type :group
                                    :items [2]}
                                 2 {:id 3 :page 1 :group 1}}}
 
         expected (-> initial
                      (assoc-in [:pages-by-id 1 :shapes] [1 3])
                      (assoc-in [:shapes-by-id 3] {:id 3 :page 1
-                                                  :type :builtin/group
+                                                  :type :group
                                                   :items [4]})
                      (assoc-in [:shapes-by-id 4] {:id 4 :page 1 :group 3}))]
     (with-redefs [cljs.core/random-uuid (constantly-inc 3)]
@@ -124,7 +124,7 @@
 (t/deftest drop-shape-test3
   (let [initial {:pages-by-id {1 {:id 1 :shapes [1 3 4]}}
                  :shapes-by-id {1 {:id 1 :page 1
-                                   :type :builtin/group
+                                   :type :group
                                    :items [2]}
                                 2 {:id 2 :page 1 :group 1}
                                 3 {:id 3 :page 1}
@@ -141,7 +141,7 @@
 (t/deftest drop-shape-test4
   (let [initial {:pages-by-id {1 {:id 1 :shapes [1 3 4]}}
                  :shapes-by-id {1 {:id 1 :page 1
-                                   :type :builtin/group
+                                   :type :group
                                    :items [2]}
                                 2 {:id 2 :page 1 :group 1}
                                 3 {:id 3 :page 1}
@@ -160,7 +160,7 @@
 (t/deftest drop-shape-test5
   (let [initial {:pages-by-id {1 {:id 1 :shapes [1 4]}}
                  :shapes-by-id {1 {:id 1 :page 1
-                                   :type :builtin/group
+                                   :type :group
                                    :items [2 3]}
                                 2 {:id 2 :page 1 :group 1}
                                 3 {:id 3 :page 1 :group 1}
@@ -177,10 +177,10 @@
 (t/deftest drop-shape-test6
   (let [initial {:pages-by-id {1 {:id 1 :shapes [1 2]}}
                  :shapes-by-id {1 {:id 1 :page 1
-                                   :type :builtin/group
+                                   :type :group
                                    :items [3]}
                                 2 {:id 2 :page 1
-                                   :type :builtin/group
+                                   :type :group
                                    :items [4]}
                                 3 {:id 3 :page 1 :group 1}
                                 4 {:id 4 :page 1 :group 2}}}
@@ -198,11 +198,11 @@
 (t/deftest drop-shape-test7
   (let [initial {:pages-by-id {1 {:id 1 :shapes [1 3]}}
                  :shapes-by-id {1 {:id 1 :page 1
-                                   :type :builtin/group
+                                   :type :group
                                    :items [2]}
                                 2 {:id 2 :page 1
                                    :group 1
-                                   :type :builtin/group
+                                   :type :group
                                    :items [4]}
                                 3 {:id 3 :page 1}
                                 4 {:id 4 :page 1 :group 2}}}
@@ -220,11 +220,11 @@
 (t/deftest drop-shape-test8
   (let [initial {:pages-by-id {1 {:id 1 :shapes [1 5 6]}}
                  :shapes-by-id {1 {:id 1 :page 1
-                                   :type :builtin/group
+                                   :type :group
                                    :items [2]}
                                 2 {:id 2 :page 1
                                    :group 1
-                                   :type :builtin/group
+                                   :type :group
                                    :items [3 4]}
                                 3 {:id 3 :page 1 :group 2}
                                 4 {:id 4 :page 1 :group 2}
@@ -243,11 +243,11 @@
 (t/deftest drop-shape-test9
   (let [initial {:pages-by-id {1 {:id 1 :shapes [1]}}
                  :shapes-by-id {1 {:id 1 :page 1
-                                   :type :builtin/group
+                                   :type :group
                                    :items [2 5 6]}
                                 2 {:id 2 :page 1
                                    :group 1
-                                   :type :builtin/group
+                                   :type :group
                                    :items [3 4]}
                                 3 {:id 3 :page 1 :group 2}
                                 4 {:id 4 :page 1 :group 2}
@@ -272,7 +272,7 @@
 (t/deftest delete-shape-test1
   (let [initial {:pages-by-id {1 {:id 1 :shapes [1 3 4]}}
                  :shapes-by-id {1 {:id 1 :page 1
-                                   :type :builtin/group
+                                   :type :group
                                    :items [2]}
                                 2 {:id 2 :page 1 :group 1}
                                 3 {:id 3 :page 1}
@@ -291,7 +291,7 @@
 (t/deftest delete-shape-test2
   (let [initial {:pages-by-id {1 {:id 1 :shapes [1 3 4]}}
                  :shapes-by-id {1 {:id 1 :page 1
-                                   :type :builtin/group
+                                   :type :group
                                    :items [2]}
                                 2 {:id 2 :page 1 :group 1}
                                 3 {:id 3 :page 1}