diff --git a/frontend/resources/images/icons/component-refactor.svg b/frontend/resources/images/icons/component-refactor.svg
index 0cb789e57..289bba9b7 100644
--- a/frontend/resources/images/icons/component-refactor.svg
+++ b/frontend/resources/images/icons/component-refactor.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" stroke-linecap="round" stroke-linejoin="round">
-    <path d="M14.752 10.9998V4.99976C14.7518 4.73663 14.6824 4.47818 14.5508 4.25035C14.4191 4.02252 14.2299 3.83333 14.002 3.70176L8.752 0.701764C8.52376 0.570219 8.26494 0.500977 8.0015 0.500977C7.73806 0.500977 7.47925 0.570219 7.251 0.701764L2.001 3.70176C1.77294 3.8332 1.58348 4.02234 1.45166 4.25018C1.31983 4.47802 1.25029 4.73654 1.25 4.99976V10.9998C1.24943 11.2633 1.31848 11.5223 1.45019 11.7506C1.58189 11.9789 1.77156 12.1683 2 12.2998L7.25 15.2998C7.478 15.4326 7.73714 15.5026 8.001 15.5026C8.26487 15.5026 8.52401 15.4326 8.752 15.2998L14.002 12.2998C14.2304 12.1685 14.42 11.9792 14.5517 11.7511C14.6834 11.523 14.7525 11.2642 14.752 11.0008V10.9998ZM9.69 8.75076C9.69 8.81576 9.673 8.88076 9.64 8.93776C9.60724 8.99507 9.55955 9.04242 9.502 9.07476L8.19 9.82476C8.13271 9.85738 8.06793 9.87453 8.002 9.87453C7.93608 9.87453 7.87129 9.85738 7.814 9.82476L6.502 9.07476C6.44483 9.04227 6.39749 8.99494 6.365 8.93776C6.33176 8.88109 6.31449 8.81647 6.315 8.75076V7.25076C6.315 7.18476 6.331 7.11976 6.365 7.06276C6.39749 7.00559 6.44483 6.95825 6.502 6.92576L7.814 6.17576C7.87123 6.14296 7.93604 6.1257 8.002 6.1257C8.06797 6.1257 8.13278 6.14296 8.19 6.17576L9.502 6.92576C9.559 6.95876 9.607 7.00576 9.639 7.06276C9.67255 7.11936 9.69017 7.18397 9.69 7.24976V8.75076Z"/>
-</svg>
\ No newline at end of file
+    <path d="M6.912 1.2a1.54 1.54 0 0 1 2.176 0L14.8 6.912c.6.601.6 1.575 0 2.176L9.088 14.8c-.601.6-1.575.6-2.176 0L1.2 9.088a1.54 1.54 0 0 1 0-2.176L6.912 1.2Zm.755 4.716L5.916 7.667a.47.47 0 0 0 0 .666l1.751 1.751a.47.47 0 0 0 .666 0l1.751-1.751a.47.47 0 0 0 0-.666L8.333 5.916a.47.47 0 0 0-.666 0Z"/>
+</svg>
diff --git a/frontend/resources/images/icons/copy-refactor.svg b/frontend/resources/images/icons/copy-refactor.svg
index d6b3b53f5..787024177 100644
--- a/frontend/resources/images/icons/copy-refactor.svg
+++ b/frontend/resources/images/icons/copy-refactor.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" stroke-linecap="round" stroke-linejoin="round">
-    <path d="M14.751 4.999v6.002a1.494 1.494 0 0 1-.75 1.297L8.75 15.299a1.497 1.497 0 0 1-1.5 0l-5.251-3.001a1.495 1.495 0 0 1-.75-1.297V4.999a1.494 1.494 0 0 1 .75-1.297L7.25.701a1.497 1.497 0 0 1 1.5 0l5.251 3.001a1.495 1.495 0 0 1 .75 1.297Z"/>
-</svg>
\ No newline at end of file
+    <path d="M7.162 1.2a1.54 1.54 0 0 1 2.176 0l5.709 5.712a1.538 1.538 0 0 1 0 2.176L9.338 14.8c-.601.6-1.575.6-2.176 0l-5.71-5.712a1.54 1.54 0 0 1 0-2.176L7.162 1.2Z"/>
+</svg>
diff --git a/frontend/src/app/main/ui/components/shape_icon.cljs b/frontend/src/app/main/ui/components/shape_icon.cljs
deleted file mode 100644
index af02b820f..000000000
--- a/frontend/src/app/main/ui/components/shape_icon.cljs
+++ /dev/null
@@ -1,50 +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) KALEIDOS INC
-
-(ns app.main.ui.components.shape-icon
-  (:require
-   [app.common.types.component :as ctk]
-   [app.common.types.shape :as cts]
-   [app.common.types.shape.layout :as ctl]
-   [app.main.ui.icons :as i]
-   [rumext.v2 :as mf]))
-
-
-(mf/defc element-icon
-  [{:keys [shape main-instance?] :as props}]
-  (if (ctk/instance-head? shape)
-    (if main-instance?
-      i/component
-      i/component-copy)
-    (case (:type shape)
-      :frame (cond
-               (and (ctl/flex-layout? shape) (ctl/col? shape))
-               i/layout-columns
-
-               (and (ctl/flex-layout? shape) (ctl/row? shape))
-               i/layout-rows
-
-               (ctl/grid-layout? shape)
-               i/grid-layout-mode
-
-               :else
-               i/artboard)
-      :image i/image
-      :line (if (cts/has-images? shape) i/image i/line)
-      :circle (if (cts/has-images? shape) i/image i/circle)
-      :path (if (cts/has-images? shape) i/image i/curve)
-      :rect (if (cts/has-images? shape) i/image i/box)
-      :text i/text
-      :group (if (:masked-group shape)
-               i/mask
-               i/folder)
-      :bool (case (:bool-type shape)
-              :difference   i/bool-difference
-              :exclude      i/bool-exclude
-              :intersection i/bool-intersection
-              #_:default    i/bool-union)
-      :svg-raw i/file-svg
-      nil)))
diff --git a/frontend/src/app/main/ui/workspace/viewport/widgets.cljs b/frontend/src/app/main/ui/workspace/viewport/widgets.cljs
index ccd92afc3..bc0cc5a5b 100644
--- a/frontend/src/app/main/ui/workspace/viewport/widgets.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport/widgets.cljs
@@ -155,7 +155,7 @@
             [:use {:href "#icon-grid-layout-mode"}]
 
             main-instance?
-            [:use {:href "#icon-component"}])])
+            [:use {:href "#icon-component-refactor"}])])
 
        [:text {:x text-pos-x
                :y 0