diff --git a/frontend/src/app/main/ui/components/shape_icon_refactor.cljs b/frontend/src/app/main/ui/components/shape_icon.cljs
similarity index 93%
rename from frontend/src/app/main/ui/components/shape_icon_refactor.cljs
rename to frontend/src/app/main/ui/components/shape_icon.cljs
index 7874ac3711..060213681f 100644
--- a/frontend/src/app/main/ui/components/shape_icon_refactor.cljs
+++ b/frontend/src/app/main/ui/components/shape_icon.cljs
@@ -4,7 +4,7 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns app.main.ui.components.shape-icon-refactor
+(ns app.main.ui.components.shape-icon
   (:require
    [app.common.types.component :as ctk]
    [app.common.types.shape :as cts]
@@ -12,7 +12,7 @@
    [app.main.ui.icons :as i]
    [rumext.v2 :as mf]))
 
-(mf/defc element-icon-refactor
+(mf/defc element-icon
   {::mf/wrap-props false}
   [{:keys [shape main-instance?]}]
   (if (ctk/instance-head? shape)
@@ -51,7 +51,7 @@
       nil)))
 
 
-(mf/defc element-icon-refactor-by-type
+(mf/defc element-icon-by-type
   [{:keys [type main-instance?] :as props}]
   (if main-instance?
     i/component
diff --git a/frontend/src/app/main/ui/viewer/inspect/right_sidebar.cljs b/frontend/src/app/main/ui/viewer/inspect/right_sidebar.cljs
index fffa430e1e..c90ab718a0 100644
--- a/frontend/src/app/main/ui/viewer/inspect/right_sidebar.cljs
+++ b/frontend/src/app/main/ui/viewer/inspect/right_sidebar.cljs
@@ -10,7 +10,7 @@
    [app.common.data.macros :as dm]
    [app.common.types.component :as ctk]
    [app.main.refs :as refs]
-   [app.main.ui.components.shape-icon-refactor :as sir]
+   [app.main.ui.components.shape-icon :as sir]
    [app.main.ui.components.tab-container :refer [tab-container tab-element]]
    [app.main.ui.icons :as i]
    [app.main.ui.viewer.inspect.attributes :refer [attributes]]
@@ -93,7 +93,7 @@
             [:span {:class (stl/css :layer-title)} (tr "inspect.tabs.code.selected.multiple" (count shapes))]]
            [:*
             [:span {:class (stl/css :shape-icon)}
-             [:& sir/element-icon-refactor {:shape first-shape :main-instance? main-instance?}]]
+             [:& sir/element-icon {:shape first-shape :main-instance? main-instance?}]]
                        ;; Execution time translation strings:
                        ;;   inspect.tabs.code.selected.circle
                        ;;   inspect.tabs.code.selected.component
diff --git a/frontend/src/app/main/ui/workspace/context_menu.cljs b/frontend/src/app/main/ui/workspace/context_menu.cljs
index 01b008502f..8ba1763fe5 100644
--- a/frontend/src/app/main/ui/workspace/context_menu.cljs
+++ b/frontend/src/app/main/ui/workspace/context_menu.cljs
@@ -30,7 +30,7 @@
    [app.main.refs :as refs]
    [app.main.store :as st]
    [app.main.ui.components.dropdown :refer [dropdown]]
-   [app.main.ui.components.shape-icon-refactor :as sic]
+   [app.main.ui.components.shape-icon :as sic]
    [app.main.ui.icons :as i]
    [app.main.ui.workspace.sidebar.assets.common :as cmm]
    [app.util.dom :as dom]
@@ -180,7 +180,7 @@
                           :on-pointer-enter (on-pointer-enter (:id object))
                           :on-pointer-leave (on-pointer-leave (:id object))
                           :on-unmount (on-unmount (:id object))
-                          :icon (sic/element-icon-refactor {:shape object})}])])
+                          :icon (sic/element-icon {:shape object})}])])
      [:& menu-entry {:title (tr "workspace.shape.menu.forward")
                      :shortcut (sc/get-tooltip :bring-forward)
                      :on-click do-bring-forward}]
diff --git a/frontend/src/app/main/ui/workspace/sidebar/layer_item.cljs b/frontend/src/app/main/ui/workspace/sidebar/layer_item.cljs
index 43fb739747..be6a1fffb4 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/layer_item.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/layer_item.cljs
@@ -17,7 +17,7 @@
    [app.main.data.workspace.collapse :as dwc]
    [app.main.refs :as refs]
    [app.main.store :as st]
-   [app.main.ui.components.shape-icon-refactor :as sic]
+   [app.main.ui.components.shape-icon :as sic]
    [app.main.ui.context :as ctx]
    [app.main.ui.hooks :as hooks]
    [app.main.ui.icons :as i]
@@ -100,7 +100,7 @@
            (when absolute?
              [:div {:class (stl/css :absolute)}])
 
-           [:& sic/element-icon-refactor
+           [:& sic/element-icon
             {:shape item
              :main-instance? main-instance?}]]]
 
@@ -111,7 +111,7 @@
                  :on-double-click on-zoom-to-selected}
            (when ^boolean absolute?
              [:div {:class (stl/css :absolute)}])
-           [:& sic/element-icon-refactor
+           [:& sic/element-icon
             {:shape item
              :main-instance? main-instance?}]]])
 
diff --git a/frontend/src/app/main/ui/workspace/sidebar/layers.cljs b/frontend/src/app/main/ui/workspace/sidebar/layers.cljs
index 258d6dcd5f..c3f927e04d 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/layers.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/layers.cljs
@@ -15,7 +15,7 @@
    [app.main.refs :as refs]
    [app.main.store :as st]
    [app.main.ui.components.search-bar :refer [search-bar]]
-   [app.main.ui.components.shape-icon-refactor :as sic]
+   [app.main.ui.components.shape-icon :as sic]
    [app.main.ui.components.title-bar :refer [title-bar]]
    [app.main.ui.hooks :as hooks]
    [app.main.ui.icons :as i]
@@ -308,7 +308,7 @@
                          :on-click remove-filter}
 
                 [:span {:class (stl/css :layer-filter-icon)}
-                 [:& sic/element-icon-refactor-by-type
+                 [:& sic/element-icon-by-type
                   {:type fkey
                    :main-instance? (= fkey :component)}]]
                 [:span {:class (stl/css :layer-filter-name)}