diff --git a/frontend/src/uxbox/main/ui/shapes/circle.cljs b/frontend/src/uxbox/main/ui/shapes/circle.cljs
index 4ede87780..a183d5147 100644
--- a/frontend/src/uxbox/main/ui/shapes/circle.cljs
+++ b/frontend/src/uxbox/main/ui/shapes/circle.cljs
@@ -40,11 +40,8 @@
   {::mf/wrap-props false}
   [props]
   (let [shape (unchecked-get props "shape")
-        {:keys [id x y width height]} shape
-        transform (geom/transform-matrix shape)
-
+        {:keys [x y width height]} (geom/selection-rect-shape shape)
         show-interactions? (mf/deref refs/show-interactions?)
-
         on-mouse-down (mf/use-callback
                        (mf/deps shape)
                        #(common/on-mouse-down-viewer % shape))]
@@ -58,7 +55,6 @@
                          :y (- y 1)
                          :width (+ width 2)
                          :height (+ height 2)
-                         :transform transform
                          :fill "#31EFB8"
                          :stroke "#31EFB8"
                          :strokeWidth 1
diff --git a/frontend/src/uxbox/main/ui/shapes/icon.cljs b/frontend/src/uxbox/main/ui/shapes/icon.cljs
index 10157390f..ee540744e 100644
--- a/frontend/src/uxbox/main/ui/shapes/icon.cljs
+++ b/frontend/src/uxbox/main/ui/shapes/icon.cljs
@@ -37,12 +37,8 @@
   [props]
   (let [shape (unchecked-get props "shape")
         frame (unchecked-get props "frame")
-
-        {:keys [x y width height]} shape
-        transform (geom/transform-matrix shape)
-
+        {:keys [x y width height]} (geom/selection-rect-shape shape)
         show-interactions? (mf/deref refs/show-interactions?)
-
         on-mouse-down (mf/use-callback
                        (mf/deps shape)
                        #(common/on-mouse-down-viewer % shape))]
@@ -55,7 +51,6 @@
                          :y (- y 1)
                          :width (+ width 2)
                          :height (+ height 2)
-                         :transform transform
                          :fill "#31EFB8"
                          :stroke "#31EFB8"
                          :strokeWidth 1
diff --git a/frontend/src/uxbox/main/ui/shapes/image.cljs b/frontend/src/uxbox/main/ui/shapes/image.cljs
index 053a7a929..91faa4ddd 100644
--- a/frontend/src/uxbox/main/ui/shapes/image.cljs
+++ b/frontend/src/uxbox/main/ui/shapes/image.cljs
@@ -46,11 +46,8 @@
   {::mf/wrap-props false}
   [props]
   (let [shape (unchecked-get props "shape")
-        {:keys [x y width height]} shape
-        transform (geom/transform-matrix shape)
-
+        {:keys [x y width height]} (geom/selection-rect-shape shape)
         show-interactions? (mf/deref refs/show-interactions?)
-
         on-mouse-down (mf/use-callback
                        (mf/deps shape)
                        #(common/on-mouse-down-viewer % shape))]
@@ -63,7 +60,6 @@
                          :y (- y 1)
                          :width (+ width 2)
                          :height (+ height 2)
-                         :transform transform
                          :fill "#31EFB8"
                          :stroke "#31EFB8"
                          :strokeWidth 1
diff --git a/frontend/src/uxbox/main/ui/shapes/path.cljs b/frontend/src/uxbox/main/ui/shapes/path.cljs
index a02b527d2..68d5eeffb 100644
--- a/frontend/src/uxbox/main/ui/shapes/path.cljs
+++ b/frontend/src/uxbox/main/ui/shapes/path.cljs
@@ -52,11 +52,8 @@
   {::mf/wrap-props false}
   [props]
   (let [shape (unchecked-get props "shape")
-        {:keys [x y width height]} (geom/shape->rect-shape shape)
-        transform (geom/transform-matrix shape)
-
+        {:keys [x y width height]} (geom/selection-rect-shape shape)
         show-interactions? (mf/deref refs/show-interactions?)
-
         on-mouse-down (mf/use-callback
                        (mf/deps shape)
                        #(common/on-mouse-down-viewer % shape))]
@@ -69,7 +66,6 @@
                          :y (- y 1)
                          :width (+ width 2)
                          :height (+ height 2)
-                         :transform transform
                          :fill "#31EFB8"
                          :stroke "#31EFB8"
                          :strokeWidth 1
diff --git a/frontend/src/uxbox/main/ui/shapes/rect.cljs b/frontend/src/uxbox/main/ui/shapes/rect.cljs
index 5b6d23c57..9b9f76ce0 100644
--- a/frontend/src/uxbox/main/ui/shapes/rect.cljs
+++ b/frontend/src/uxbox/main/ui/shapes/rect.cljs
@@ -41,11 +41,8 @@
   {::mf/wrap-props false}
   [props]
   (let [shape (unchecked-get props "shape")
-        {:keys [x y width height]} shape
-        transform (geom/transform-matrix shape)
-
+        {:keys [x y width height]} (geom/selection-rect-shape shape)
         show-interactions? (mf/deref refs/show-interactions?)
-
         on-mouse-down (mf/use-callback
                        (mf/deps shape)
                        #(common/on-mouse-down-viewer % shape))]
@@ -59,7 +56,6 @@
                          :y (- y 1)
                          :width (+ width 2)
                          :height (+ height 2)
-                         :transform transform
                          :fill "#31EFB8"
                          :stroke "#31EFB8"
                          :strokeWidth 1
diff --git a/frontend/src/uxbox/main/ui/shapes/text.cljs b/frontend/src/uxbox/main/ui/shapes/text.cljs
index a55bea6d0..a97e5cd06 100644
--- a/frontend/src/uxbox/main/ui/shapes/text.cljs
+++ b/frontend/src/uxbox/main/ui/shapes/text.cljs
@@ -80,11 +80,8 @@
   {::mf/wrap-props false}
   [props]
   (let [shape (unchecked-get props "shape")
-        {:keys [x y width height]} shape
-        transform (geom/transform-matrix shape)
-
+        {:keys [x y width height]} (geom/selection-rect-shape shape)
         show-interactions? (mf/deref refs/show-interactions?)
-
         on-mouse-down (mf/use-callback
                        (mf/deps shape)
                        #(common/on-mouse-down-viewer % shape))]
@@ -97,7 +94,6 @@
                          :y (- y 1)
                          :width (+ width 2)
                          :height (+ height 2)
-                         :transform transform
                          :fill "#31EFB8"
                          :stroke "#31EFB8"
                          :strokeWidth 1