diff --git a/Alice b/Alice
index 08d33927..988acd3d 160000
--- a/Alice
+++ b/Alice
@@ -1 +1 @@
-Subproject commit 08d339274bcc2675311381deb175cdca7bdc3591
+Subproject commit 988acd3d1c53bf2a8241a9138cfba8b9801ab8f0
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4d5c312..bc5101d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 ##########################################################################################################
 #--Date:    2021.03.10
 #--Project: SolidRender
-#--Author:  hubery.x.hsu
+#--Author:  hananiah
 #--Note:位于SolidRender顶级目录下面
 #--2021.10.03: 增加INSTALL项目，实现工程的自动安装功能
 #              今日对工程的生成目录做重大调整，以后禁止VS工程的路径与源码同目录
@@ -158,24 +158,6 @@ endif()
 # set(CMAKE_AUTORCC ON)
 # set(CMAKE_AUTOUIC ON)
 
-# 解决无法跳转到头文件的问题
-set(QTDIR_X64 $ENV{QTDIR})
-set(QTDIR_X64_include $ENV{QTDIR}/include)
-set(QTDIR_X64_include_ActiveQt $ENV{QTDIR}/include/ActiveQt)
-set(QTDIR_X64_include_QtCore $ENV{QTDIR}/include/QtCore)
-set(QTDIR_X64_include_QtNetwork $ENV{QTDIR}/include/QtNetwork)
-set(QTDIR_X64_include_QtWidgets $ENV{QTDIR}/include/QtWidgets)
-set(QTDIR_X64_include_QtWebEngineWidgets $ENV{QTDIR}/include/QtWebEngineWidgets)
-set(QTDIR_X64_include_QtGui $ENV{QTDIR}/include/QtGui)
-set(QTDIR_X64_include_QtXml $ENV{QTDIR}/include/QtXml)
-set(QTDIR_X64_include_QtScript $ENV{QTDIR}/include/QtScript)
-set(QTDIR_X64_QtScriptTools $ENV{QTDIR}/include/QtScriptTools)
-set(QTDIR_X64_include_QtScriptTools $ENV{QTDIR}/include/QtScriptTools)
-set(QTDIR_X64_include_QtWidgets_5_15_14_QtWidgets $ENV{QTDIR}/include/QtWidgets/5.15.14/QtWidgets)
-set(QTDIR_X64_include_QtCore_5_15_14_QtCore ${QTDIR}/include/QtCore/5.15.14/QtCore)
-set(QTDIR_X64_include_QtConcurrent $ENV{QTDIR}/include/QtConcurrent)
-set(QTDIR_X64_mkspecs_win32_msvc ${QTDIR}/mkspecs/win32-msvc)
-set(QTDIR_X64_lib $ENV{QTDIR}/lib)
 
 #----------------------------------------------------------------------------
 # 开启项目分组
diff --git a/Demos/DemoDependencyPlugin/CMakeLists.txt b/Demos/DemoDependencyPlugin/CMakeLists.txt
index 16ede380..d2ea44f7 100644
--- a/Demos/DemoDependencyPlugin/CMakeLists.txt
+++ b/Demos/DemoDependencyPlugin/CMakeLists.txt
@@ -5,13 +5,6 @@
 ##########################################################################################################
 message("*--*--*--*--*--*--*--*--*--*--*--*--*--Start SolidDemoDependencyPlugin--*--*--*--*--*--*--*--*--*--*--**--*--*--*")
 
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_PREFIX_PATH "C:/Qt/Qt5.15.14/5.15.14/msvc2019_64")
-find_package(Qt5Core       5.15 REQUIRED)
-find_package(Qt5Gui        5.15 REQUIRED)
-find_package(Qt5Widgets    5.15 REQUIRED)
-
 
 message("${PROJECT_SOURCE_DIR}")
 
diff --git a/Demos/DemoPlugin/CMakeLists.txt b/Demos/DemoPlugin/CMakeLists.txt
index 72746e8a..4baad396 100644
--- a/Demos/DemoPlugin/CMakeLists.txt
+++ b/Demos/DemoPlugin/CMakeLists.txt
@@ -5,14 +5,6 @@
 ##########################################################################################################
 message("*--*--*--*--*--*--*--*--*--*--*--*--*--Start SolidDemoPlugin--*--*--*--*--*--*--*--*--*--*--**--*--*--*")
 
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_PREFIX_PATH "C:/Qt/Qt5.15.14/5.15.14/msvc2019_64")
-find_package(Qt5Core       5.15 REQUIRED)
-find_package(Qt5Gui        5.15 REQUIRED)
-find_package(Qt5Widgets    5.15 REQUIRED)
-
-
 message("${PROJECT_SOURCE_DIR}")
 
 set(SDP "${PROJECT_SOURCE_DIR}/Demos/DemoPlugin")
diff --git a/Designer/APP/CMakeLists.txt b/Designer/APP/CMakeLists.txt
index bed95bd9..30978f1b 100644
--- a/Designer/APP/CMakeLists.txt
+++ b/Designer/APP/CMakeLists.txt
@@ -50,30 +50,10 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 #============================================================================#
 #  给SolidRender这个工程配置第三方的库
 #============================================================================#
-if(WIN32)
-set(CMAKE_PREFIX_PATH "C:/Qt/Qt5.15.14/5.15.14/msvc2019_64")
-# 设置QT的头文件包含路径
-# 如果找不到环境变量QTDIR的路径，那么自己设置吧; 也可以在GUI交互界面上手动设置
-SET(QTDIR C:/Qt/Qt5.15.14/5.15.14/msvc2019_64)
-endif()
-
 find_package(Qt5 COMPONENTS Core Gui Widgets Network Quick Qml REQUIRED)
 
 
-# QT5头文件路径
 if(WIN32)
-    message("----------------qt5 files include directory--------------------")
-    include_directories(${QTDIR}/include)
-    include_directories(${QTDIR}/include/QtWidgets)
-    include_directories(${QTDIR}/include/QtCore)
-    include_directories(${QTDIR}/include/QtGui)
-    include_directories(${QTDIR}/include/QtOpenGL)
-    include_directories(${QTDIR}/include/QtMultimedia)
-    include_directories(${QTDIR}/include/QtQuick)
-    include_directories(${QTDIR}/include/QtQml)
-    include_directories(${QTDIR}/include/QtNetwork)
-    include_directories(${QTDIR}/mkspecs/win32-msvc)
-
     #-----------------------------------------------------------------------------
     # 添加需要链接的库文件目录LINK_DIRECTORIES
     # 例如QT库
@@ -183,10 +163,20 @@ add_custom_target(SolidDesignerRes ALL DEPENDS "${SD_RCC_FILE}")
 add_dependencies(${PROJECT_NAME} SolidDesignerRes)
 
 # 无论什么生成器，把 .rcc 复制到运行目录（等价于通用版 “Pre-Build”）
-add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD
+#add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD
+#  COMMAND ${CMAKE_COMMAND} -E make_directory "$<TARGET_FILE_DIR:${PROJECT_NAME}>/resources"
+#  COMMAND ${CMAKE_COMMAND} -E copy_if_different
+#          "${SD_RCC_FILE}" "$<TARGET_FILE_DIR:${PROJECT_NAME}>/resources/SolidDesignerRes.rcc"
+#  VERBATIM
+#)
+
+# 生成后的部署（拷贝）——跟随 SolidDesignerRes，而不是跟随 exe
+add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E make_directory "$<TARGET_FILE_DIR:${PROJECT_NAME}>/resources"
+  COMMAND ${CMAKE_COMMAND} -E echo ">>> Deploy RCC: ${SD_RCC_FILE} -> $<TARGET_FILE_DIR:${PROJECT_NAME}>/resources/SolidDesignerRes.rcc"
   COMMAND ${CMAKE_COMMAND} -E copy_if_different
-          "${SD_RCC_FILE}" "$<TARGET_FILE_DIR:${PROJECT_NAME}>/resources/SolidDesignerRes.rcc"
+          "${SD_RCC_FILE}"
+          "$<TARGET_FILE_DIR:${PROJECT_NAME}>/resources/SolidDesignerRes.rcc"
   VERBATIM
 )
 
diff --git a/Designer/Data/CommandsConfig.xml b/Designer/Data/CommandsConfig.xml
index f0200d5d..bb816622 100644
--- a/Designer/Data/CommandsConfig.xml
+++ b/Designer/Data/CommandsConfig.xml
@@ -1,684 +1,880 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!-- *************************************************************** -->
+<!-- CommandsConfig_compat.xml                                      -->
+<!-- Notes:                                                          -->
+<!--   1) Commands reference icons via iconRef (preferred).           -->
+<!--   2) iconRef is resolved from IconLibraryConfig.xml.             -->
+<!--   3) The compat file may also keep legacy @icon for fallback.    -->
+<!-- *************************************************************** -->
+
 <CommandsConfig version="1.0">
 
     <!-- ========================================================= -->
     <!-- 1. Command dictionary: all environments share these IDs   -->
     <!-- ========================================================= -->
     <commands>
+
+        <!-- ===== UI built-in commands (wired to MainWindowQt) ===== -->
+
+        <command id="data.openLastSession"
+                 label="Open Last Session"
+                 tooltip="Open the last session"
+                 category="data"
+                 iconRef="home.open_last_session"
+                 icon=":/Ribbon/home/data/light/png/32/open_last_session.png"
+                 environments="workbench.home"/>
+
+        <command id="data.selectWorkingDirectory"
+                 label="Select Working Directory"
+                 tooltip="Select the working directory"
+                 category="data"
+                 iconRef="home.select_working_directory"
+                 icon=":/Ribbon/home/data/light/png/32/select_working_directory.png"
+                 environments="workbench.home"/>
+                 
+        <command id="data.eraseNotDisplayed"
+                 label="Erase Not Displayed"
+                 tooltip="Erase the not displayed"
+                 category="data"
+                 iconRef="home.erase_not_displayed"
+                 icon=":/Ribbon/home/data/light/png/32/erase_not_displayed.png"
+                 environments="workbench.home"/>
+                 
+        <command id="settings.modelDisplay"
+                 label="Model Display"
+                 tooltip="Set model display options"
+                 category="settings"
+                 iconRef="home.model_display"
+                 icon=":/Ribbon/home/settings/light/png/16/model_display.png"
+                 environments="workbench.home"/>
+                 
+        <command id="settings.systemAppearance"
+                 label="System Appearance"
+                 tooltip="Set system appearance options"
+                 category="settings"
+                 iconRef="home.system_appearance"
+                 icon=":/Ribbon/home/settings/light/png/16/system_appearance.png"
+                 environments="workbench.home"/>
+                 
+
+        <command id="utilities.playTrailFile"
+                 label="Play Trail File"
+                 tooltip="Play the trail file"
+                 category="utilities"
+                 iconRef="home.play_trail_file"
+                 icon=":/Ribbon/home/utilities/light/png/16/play_trail_file.png"
+                 environments="workbench.home"/>
+
+        <command id="utilities.auxApplication"
+                 label="Auxiliary Application"
+                 tooltip="Manage the auxiliary application"
+                 category="utilities"
+                 iconRef="home.aux_application"
+                 icon=":/Ribbon/home/utilities/light/png/16/auxiliary_applications.png"
+                 environments="workbench.home"/>
+
+        <command id="ui.appMenu"
+                 label="SolidDesigner"
+                 tooltip="Open application menu"
+                 category="ui.titlebar"
+                 iconRef="app"
+                 icon=":/TitleBar/brand/app.svg"
+                 environments="workbench.home,workbench.part,workbench.sketch,workbench.assembly,workbench.drawing,workbench.mfg,workbench.bim"/>
+        <!-- titlebar's windows button  -->
+        <command id="ui.windowsMenu"
+                 label="Windows"
+                 tooltip="Window and view management"
+                 category="ui.titlebar"
+                 iconRef="windows"
+                 icon=":/TitleBar/commands/windows.svg"
+                 environments="workbench.home,workbench.part,workbench.sketch,workbench.assembly,workbench.drawing,workbench.mfg,workbench.bim"/>
+    
+        <command id="ui.qatMenu"
+                 label="Quick Access"
+                 tooltip="Quick access toolbar options"
+                 category="ui.titlebar"
+                 iconRef="qat"
+                 icon=":/TitleBar/commands/quickaccess.svg"
+                 environments="workbench.home,workbench.part,workbench.sketch,workbench.assembly,workbench.drawing,workbench.mfg,workbench.bim"/>
+
         <!-- ===== Edit commands ===== -->
         <command id="edit.undo"
                  label="Undo"
                  tooltip="Undo last operation"
                  category="edit"
+                 iconRef="edit.undo"
                  icon="icons/edit/undo.svg"
                  gesture="Ctrl+Z"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 	    
         <command id="edit.redo"
                  label="Redo"
                  tooltip="Redo last undone operation"
                  category="edit"
+                 iconRef="edit.redo"
                  icon="icons/edit/redo.svg"
                  gesture="Ctrl+Y"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 	    
         <command id="edit.cut"
                  label="Cut"
                  tooltip="Cut selected items to clipboard"
                  category="edit"
+                 iconRef="edit.cut"
                  icon="icons/edit/cut.svg"
                  gesture="Ctrl+X"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 	    
         <command id="edit.copy"
                  label="Copy"
                  tooltip="Copy selected items to clipboard"
                  category="edit"
+                 iconRef="edit.copy"
                  icon="icons/edit/copy.svg"
                  gesture="Ctrl+C"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 	    
         <command id="edit.paste"
                  label="Paste"
                  tooltip="Paste items from clipboard"
                  category="edit"
+                 iconRef="edit.paste"
                  icon="icons/edit/paste.svg"
                  gesture="Ctrl+V"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 	    
         <command id="edit.delete"
                  label="Delete"
                  tooltip="Delete selected items"
                  category="edit"
+                 iconRef="edit.delete"
                  icon="icons/edit/delete.svg"
                  gesture="Del"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 	    
         <command id="edit.selectAll"
                  label="Select All"
                  tooltip="Select all objects"
                  category="edit"
+                 iconRef="edit.select_all"
                  icon="icons/edit/select_all.svg"
                  gesture="Ctrl+A"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 	    
         <!-- ===== UI built-in commands (wired to MainWindowQt) ===== -->
         <command id="ui.toggleMode"
                  label="Toggle Ribbon / Classic"
                  tooltip="Switch between Ribbon and Classic menu modes"
                  category="ui"
+                 iconRef="ui.toggle_mode"
                  icon="icons/ui/toggle_mode.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 	    
         <command id="ui.saveLayout"
                  label="Save Layout"
                  tooltip="Save current window layout"
                  category="ui"
+                 iconRef="ui.save_layout"
                  icon="icons/ui/save_layout.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 	    
         <command id="ui.restoreLayout"
                  label="Restore Layout"
                  tooltip="Restore saved window layout"
                  category="ui"
+                 iconRef="ui.restore_layout"
                  icon="icons/ui/restore_layout.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 	    
         <!-- ===== Help commands ===== -->
         <command id="help.contents"
                  label="Help Contents"
                  tooltip="Open help contents"
                  category="help"
+                 iconRef="help.contents"
                  icon="icons/help/contents.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 	    
         <command id="help.about"
                  label="About"
                  tooltip="Show about dialog"
                  category="help"
+                 iconRef="help.about"
                  icon="icons/help/about.svg"
-                 environments="part,sketch,asm,sheet"/>
-	    
-        <!-- ===== Optional: Tools / Command line ===== -->
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
+
+
+        <!-- ===== Tools / Journal / Expressions / Python ===== -->
+
         <command id="tools.commandLine"
                  label="Command Line"
                  tooltip="Open command line window"
                  category="tools"
+                 iconRef="tools.command_line"
                  icon="icons/tools/command_line.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <!-- ===== General: File / Window ===== -->
         <command id="file.new"
                  label="New"
                  tooltip="Create a new document"
                  category="file"
+                 iconRef="file.new"
                  icon="icons/file/new.svg"
                  gesture="Ctrl+N"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="file.open"
                  label="Open"
                  tooltip="Open an existing document"
                  category="file"
+                 iconRef="file.open"
                  icon="icons/file/open.svg"
                  gesture="Ctrl+O"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="file.save"
                  label="Save"
                  tooltip="Save the active document"
                  category="file"
+                 iconRef="file.save"
                  icon="icons/file/save.svg"
                  gesture="Ctrl+S"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="file.saveAs"
                  label="Save As"
                  tooltip="Save the active document under a new name"
                  category="file"
+                 iconRef="file.save_as"
                  icon="icons/file/save_as.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="file.close"
                  label="Close"
                  tooltip="Close the active window"
                  category="file"
+                 iconRef="file.close"
                  icon="icons/file/close.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="file.exit"
                  label="Exit"
                  tooltip="Exit the application"
                  category="file"
+                 iconRef="file.exit"
                  icon="icons/file/exit.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
+
+
+        <!-- ===== UI built-in commands (wired to MainWindowQt) ===== -->
 
         <command id="window.new"
                  label="New Window"
                  tooltip="Open a new document window"
                  category="window"
+                 iconRef="window.new_window"
                  icon="icons/window/new_window.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="window.arrange"
                  label="Arrange Windows"
                  tooltip="Arrange all open windows"
                  category="window"
+                 iconRef="window.arrange"
                  icon="icons/window/arrange.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="window.tileHorizontal"
                  label="Tile Horizontally"
                  tooltip="Tile all open windows horizontally"
                  category="window"
+                 iconRef="window.tile_horizontal"
                  icon="icons/window/tile_horizontal.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
+
+
+        <!-- ===== Flexible Modeling / Direct Edit ===== -->
 
-                <!-- ===== Flexible Modeling / Direct Edit (not in Model tab) ===== -->
         <command id="smove.face"
                  label="Move Face"
                  tooltip="Move or rotate selected faces"
                  category="synchronous"
+                 iconRef="synchronous.move_face"
                  icon="icons/synchronous/move_face.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="synchronous.pull"
                  label="Pull"
                  tooltip="Modify the shape by dragging faces"
                  category="synchronous"
+                 iconRef="synchronous.pull"
                  icon="icons/synchronous/pull.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="synchronous.offsetRegion"
                  label="Offset Region"
                  tooltip="Offset local face regions"
                  category="synchronous"
+                 iconRef="synchronous.offset_region"
                  icon="icons/synchronous/offset_region.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="synchronous.deleteFace"
                  label="Delete Face"
                  tooltip="Delete faces and heal topology"
                  category="synchronous"
+                 iconRef="synchronous.delete_face"
                  icon="icons/synchronous/delete_face.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <!-- ===== Curves / sketch geometry ===== -->
         <command id="curve.line"
                  label="Line"
                  tooltip="Create lines"
                  category="curve"
+                 iconRef="curve.line"
                  icon="icons/curve/line.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="curve.centerline"
                  label="Centerline"
                  tooltip="Create sketch centerlines"
                  category="curve"
+                 iconRef="curve.centerline"
                  icon="icons/curve/centerline.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="curve.arc"
                  label="Arc"
                  tooltip="Create arcs"
                  category="curve"
+                 iconRef="curve.arc"
                  icon="icons/curve/arc.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="curve.arc.3PointTangentEnd"
                  label="3-Point / Tangent End"
                  tooltip="Create a 3-point arc with tangent end option"
                  category="curve"
+                 iconRef="curve.arc_3pt_tangent_end"
                  icon="icons/curve/arc_3pt_tangent_end.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="curve.arc.centerAndEnds"
                  label="Center and Ends"
                  tooltip="Create an arc by center and two ends"
                  category="curve"
+                 iconRef="curve.arc_center_ends"
                  icon="icons/curve/arc_center_ends.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="curve.arc.3Tangent"
                  label="3 Tangent"
                  tooltip="Create a 3-tangent arc"
                  category="curve"
+                 iconRef="curve.arc_3tangent"
                  icon="icons/curve/arc_3tangent.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="curve.arc.concentric"
                  label="Concentric"
                  tooltip="Create a concentric arc"
                  category="curve"
+                 iconRef="curve.arc_concentric"
                  icon="icons/curve/arc_concentric.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="curve.arc.conic"
                  label="Conic"
                  tooltip="Create a conic arc"
                  category="curve"
+                 iconRef="curve.arc_conic"
                  icon="icons/curve/arc_conic.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="curve.circle"
                  label="Circle"
                  tooltip="Create circles"
                  category="curve"
+                 iconRef="curve.circle"
                  icon="icons/curve/circle.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="curve.circle.centerAndPoint"
                  label="Center and Point"
                  tooltip="Create a circle by center and point"
                  category="curve"
+                 iconRef="curve.circle_center_point"
                  icon="icons/curve/circle_center_point.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="curve.circle.concentric"
                  label="Concentric"
                  tooltip="Create a concentric circle"
                  category="curve"
+                 iconRef="curve.circle_concentric"
                  icon="icons/curve/circle_concentric.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="curve.circle.3Point"
                  label="3 Point"
                  tooltip="Create a circle by 3 points"
                  category="curve"
+                 iconRef="curve.circle_3pt"
                  icon="icons/curve/circle_3pt.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="curve.circle.3Tangent"
                  label="3 Tangent"
                  tooltip="Create a circle tangent to three entities"
                  category="curve"
+                 iconRef="curve.circle_3tangent"
                  icon="icons/curve/circle_3tangent.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="curve.rectangle"
                  label="Rectangle"
                  tooltip="Create rectangles"
                  category="curve"
+                 iconRef="curve.rectangle"
                  icon="icons/curve/rectangle.svg"
-                 environments="part,sketch,sheet"/>
+                 environments="workbench.part,workbench.sketch"/>
 
         <command id="curve.ellipse"
                  label="Ellipse"
                  tooltip="Create ellipses"
                  category="curve"
+                 iconRef="curve.ellipse"
                  icon="icons/curve/ellipse.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="curve.ellipse.axisAndEnds"
                  label="Axis and Ends Ellipse"
                  tooltip="Create an ellipse by axis and ends"
                  category="curve"
+                 iconRef="curve.ellipse_axis_ends"
                  icon="icons/curve/ellipse_axis_ends.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="curve.ellipse.centerAndAxis"
                  label="Center and Axis Ellipse"
                  tooltip="Create an ellipse by center and axis"
                  category="curve"
+                 iconRef="curve.ellipse_center_axis"
                  icon="icons/curve/ellipse_center_axis.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="curve.rectangle.corner"
                  label="Corner Rectangle"
                  tooltip="Create a corner rectangle"
                  category="curve"
+                 iconRef="curve.rect_corner"
                  icon="icons/curve/rect_corner.svg"
-                 environments="part,sketch,sheet"/>
+                 environments="workbench.part,workbench.sketch"/>
 
         <command id="curve.rectangle.slanted"
                  label="Slanted Rectangle"
                  tooltip="Create a slanted rectangle"
                  category="curve"
+                 iconRef="curve.rect_slanted"
                  icon="icons/curve/rect_slanted.svg"
-                 environments="part,sketch,sheet"/>
+                 environments="workbench.part,workbench.sketch"/>
 
         <command id="curve.rectangle.center"
                  label="Center Rectangle"
                  tooltip="Create a center rectangle"
                  category="curve"
+                 iconRef="curve.rect_center"
                  icon="icons/curve/rect_center.svg"
-                 environments="part,sketch,sheet"/>
+                 environments="workbench.part,workbench.sketch"/>
 
         <command id="curve.rectangle.parallelogram"
                  label="Parallelogram"
                  tooltip="Create a parallelogram"
                  category="curve"
+                 iconRef="curve.parallelogram"
                  icon="icons/curve/parallelogram.svg"
-                 environments="part,sketch,sheet"/>
+                 environments="workbench.part,workbench.sketch"/>
 
         <command id="curve.point"
                  label="Point"
                  tooltip="Create points"
                  category="curve"
+                 iconRef="curve.point"
                  icon="icons/curve/point.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="curve.splineThrough"
                  label="Spline Through Points"
                  tooltip="Create spline curves through points"
                  category="curve"
+                 iconRef="curve.spline_through"
                  icon="icons/curve/spline_through.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="curve.fitSpline"
                  label="Fit Spline"
                  tooltip="Fit splines to existing geometry"
                  category="curve"
+                 iconRef="curve.fit_spline"
                  icon="icons/curve/fit_spline.svg"
-                 environments="part,sketch,sheet"/>
+                 environments="workbench.part,workbench.sketch"/>
 
         <command id="curve.studioSpline"
                  label="Studio Spline"
                  tooltip="Advanced spline creation and editing"
                  category="curve"
+                 iconRef="curve.studio_spline"
                  icon="icons/curve/studio_spline.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="curve.trim"
                  label="Trim Curve"
                  tooltip="Trim curves"
                  category="curve"
+                 iconRef="curve.trim"
                  icon="icons/curve/trim.svg"
-                 environments="part,sketch,sheet"/>
+                 environments="workbench.part,workbench.sketch"/>
 
         <command id="curve.extend"
                  label="Extend Curve"
                  tooltip="Extend curves"
                  category="curve"
+                 iconRef="curve.extend"
                  icon="icons/curve/extend.svg"
-                 environments="part,sketch,sheet"/>
+                 environments="workbench.part,workbench.sketch"/>
 
         <command id="curve.join"
                  label="Join Curves"
                  tooltip="Join curves into a single entity"
                  category="curve"
+                 iconRef="curve.join"
                  icon="icons/curve/join.svg"
-                 environments="part,sketch,sheet"/>
+                 environments="workbench.part,workbench.sketch"/>
 
         <command id="curve.fillet"
                  label="Curve Fillet"
                  tooltip="Apply fillets between curves"
                  category="curve"
+                 iconRef="curve.fillet"
                  icon="icons/curve/fillet.svg"
-                 environments="part,sketch,sheet"/>
+                 environments="workbench.part,workbench.sketch"/>
 
         <command id="curve.offset"
                  label="Offset Curve"
                  tooltip="Offset curves"
                  category="curve"
+                 iconRef="curve.offset"
                  icon="icons/curve/offset.svg"
-                 environments="part,sketch,sheet"/>
+                 environments="workbench.part,workbench.sketch"/>
 
         <!-- ===== Sketch-only: dimensions / constraints / modify ===== -->
         <command id="sketch.dim.horizontal"
                  label="Horizontal Dimension"
                  tooltip="Create horizontal linear dimensions"
                  category="sketch.dim"
+                 iconRef="sketch.dim_horizontal"
                  icon="icons/sketch/dim_horizontal.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.dim.vertical"
                  label="Vertical Dimension"
                  tooltip="Create vertical linear dimensions"
                  category="sketch.dim"
+                 iconRef="sketch.dim_vertical"
                  icon="icons/sketch/dim_vertical.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.dim.radius"
                  label="Radius Dimension"
                  tooltip="Create radius dimensions"
                  category="sketch.dim"
+                 iconRef="sketch.dim_radius"
                  icon="icons/sketch/dim_radius.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.dim.diameter"
                  label="Diameter Dimension"
                  tooltip="Create diameter dimensions"
                  category="sketch.dim"
+                 iconRef="sketch.dim_diameter"
                  icon="icons/sketch/dim_diameter.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.dim.angle"
                  label="Angular Dimension"
                  tooltip="Create angular dimensions"
                  category="sketch.dim"
+                 iconRef="sketch.dim_angle"
                  icon="icons/sketch/dim_angle.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.dim.general"
                  label="Smart Dimension"
                  tooltip="Create smart dimensions"
                  category="sketch.dim"
+                 iconRef="sketch.dim_smart"
                  icon="icons/sketch/dim_smart.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.dim.dimension"
                  label="Dimension"
                  tooltip="Create sketch dimensions"
                  category="sketch.dim"
+                 iconRef="sketch.dim_smart"
                  icon="icons/sketch/dim_smart.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.dim.reference"
                  label="Reference"
                  tooltip="Create reference dimensions"
                  category="sketch.dim"
+                 iconRef="sketch.dim_reference"
                  icon="icons/sketch/dim_reference.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.dim.baseline"
                  label="Baseline"
                  tooltip="Create baseline dimensions"
                  category="sketch.dim"
+                 iconRef="sketch.dim_baseline"
                  icon="icons/sketch/dim_baseline.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.dim.perimeter"
                  label="Perimeter"
                  tooltip="Create perimeter dimensions"
                  category="sketch.dim"
+                 iconRef="sketch.dim_perimeter"
                  icon="icons/sketch/dim_perimeter.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.constraint.horizontal"
                  label="Horizontal"
                  tooltip="Apply horizontal constraint"
                  category="sketch.constraint"
+                 iconRef="sketch.constr_horizontal"
                  icon="icons/sketch/constr_horizontal.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.constraint.vertical"
                  label="Vertical"
                  tooltip="Apply vertical constraint"
                  category="sketch.constraint"
+                 iconRef="sketch.constr_vertical"
                  icon="icons/sketch/constr_vertical.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.constraint.parallel"
                  label="Parallel"
                  tooltip="Apply parallel constraint"
                  category="sketch.constraint"
+                 iconRef="sketch.constr_parallel"
                  icon="icons/sketch/constr_parallel.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.constraint.perpendicular"
                  label="Perpendicular"
                  tooltip="Apply perpendicular constraint"
                  category="sketch.constraint"
+                 iconRef="sketch.constr_perp"
                  icon="icons/sketch/constr_perp.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.constraint.tangent"
                  label="Tangent"
                  tooltip="Apply tangent constraint"
                  category="sketch.constraint"
+                 iconRef="sketch.constr_tangent"
                  icon="icons/sketch/constr_tangent.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.constraint.midPoint"
                  label="Mid-point"
                  tooltip="Apply mid-point constraint"
                  category="sketch.constraint"
+                 iconRef="sketch.constr_midpoint"
                  icon="icons/sketch/constr_midpoint.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.constraint.coincident"
                  label="Coincident"
                  tooltip="Apply coincident constraint"
                  category="sketch.constraint"
+                 iconRef="sketch.constr_coincident"
                  icon="icons/sketch/constr_coincident.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.constraint.equal"
                  label="Equal"
                  tooltip="Apply equal length or equal radius constraint"
                  category="sketch.constraint"
+                 iconRef="sketch.constr_equal"
                  icon="icons/sketch/constr_equal.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.constraint.symmetric"
                  label="Symmetric"
                  tooltip="Apply symmetry constraint"
                  category="sketch.constraint"
+                 iconRef="sketch.constr_symmetric"
                  icon="icons/sketch/constr_symmetric.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.constraint.fix"
                  label="Fix"
                  tooltip="Fix elements in place"
                  category="sketch.constraint"
+                 iconRef="sketch.constr_fix"
                  icon="icons/sketch/constr_fix.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.modify.trim"
                  label="Trim"
                  tooltip="Trim sketch geometry"
                  category="sketch.modify"
+                 iconRef="sketch.trim"
                  icon="icons/sketch/trim.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.modify.extend"
                  label="Extend"
                  tooltip="Extend sketch geometry"
                  category="sketch.modify"
+                 iconRef="sketch.extend"
                  icon="icons/sketch/extend.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.modify.fillet"
                  label="Fillet"
                  tooltip="Create sketch fillets"
                  category="sketch.modify"
+                 iconRef="sketch.fillet"
                  icon="icons/sketch/fillet.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.modify.offset"
                  label="Offset"
                  tooltip="Offset sketch geometry"
                  category="sketch.modify"
+                 iconRef="sketch.offset"
                  icon="icons/sketch/offset.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.modify.mirror"
                  label="Mirror"
                  tooltip="Mirror sketch entities"
                  category="sketch.modify"
+                 iconRef="sketch.mirror"
                  icon="icons/sketch/mirror.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.modify.pattern"
                  label="Pattern"
                  tooltip="Pattern sketch entities"
                  category="sketch.modify"
+                 iconRef="sketch.pattern"
                  icon="icons/sketch/pattern.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
+
+
+        <!-- ===== Model tab: Sketch ===== -->
 
-                <!-- ===== Creo Parametric: Sketch tab (Sketch) ===== -->
         <command id="sketch.setup"
                  label="Sketch Setup"
                  tooltip="Open sketch setup options"
                  category="sketch"
+                 iconRef="sketch.setup"
                  icon="icons/sketch/setup.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.references"
                  label="References"
                  tooltip="Manage sketch references"
                  category="sketch"
+                 iconRef="sketch.references"
                  icon="icons/sketch/references.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.view"
                  label="Sketch View"
                  tooltip="Control sketch view and orientation"
                  category="sketch"
+                 iconRef="sketch.view"
                  icon="icons/sketch/view.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.section.setHorizontalReference"
                  label="Set horizontal reference"
                  tooltip="Set horizontal reference"
                  category="sketch"
+                 iconRef="sketch.section_set_horizontal"
                  icon="icons/sketch/section_set_horizontal.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.section.setVerticalReference"
                  label="Set vertical reference"
                  tooltip="Set vertical reference"
                  category="sketch"
+                 iconRef="sketch.section_set_vertical"
                  icon="icons/sketch/section_set_vertical.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.section.restoreSectionOrientation"
                  label="Restore section orientation"
                  tooltip="Restore section orientation"
                  category="sketch"
+                 iconRef="sketch.section_restore"
                  icon="icons/sketch/section_restore.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.section.flipSectionOrientation"
                  label="Flip section orientation"
                  tooltip="Flip section orientation"
                  category="sketch"
+                 iconRef="sketch.section_flip"
                  icon="icons/sketch/section_flip.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.section.flipSketchingPlane"
                  label="Flip sketching plane"
                  tooltip="Flip the selected sketching plane"
                  category="sketch"
+                 iconRef="sketch.flip_plane"
                  icon="icons/sketch/flip_plane.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.display.dimensions"
                  label="Dimensions Display"
                  tooltip="Toggle dimensions display"
                  category="sketch"
+                 iconRef="sketch.display_dimensions"
                  icon="icons/sketch/display_dimensions.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.display.constraints"
                  label="Constraints Display"
                  tooltip="Toggle constraints display"
                  category="sketch"
+                 iconRef="sketch.display_constraints"
                  icon="icons/sketch/display_constraints.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.display.vertices"
                  label="Vertices Display"
                  tooltip="Toggle vertices display"
                  category="sketch"
+                 iconRef="sketch.display_vertices"
                  icon="icons/sketch/display_vertices.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.display.grid"
                  label="Grid Display"
                  tooltip="Toggle grid display"
                  category="sketch"
+                 iconRef="sketch.display_grid"
                  icon="icons/sketch/display_grid.svg"
                  environments="sketch"/>
 
@@ -686,791 +882,925 @@
                  label="Grid Settings"
                  tooltip="Edit grid settings"
                  category="sketch"
+                 iconRef="sketch.grid_settings"
                  icon="icons/sketch/grid_settings.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.properties"
                  label="Properties"
                  tooltip="Open sketch properties"
                  category="sketch"
+                 iconRef="sketch.properties"
                  icon="icons/sketch/properties.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.lineStyle.set"
                  label="Set Line Style"
                  tooltip="Set sketch line style"
                  category="sketch"
+                 iconRef="sketch.line_style_set"
                  icon="icons/sketch/line_style_set.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.lineStyle.clear"
                  label="Clear Line Style"
                  tooltip="Clear sketch line style"
                  category="sketch"
+                 iconRef="sketch.line_style_clear"
                  icon="icons/sketch/line_style_clear.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.underConstrainedMode"
                  label="Under-Constrained Mode"
                  tooltip="Toggle under-constrained display/mode"
                  category="sketch"
+                 iconRef="sketch.underconstrained"
                  icon="icons/sketch/underconstrained.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.fileSystem"
                  label="File System"
                  tooltip="Show or hide file system"
                  category="sketch"
+                 iconRef="ui.file_system"
                  icon="icons/ui/file_system.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
+
+
+        <!-- ===== View / Display / Selection ===== -->
 
         <command id="sketch.select"
                  label="Select"
                  tooltip="Selection tools"
                  category="selection"
+                 iconRef="select.select"
                  icon="icons/select/select.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
+
+
+        <!-- ===== Sketch-only: dimensions / constraints / modify ===== -->
 
         <command id="sketch.ops.delete"
                  label="Delete"
                  tooltip="Delete selected sketch entities"
                  category="sketch.modify"
+                 iconRef="sketch.delete"
                  icon="icons/sketch/delete.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.ops.replace"
                  label="Replace"
                  tooltip="Replace selected sketch entities"
                  category="sketch.modify"
+                 iconRef="sketch.replace"
                  icon="icons/sketch/replace.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.ops.construction"
                  label="Construction"
                  tooltip="Convert entities to construction geometry"
                  category="sketch.modify"
+                 iconRef="sketch.construction"
                  icon="icons/sketch/construction.svg"
                  gesture="Shift+G"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.ops.toggleLock"
                  label="Toggle Lock"
                  tooltip="Toggle lock on selected entities"
                  category="sketch.modify"
+                 iconRef="sketch.toggle_lock"
                  icon="icons/sketch/toggle_lock.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.ops.convertTo"
                  label="Convert To"
                  tooltip="Convert entities to another type"
                  category="sketch.modify"
+                 iconRef="sketch.convert_to"
                  icon="icons/sketch/convert_to.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
+
+
+        <!-- ===== Model tab: Sketch ===== -->
 
         <command id="sketch.text"
                  label="Text"
                  tooltip="Create sketch text"
                  category="sketch"
+                 iconRef="sketch.text"
                  icon="icons/sketch/text.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
+
+
+        <!-- ===== Sketch-only: dimensions / constraints / modify ===== -->
 
         <command id="sketch.project"
                  label="Project"
                  tooltip="Project edges or curves into sketch"
                  category="sketch.modify"
+                 iconRef="sketch.project"
                  icon="icons/sketch/project.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.thicken"
                  label="Thicken"
                  tooltip="Thicken sketch entities"
                  category="sketch.modify"
+                 iconRef="sketch.thicken"
                  icon="icons/sketch/thicken.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.modify.modify"
                  label="Modify"
                  tooltip="Modify sketch entities"
                  category="sketch.modify"
+                 iconRef="sketch.modify"
                  icon="icons/sketch/modify.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.modify.deleteSegment"
                  label="Delete Segment"
                  tooltip="Delete a segment of sketch geometry"
                  category="sketch.modify"
+                 iconRef="sketch.delete_segment"
                  icon="icons/sketch/delete_segment.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.modify.divide"
                  label="Divide"
                  tooltip="Divide sketch entities"
                  category="sketch.modify"
+                 iconRef="sketch.divide"
                  icon="icons/sketch/divide.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.modify.corner"
                  label="Corner"
                  tooltip="Create or modify corners"
                  category="sketch.modify"
+                 iconRef="sketch.corner"
                  icon="icons/sketch/corner.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.modify.rotateResize"
                  label="Rotate Resize"
                  tooltip="Rotate or resize sketch entities"
                  category="sketch.modify"
+                 iconRef="sketch.rotate_resize"
                  icon="icons/sketch/rotate_resize.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.modify.chamfer"
                  label="Chamfer"
                  tooltip="Create sketch chamfers"
                  category="sketch.modify"
+                 iconRef="sketch.chamfer"
                  icon="icons/sketch/chamfer.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.modify.chamferTrim"
                  label="Chamfer Trim"
                  tooltip="Create sketch chamfers and trim"
                  category="sketch.modify"
+                 iconRef="sketch.chamfer_trim"
                  icon="icons/sketch/chamfer_trim.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.fillet.circular"
                  label="Circular"
                  tooltip="Create circular fillets"
                  category="sketch.modify"
+                 iconRef="sketch.fillet_circular"
                  icon="icons/sketch/fillet_circular.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.fillet.circularTrim"
                  label="Circular Trim"
                  tooltip="Create circular fillets and trim"
                  category="sketch.modify"
+                 iconRef="sketch.fillet_circular_trim"
                  icon="icons/sketch/fillet_circular_trim.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.fillet.elliptical"
                  label="Elliptical"
                  tooltip="Create elliptical fillets"
                  category="sketch.modify"
+                 iconRef="sketch.fillet_elliptical"
                  icon="icons/sketch/fillet_elliptical.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.fillet.ellipticalTrim"
                  label="Elliptical Trim"
                  tooltip="Create elliptical fillets and trim"
                  category="sketch.modify"
+                 iconRef="sketch.fillet_elliptical_trim"
                  icon="icons/sketch/fillet_elliptical_trim.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
+
+
+        <!-- ===== Model tab: Sketch ===== -->
 
         <command id="sketch.inspect.featureRequirements"
                  label="Feature Requirements"
                  tooltip="Show feature requirements"
                  category="sketch"
+                 iconRef="sketch.feature_requirements"
                  icon="icons/sketch/feature_requirements.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.inspect.intersectionPoint"
                  label="Intersection Point"
                  tooltip="Create intersection points"
                  category="sketch"
+                 iconRef="sketch.inspect_intersection"
                  icon="icons/sketch/inspect_intersection.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.inspect.tangencyPoint"
                  label="Tangency Point"
                  tooltip="Create tangency points"
                  category="sketch"
+                 iconRef="sketch.inspect_tangency"
                  icon="icons/sketch/inspect_tangency.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.inspect.entity"
                  label="Entity"
                  tooltip="Inspect sketch entities"
                  category="sketch"
+                 iconRef="sketch.inspect_entity"
                  icon="icons/sketch/inspect_entity.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
+
+
+        <!-- ===== UI built-in commands (wired to MainWindowQt) ===== -->
 
         <command id="sketch.ok"
                  label="OK"
                  tooltip="Accept and close sketch"
                  category="ui"
+                 iconRef="ui.ok"
                  icon="icons/ui/ok.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
         <command id="sketch.cancel"
                  label="Cancel"
                  tooltip="Cancel sketch and close"
                  category="ui"
+                 iconRef="ui.cancel"
                  icon="icons/ui/cancel.svg"
-                 environments="sketch"/>
+                 environments="workbench.sketch"/>
 
 
-<!-- ===== Assembly: components / constraints / exploded views ===== -->
+        <!-- ===== Assembly: components / constraints / exploded views ===== -->
+
         <command id="asm.addComponent"
                  label="Add Component"
                  tooltip="Add existing parts to the assembly"
                  category="assembly"
+                 iconRef="asm.add_component"
                  icon="icons/asm/add_component.svg"
-                 environments="asm,part"/>
+                 environments="workbench.assembly,workbench.part"/>
 
         <command id="asm.newComponent"
                  label="New Component"
                  tooltip="Create a new part in the assembly"
                  category="assembly"
+                 iconRef="asm.new_component"
                  icon="icons/asm/new_component.svg"
-                 environments="asm"/>
+                 environments="workbench.assembly"/>
 
         <command id="asm.replaceComponent"
                  label="Replace Component"
                  tooltip="Replace components in the assembly"
                  category="assembly"
+                 iconRef="asm.replace_component"
                  icon="icons/asm/replace_component.svg"
-                 environments="asm"/>
+                 environments="workbench.assembly"/>
 
         <command id="asm.arrange"
                  label="Arrange Components"
                  tooltip="Automatically arrange assembly components"
                  category="assembly"
+                 iconRef="asm.arrange"
                  icon="icons/asm/arrange.svg"
-                 environments="asm"/>
+                 environments="workbench.assembly"/>
 
         <command id="asm.constraint"
                  label="Assembly Constraints"
                  tooltip="Create assembly constraints"
                  category="assembly"
+                 iconRef="asm.constraint"
                  icon="icons/asm/constraint.svg"
-                 environments="asm"/>
+                 environments="workbench.assembly"/>
 
         <command id="asm.align"
                  label="Align"
                  tooltip="Create alignment constraints"
                  category="assembly"
+                 iconRef="asm.align"
                  icon="icons/asm/align.svg"
-                 environments="asm"/>
+                 environments="workbench.assembly"/>
 
         <command id="asm.mate"
                  label="Mate"
                  tooltip="Create mating constraints"
                  category="assembly"
+                 iconRef="asm.mate"
                  icon="icons/asm/mate.svg"
-                 environments="asm"/>
+                 environments="workbench.assembly"/>
 
         <command id="asm.distance"
                  label="Distance"
                  tooltip="Create distance constraints"
                  category="assembly"
+                 iconRef="asm.distance"
                  icon="icons/asm/distance.svg"
-                 environments="asm"/>
+                 environments="workbench.assembly"/>
 
         <command id="asm.explode"
                  label="Exploded View"
                  tooltip="Create an exploded assembly view"
                  category="assembly"
+                 iconRef="asm.explode"
                  icon="icons/asm/explode.svg"
-                 environments="asm"/>
+                 environments="workbench.assembly"/>
 
         <command id="asm.unexplode"
                  label="Collapse"
                  tooltip="Restore the non-exploded assembly state"
                  category="assembly"
+                 iconRef="asm.unexplode"
                  icon="icons/asm/unexplode.svg"
-                 environments="asm"/>
+                 environments="workbench.assembly"/>
+
 
         <!-- ===== Sheet Metal: base / flanges / bends / flat pattern ===== -->
         <command id="sheet.baseFlange"
                  label="Base Flange"
                  tooltip="Create a base flange for a sheet metal part"
                  category="sheet"
+                 iconRef="sheet.base_flange"
                  icon="icons/sheet/base_flange.svg"
-                 environments="sheet"/>
+                 environments="workbench.part"/>
 
         <command id="sheet.tab"
                  label="Tab"
                  tooltip="Create additional tab features"
                  category="sheet"
+                 iconRef="sheet.tab"
                  icon="icons/sheet/tab.svg"
-                 environments="sheet"/>
+                 environments="workbench.part"/>
 
         <command id="sheet.edgeFlange"
                  label="Edge Flange"
                  tooltip="Create flanges along edges"
                  category="sheet"
+                 iconRef="sheet.edge_flange"
                  icon="icons/sheet/edge_flange.svg"
-                 environments="sheet"/>
+                 environments="workbench.part"/>
 
         <command id="sheet.contourFlange"
                  label="Contour Flange"
                  tooltip="Create flanges along a sketch contour"
                  category="sheet"
+                 iconRef="sheet.contour_flange"
                  icon="icons/sheet/contour_flange.svg"
-                 environments="sheet"/>
+                 environments="workbench.part"/>
 
         <command id="sheet.loftedFlange"
                  label="Lofted Flange"
                  tooltip="Create lofted sheet metal flanges between profiles"
                  category="sheet"
+                 iconRef="sheet.lofted_flange"
                  icon="icons/sheet/lofted_flange.svg"
-                 environments="sheet"/>
+                 environments="workbench.part"/>
 
         <command id="sheet.bend"
                  label="Bend"
                  tooltip="Create bends in sheet metal"
                  category="sheet"
+                 iconRef="sheet.bend"
                  icon="icons/sheet/bend.svg"
-                 environments="sheet"/>
+                 environments="workbench.part"/>
 
         <command id="sheet.unbend"
                  label="Unbend"
                  tooltip="Unbend bends to a flat state"
                  category="sheet"
+                 iconRef="sheet.unbend"
                  icon="icons/sheet/unbend.svg"
-                 environments="sheet"/>
+                 environments="workbench.part"/>
 
         <command id="sheet.rebend"
                  label="Rebend"
                  tooltip="Rebend previously unbent features"
                  category="sheet"
+                 iconRef="sheet.rebend"
                  icon="icons/sheet/rebend.svg"
-                 environments="sheet"/>
+                 environments="workbench.part"/>
 
         <command id="sheet.jog"
                  label="Jog"
                  tooltip="Create jog features"
                  category="sheet"
+                 iconRef="sheet.jog"
                  icon="icons/sheet/jog.svg"
-                 environments="sheet"/>
+                 environments="workbench.part"/>
 
         <command id="sheet.cutout"
                  label="Cutout"
                  tooltip="Create sheet metal cutouts"
                  category="sheet"
+                 iconRef="sheet.cutout"
                  icon="icons/sheet/cutout.svg"
-                 environments="sheet"/>
+                 environments="workbench.part"/>
 
         <command id="sheet.hole"
                  label="Hole"
                  tooltip="Create holes in sheet metal"
                  category="sheet"
+                 iconRef="sheet.hole"
                  icon="icons/sheet/hole.svg"
-                 environments="sheet"/>
+                 environments="workbench.part"/>
 
         <command id="sheet.cornerRelief"
                  label="Corner Relief"
                  tooltip="Add corner reliefs at intersections"
                  category="sheet"
+                 iconRef="sheet.corner_relief"
                  icon="icons/sheet/corner_relief.svg"
-                 environments="sheet"/>
+                 environments="workbench.part"/>
 
         <command id="sheet.breakCorner"
                  label="Break Corner"
                  tooltip="Chamfer or round sheet metal corners"
                  category="sheet"
+                 iconRef="sheet.break_corner"
                  icon="icons/sheet/break_corner.svg"
-                 environments="sheet"/>
+                 environments="workbench.part"/>
 
         <command id="sheet.flatten"
                  label="Flat Pattern"
                  tooltip="Generate a flat pattern of the sheet metal part"
                  category="sheet"
+                 iconRef="sheet.flatten"
                  icon="icons/sheet/flatten.svg"
-                 environments="sheet"/>
+                 environments="workbench.part"/>
 
         <command id="sheet.exportFlat"
                  label="Export Flat"
                  tooltip="Export flat pattern to DXF or similar formats"
                  category="sheet"
+                 iconRef="sheet.export_flat"
                  icon="icons/sheet/export_flat.svg"
-                 environments="sheet"/>
+                 environments="workbench.part"/>
+
 
         <!-- ===== Measure / Analysis ===== -->
+
         <command id="measure.distance"
                  label="Distance"
                  tooltip="Measure distance between points or entities"
                  category="measure"
+                 iconRef="measure.distance"
                  icon="icons/measure/distance.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="measure.angle"
                  label="Angle"
                  tooltip="Measure angle between entities"
                  category="measure"
+                 iconRef="measure.angle"
                  icon="icons/measure/angle.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="measure.radius"
                  label="Radius"
                  tooltip="Measure circle or arc radius"
                  category="measure"
+                 iconRef="measure.radius"
                  icon="icons/measure/radius.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="measure.massProps"
                  label="Mass Properties"
                  tooltip="Compute mass, volume, and center of gravity"
                  category="measure"
+                 iconRef="measure.mass_props"
                  icon="icons/measure/mass_props.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="measure.dialog"
                  label="Measure Dialog"
                  tooltip="Open the measure dialog"
                  category="measure"
+                 iconRef="measure.dialog"
                  icon="icons/measure/dialog.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="measure.section"
                  label="Section Measurement"
                  tooltip="Measure via section views"
                  category="measure"
+                 iconRef="measure.section"
                  icon="icons/measure/section.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="measure.draft"
                  label="Draft Analysis"
                  tooltip="Analyze draft angles"
                  category="measure"
+                 iconRef="measure.draft"
                  icon="icons/measure/draft.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="analysis.bodyCheck"
                  label="Body Check"
                  tooltip="Check body validity and errors"
                  category="analysis"
+                 iconRef="analysis.body_check"
                  icon="icons/analysis/body_check.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="analysis.interference"
                  label="Interference Check"
                  tooltip="Check interference between components"
                  category="analysis"
+                 iconRef="analysis.interference"
                  icon="icons/analysis/interference.svg"
-                 environments="asm"/>
+                 environments="workbench.assembly"/>
 
         <command id="analysis.mass"
                  label="Mass Analysis"
                  tooltip="Analyze mass and center of gravity"
                  category="analysis"
+                 iconRef="analysis.mass"
                  icon="icons/analysis/mass.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <!-- ===== View / Display / Selection ===== -->
         <command id="view.trimetric"
                  label="Trimetric"
                  tooltip="Switch to trimetric view"
                  category="view"
+                 iconRef="view.trimetric"
                  icon="icons/view/trimetric.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="view.top"
                  label="Top"
                  tooltip="Switch to top view"
                  category="view"
+                 iconRef="view.top"
                  icon="icons/view/top.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="view.front"
                  label="Front"
                  tooltip="Switch to front view"
                  category="view"
+                 iconRef="view.front"
                  icon="icons/view/front.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="view.right"
                  label="Right"
                  tooltip="Switch to right view"
                  category="view"
+                 iconRef="view.right"
                  icon="icons/view/right.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="view.dynamicSection"
                  label="Dynamic Section"
                  tooltip="Create and manipulate dynamic sections"
                  category="view"
+                 iconRef="view.dynamic_section"
                  icon="icons/view/dynamic_section.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="view.clippingPlane"
                  label="Clipping Plane"
                  tooltip="Enable clipping planes"
                  category="view"
+                 iconRef="view.clipping_plane"
                  icon="icons/view/clipping_plane.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="display.shaded"
                  label="Shaded"
                  tooltip="Display shaded model"
                  category="display"
+                 iconRef="display.shaded"
                  icon="icons/display/shaded.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="display.shadedWithEdges"
                  label="Shaded with Edges"
                  tooltip="Display shaded model with edges"
                  category="display"
+                 iconRef="display.shaded_edges"
                  icon="icons/display/shaded_edges.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="display.wireframe"
                  label="Wireframe"
                  tooltip="Display in wireframe mode"
                  category="display"
+                 iconRef="display.wireframe"
                  icon="icons/display/wireframe.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="display.hiddenLine"
                  label="Hidden Line"
                  tooltip="Display with hidden line removal"
                  category="display"
+                 iconRef="display.hidden_line"
                  icon="icons/display/hidden_line.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="display.show"
                  label="Show"
                  tooltip="Show hidden objects"
                  category="display"
+                 iconRef="display.show"
                  icon="icons/display/show.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="display.hide"
                  label="Hide"
                  tooltip="Hide selected objects"
                  category="display"
+                 iconRef="display.hide"
                  icon="icons/display/hide.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="display.isolate"
                  label="Isolate"
                  tooltip="Isolate selected objects"
                  category="display"
+                 iconRef="display.isolate"
                  icon="icons/display/isolate.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="select.filter"
                  label="Selection Filter"
                  tooltip="Set the selection filter"
                  category="selection"
+                 iconRef="select.filter"
                  icon="icons/select/filter.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="select.single"
                  label="Single Select"
                  tooltip="Select a single object"
                  category="selection"
+                 iconRef="select.single"
                  icon="icons/select/single.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="select.rectangle"
                  label="Rectangle Select"
                  tooltip="Select objects with a rectangular window"
                  category="selection"
+                 iconRef="select.rectangle"
                  icon="icons/select/rectangle.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="select.lasso"
                  label="Lasso Select"
                  tooltip="Select objects with a lasso"
                  category="selection"
+                 iconRef="select.lasso"
                  icon="icons/select/lasso.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <!-- ===== Tools / Journal / Expressions / Python ===== -->
         <command id="tools.expressions"
                  label="Expressions"
                  tooltip="Open the expression manager"
                  category="tools"
+                 iconRef="tools.expressions"
                  icon="icons/tools/expressions.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="tools.journal.record"
                  label="Record Journal"
                  tooltip="Start recording an operation journal"
                  category="tools"
+                 iconRef="tools.journal_record"
                  icon="icons/tools/journal_record.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="tools.journal.play"
                  label="Play Journal"
                  tooltip="Play back a recorded journal"
                  category="tools"
+                 iconRef="tools.journal_play"
                  icon="icons/tools/journal_play.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="tools.journal.pause"
                  label="Pause Journal"
                  tooltip="Pause or resume journal recording"
                  category="tools"
+                 iconRef="tools.journal_pause"
                  icon="icons/tools/journal_pause.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="tools.pythonConsole"
                  label="Python Console"
                  tooltip="Open the Python console"
                  category="tools"
+                 iconRef="tools.python_console"
                  icon="icons/tools/python_console.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <!-- ===== Application switching ===== -->
         <command id="app.switch.partModeling"
                  label="Part Modeling"
                  tooltip="Switch to the part modeling environment"
                  category="application"
+                 iconRef="app.part_modeling"
                  icon="icons/app/part_modeling.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="app.switch.assembly"
                  label="Assembly Design"
                  tooltip="Switch to the assembly environment"
                  category="application"
+                 iconRef="app.assembly"
                  icon="icons/app/assembly.svg"
-                 environments="part,asm"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="app.switch.sheetMetal"
                  label="Sheet Metal Design"
                  tooltip="Switch to the sheet metal environment"
                  category="application"
+                 iconRef="app.sheet_metal"
                  icon="icons/app/sheet_metal.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="app.switch.sketch"
                  label="Sketch Environment"
                  tooltip="Switch to the sketch environment"
                  category="application"
+                 iconRef="app.sketch"
                  icon="icons/app/sketch.svg"
-                 environments="part,sketch,asm,sheet"/>
+                 environments="workbench.part,workbench.sketch,workbench.assembly"/>
 
         <command id="app.switch.bim"
                  label="BIM"
                  tooltip="Switch to the BIM environment"
                  category="application"
+                 iconRef="app.bim"
                  icon="icons/app/bim.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="app.switch.ship"
                  label="Ship Design"
                  tooltip="Switch to the ship design environment"
                  category="application"
+                 iconRef="app.ship"
                  icon="icons/app/ship.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <!-- ===== GC toolbox (your own module) ===== -->
         <command id="gc.stdPartLibrary"
                  label="Standard Parts Library"
                  tooltip="Open the standard parts library"
                  category="gc"
+                 iconRef="gc.std_part_library"
                  icon="icons/gc/std_part_library.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="gc.checkUpdate"
                  label="Check for Updates"
                  tooltip="Check for software updates"
                  category="gc"
+                 iconRef="gc.check_update"
                  icon="icons/gc/check_update.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="gc.settings"
                  label="GC Settings"
                  tooltip="Open GC settings"
                  category="gc"
+                 iconRef="gc.settings"
                  icon="icons/gc/settings.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
-        <!-- ===== Creo Parametric: Model tab (Model) ===== -->
+        <!-- =====  Model tab (Model) ===== -->
         <command id="model.regenerate"
                  label="Regenerate"
                  tooltip="Regenerate the model to update all features"
                  category="model.ops"
+                 iconRef="model.regenerate"
                  icon="icons/model/regenerate.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="model.delete"
                  label="Delete"
                  tooltip="Delete selected features or geometry"
                  category="model.ops"
+                 iconRef="model.delete"
                  icon="icons/model/delete.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <!-- ===== Model tree: feature operations (context menu parity) ===== -->
         <command id="model.feature.suppress"
                  label="Suppress"
                  tooltip="Temporarily suppress selected features"
                  category="feature"
+                 iconRef="model.feature_suppress"
                  icon="icons/model/feature_suppress.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.feature.unsuppress"
                  label="Resume"
                  tooltip="Resume suppressed features"
                  category="feature"
+                 iconRef="model.feature_unsuppress"
                  icon="icons/model/feature_unsuppress.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.feature.delete"
                  label="Delete Feature"
                  tooltip="Permanently delete selected features"
                  category="feature"
+                 iconRef="model.feature_delete"
                  icon="icons/model/feature_delete.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
 
+        <!-- =====  Model tab (Model) ===== -->
 
         <command id="model.getData.userDefinedFeature"
                  label="User-Defined Feature"
                  tooltip="Create a user-defined feature (UDF)"
                  category="model.getData"
+                 iconRef="model.user_defined_feature"
                  icon="icons/model/user_defined_feature.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="model.getData.copyGeometry"
                  label="Copy Geometry"
                  tooltip="Copy geometry from another model"
                  category="model.getData"
+                 iconRef="model.copy_geometry"
                  icon="icons/model/copy_geometry.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="model.getData.shrinkwrap"
                  label="Shrinkwrap"
                  tooltip="Create a simplified shrinkwrap representation"
                  category="model.getData"
+                 iconRef="model.shrinkwrap"
                  icon="icons/model/shrinkwrap.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="model.getData.mergeInheritance"
                  label="Merge/Inheritance"
                  tooltip="Merge or inherit geometry from another model"
                  category="model.getData"
+                 iconRef="model.merge_inheritance"
                  icon="icons/model/merge_inheritance.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="model.getData.copyFrom"
                  label="Copy From"
                  tooltip="Copy features or geometry from another model"
                  category="model.getData"
+                 iconRef="model.copy_from"
                  icon="icons/model/copy_from.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="model.getData.independentGeometry"
                  label="Independent Geometry"
                  tooltip="Create independent geometry from external references"
                  category="model.getData"
+                 iconRef="model.independent_geometry"
                  icon="icons/model/independent_geometry.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="model.getData.layoutFeature"
                  label="Layout Feature"
                  tooltip="Create a layout-driven feature"
                  category="model.getData"
+                 iconRef="model.layout_feature"
                  icon="icons/model/layout_feature.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="model.getData.import"
                  label="Import"
                  tooltip="Import external geometry"
                  category="model.getData"
+                 iconRef="model.import"
                  icon="icons/model/import.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         
 
@@ -1479,100 +1809,114 @@
                  label="Sketch"
                  tooltip="Create a sketch on a selected plane or datum"
                  category="sketch"
+                 iconRef="sketch.new_sketch"
                  icon="icons/sketch/new_sketch.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="sketch.edit"
                  label="Edit Sketch"
                  tooltip="Edit an existing sketch"
                  category="sketch"
+                 iconRef="sketch.edit_sketch"
                  icon="icons/sketch/edit_sketch.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="sketch.reuse"
                  label="Reuse Sketch"
                  tooltip="Reuse an existing sketch profile"
                  category="sketch"
+                 iconRef="sketch.reuse"
                  icon="icons/sketch/reuse.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="sketch.mirror"
                  label="Mirror Sketch"
                  tooltip="Mirror sketch geometry"
                  category="sketch"
+                 iconRef="sketch.mirror"
                  icon="icons/sketch/mirror.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <!-- ===== Model tab: Datum basics ===== -->
         <command id="datum.plane"
                  label="Plane"
                  tooltip="Create a datum plane"
                  category="datum"
+                 iconRef="datum.plane"
                  icon="icons/datum/plane.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="datum.axis"
                  label="Axis"
                  tooltip="Create a datum axis"
                  category="datum"
+                 iconRef="datum.axis"
                  icon="icons/datum/axis.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="datum.point"
                  label="Point"
                  tooltip="Create a datum point"
                  category="datum"
+                 iconRef="datum.point"
                  icon="icons/datum/point.svg"
-                 environments="part,asm,sheet,sketch"/>
+                 environments="workbench.part,workbench.assembly,workbench.sketch"/>
 
         <command id="datum.cs"
                  label="Coordinate System"
                  tooltip="Create a coordinate system"
                  category="datum"
+                 iconRef="datum.cs"
                  icon="icons/datum/cs.svg"
-                 environments="part,asm,sheet,sketch"/>
+                 environments="workbench.part,workbench.assembly,workbench.sketch"/>
 
 <command id="datum.curve"
                  label="Curve"
                  tooltip="Create a datum curve"
                  category="datum"
+                 iconRef="datum.curve"
                  icon="icons/datum/curve.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="datum.reference"
                  label="Reference"
                  tooltip="Create a reference feature"
                  category="datum"
+                 iconRef="datum.reference"
                  icon="icons/datum/reference.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="datum.graph"
                  label="Graph"
                  tooltip="Create a graph feature"
                  category="datum"
+                 iconRef="datum.graph"
                  icon="icons/datum/graph.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="datum.ribbon"
                  label="Ribbon"
                  tooltip="Create a ribbon feature"
                  category="datum"
+                 iconRef="datum.ribbon"
                  icon="icons/datum/ribbon.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="datum.offsetPlanes"
                  label="Offset Planes"
                  tooltip="Create offset planes"
                  category="datum"
+                 iconRef="datum.offset_planes"
                  icon="icons/datum/offset_planes.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="datum.defaultCoordinateSystem"
                  label="Default Coordinate System"
                  tooltip="Create or manage the default coordinate system"
                  category="datum"
+                 iconRef="datum.default_cs"
                  icon="icons/datum/default_cs.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         
 
@@ -1581,59 +1925,67 @@
                  label="Extrude"
                  tooltip="Create an extruded feature from sketches or curves"
                  category="shapes"
+                 iconRef="model.extrude"
                  icon="icons/model/extrude.svg"
                  gesture="Ctrl+E"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.revolve"
                  label="Revolve"
                  tooltip="Create a revolved feature around an axis"
                  category="shapes"
+                 iconRef="model.revolve"
                  icon="icons/model/revolve.svg"
                  gesture="Ctrl+R"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
 <command id="model.sweep"
                  label="Sweep"
                  tooltip="Create a swept feature along a trajectory"
                  category="shapes"
+                 iconRef="model.sweep"
                  icon="icons/model/sweep.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.sweep.helical"
                  label="Helical Sweep"
                  tooltip="Create a helical sweep feature"
                  category="shapes"
+                 iconRef="model.helical_sweep"
                  icon="icons/model/helical_sweep.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.sweep.volumeHelical"
                  label="Volume Helical Sweep"
                  tooltip="Create a volume helical sweep feature"
                  category="shapes"
+                 iconRef="model.volume_helical_sweep"
                  icon="icons/model/volume_helical_sweep.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.sweepBlend"
                  label="Sweep Blend"
                  tooltip="Create a swept blend feature"
                  category="shapes"
+                 iconRef="model.sweep_blend"
                  icon="icons/model/sweep_blend.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.blend"
                  label="Blend"
                  tooltip="Create a blend feature"
                  category="shapes"
+                 iconRef="model.blend"
                  icon="icons/model/blend.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.blend.rotational"
                  label="Rotational Blend"
                  tooltip="Create a rotational blend feature"
                  category="shapes"
+                 iconRef="model.rotational_blend"
                  icon="icons/model/rotational_blend.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         
 
@@ -1642,365 +1994,429 @@
                  label="Hole"
                  tooltip="Create standard hole features"
                  category="engineering"
+                 iconRef="model.hole"
                  icon="icons/model/hole.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.shell"
                  label="Shell"
                  tooltip="Convert a solid body to a thin-walled shell"
                  category="engineering"
+                 iconRef="model.shell"
                  icon="icons/model/shell.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.draft"
                  label="Draft"
                  tooltip="Apply draft angles to faces"
                  category="engineering"
+                 iconRef="model.draft"
                  icon="icons/model/draft.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.chamfer"
                  label="Chamfer"
                  tooltip="Create chamfers"
                  category="engineering"
+                 iconRef="model.chamfer"
                  icon="icons/model/chamfer.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
 <command id="model.round"
                  label="Round"
                  tooltip="Apply rounds (fillets) to edges"
                  category="engineering"
+                 iconRef="model.round"
                  icon="icons/model/round.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.round.auto"
                  label="Auto Round"
                  tooltip="Automatically apply rounds based on rules"
                  category="engineering"
+                 iconRef="model.auto_round"
                  icon="icons/model/auto_round.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.chamfer.edge"
                  label="Edge Chamfer"
                  tooltip="Apply chamfers to edges"
                  category="engineering"
+                 iconRef="model.edge_chamfer"
                  icon="icons/model/edge_chamfer.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.chamfer.corner"
                  label="Corner Chamfer"
                  tooltip="Apply chamfers to corners"
                  category="engineering"
+                 iconRef="model.corner_chamfer"
                  icon="icons/model/corner_chamfer.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.draft.variablePullDirection"
                  label="Variable Pull Direction Draft"
                  tooltip="Apply draft with variable pull direction"
                  category="engineering"
+                 iconRef="model.variable_pull_draft"
                  icon="icons/model/variable_pull_draft.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.rib"
                  label="Rib"
                  tooltip="Create rib features"
                  category="engineering"
+                 iconRef="model.rib"
                  icon="icons/model/rib.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.rib.trajectory"
                  label="Trajectory Rib"
                  tooltip="Create a trajectory rib feature"
                  category="engineering"
+                 iconRef="model.trajectory_rib"
                  icon="icons/model/trajectory_rib.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.rib.profile"
                  label="Profile Rib"
                  tooltip="Create a profile rib feature"
                  category="engineering"
+                 iconRef="model.profile_rib"
                  icon="icons/model/profile_rib.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.bend.toroidal"
                  label="Toroidal Bend"
                  tooltip="Create a toroidal bend feature"
                  category="engineering"
+                 iconRef="model.toroidal_bend"
                  icon="icons/model/toroidal_bend.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.bend.spiral"
                  label="Spiral Bend"
                  tooltip="Create a spiral bend feature"
                  category="engineering"
+                 iconRef="model.spiral_bend"
                  icon="icons/model/spiral_bend.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.cosmetic.sketch"
                  label="Cosmetic Sketch"
                  tooltip="Create cosmetic sketch entities"
                  category="engineering"
+                 iconRef="model.cosmetic_sketch"
                  icon="icons/model/cosmetic_sketch.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="model.cosmetic.thread"
                  label="Cosmetic Thread"
                  tooltip="Create cosmetic threads"
                  category="engineering"
+                 iconRef="model.cosmetic_thread"
                  icon="icons/model/cosmetic_thread.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="model.cosmetic.groove"
                  label="Cosmetic Groove"
                  tooltip="Create cosmetic grooves"
                  category="engineering"
+                 iconRef="model.cosmetic_groove"
                  icon="icons/model/cosmetic_groove.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="model.area.designated"
                  label="Designated Area"
                  tooltip="Create a designated area feature"
                  category="engineering"
+                 iconRef="model.designated_area"
                  icon="icons/model/designated_area.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="model.area.ecad"
                  label="ECAD Area"
                  tooltip="Create an ECAD area feature"
                  category="engineering"
+                 iconRef="model.ecad_area"
                  icon="icons/model/ecad_area.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="model.lattice"
                  label="Lattice"
                  tooltip="Create lattice structures"
                  category="engineering"
+                 iconRef="model.lattice"
                  icon="icons/model/lattice.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
+
+
+        <!-- ===== Model tab: Patterns ===== -->
 
         <command id="model.pattern"
                  label="Pattern"
                  tooltip="Create a pattern of features"
                  category="pattern"
+                 iconRef="model.pattern"
                  icon="icons/model/pattern.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.pattern.geometry"
                  label="Geometry Pattern"
                  tooltip="Create a pattern of geometry"
                  category="pattern"
+                 iconRef="model.geometry_pattern"
                  icon="icons/model/geometry_pattern.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.pattern.table"
                  label="Pattern Table"
                  tooltip="Create or edit a pattern table"
                  category="pattern"
+                 iconRef="model.pattern_table"
                  icon="icons/model/pattern_table.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
+
+
+        <!-- ===== Edit commands ===== -->
 
         <command id="model.mirror"
                  label="Mirror"
                  tooltip="Mirror geometry or features"
                  category="editing"
+                 iconRef="model.mirror"
                  icon="icons/model/mirror.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.extend"
                  label="Extend"
                  tooltip="Extend geometry"
                  category="editing"
+                 iconRef="model.extend"
                  icon="icons/model/extend.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.trim"
                  label="Trim"
                  tooltip="Trim geometry"
                  category="editing"
+                 iconRef="model.trim"
                  icon="icons/model/trim.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.project"
                  label="Project"
                  tooltip="Project curves or geometry onto surfaces"
                  category="editing"
+                 iconRef="model.project"
                  icon="icons/model/project.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.project.wrap"
                  label="Wrap"
                  tooltip="Wrap a sketch or curves onto a surface"
                  category="editing"
+                 iconRef="model.wrap"
                  icon="icons/model/wrap.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.project.remove"
                  label="Remove"
                  tooltip="Remove a projected/wrapped result"
                  category="editing"
+                 iconRef="model.project_remove"
                  icon="icons/model/project_remove.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.project.splitSurface"
                  label="Split Surface"
                  tooltip="Split a surface using projected geometry"
                  category="editing"
+                 iconRef="model.split_surface"
                  icon="icons/model/split_surface.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.project.flipNormal"
                  label="Flip Normal"
                  tooltip="Flip the projection normal"
                  category="editing"
+                 iconRef="model.flip_normal"
                  icon="icons/model/flip_normal.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.project.collapse"
                  label="Collapse"
                  tooltip="Collapse projection options"
                  category="editing"
+                 iconRef="model.collapse"
                  icon="icons/model/collapse.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.offset"
                  label="Offset"
                  tooltip="Offset surfaces or faces"
                  category="editing"
+                 iconRef="model.offset"
                  icon="icons/model/offset.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.thicken"
                  label="Thicken"
                  tooltip="Thicken a surface into a solid"
                  category="editing"
+                 iconRef="model.thicken"
                  icon="icons/model/thicken.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.merge"
                  label="Merge"
                  tooltip="Merge bodies (boolean add)"
                  category="editing"
+                 iconRef="model.merge"
                  icon="icons/model/merge.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.intersect"
                  label="Intersect"
                  tooltip="Intersect bodies"
                  category="editing"
+                 iconRef="model.intersect"
                  icon="icons/model/intersect.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="model.solidify"
                  label="Solidify"
                  tooltip="Solidify surfaces into solids or combine with solids"
                  category="editing"
+                 iconRef="model.solidify"
                  icon="icons/model/solidify.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
+
+
+        <!-- ===== Surface Modeling ===== -->
 
         <command id="surface.boundaryBlend"
                  label="Boundary Blend"
                  tooltip="Create a boundary blend surface"
                  category="surface"
+                 iconRef="surface.boundary_blend"
                  icon="icons/surface/boundary_blend.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="surface.fill"
                  label="Fill"
                  tooltip="Create a fill surface"
                  category="surface"
+                 iconRef="surface.fill"
                  icon="icons/surface/fill.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="surface.style"
                  label="Style"
                  tooltip="Create or edit style surfaces"
                  category="surface"
+                 iconRef="surface.style"
                  icon="icons/surface/style.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="surface.freestyle"
                  label="Freestyle"
                  tooltip="Create or edit freestyle surfaces"
                  category="surface"
+                 iconRef="surface.freestyle"
                  icon="icons/surface/freestyle.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="surface.style.restyle"
                  label="Restyle"
                  tooltip="Restyle existing surfaces"
                  category="surface"
+                 iconRef="surface.restyle"
                  icon="icons/surface/restyle.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="surface.style.vertexRound"
                  label="Vertex Round"
                  tooltip="Round a vertex on a surface"
                  category="surface"
+                 iconRef="surface.vertex_round"
                  icon="icons/surface/vertex_round.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="surface.style.blendTangent"
                  label="Blend Tangent to Surfaces"
                  tooltip="Blend tangent to surrounding surfaces"
                  category="surface"
+                 iconRef="surface.blend_tangent"
                  icon="icons/surface/blend_tangent.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="surface.style.foreignSurface"
                  label="Foreign Surface"
                  tooltip="Create or manage foreign surfaces"
                  category="surface"
+                 iconRef="surface.foreign_surface"
                  icon="icons/surface/foreign_surface.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="surface.style.flattenQuilt"
                  label="Flatten Quilt"
                  tooltip="Flatten a quilt surface"
                  category="surface"
+                 iconRef="surface.flatten_quilt"
                  icon="icons/surface/flatten_quilt.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
 
         <command id="surface.style.flattenQuiltDeformation"
                  label="Flatten-Quilt Deformation"
                  tooltip="Flatten quilt with deformation controls"
                  category="surface"
+                 iconRef="surface.flatten_quilt_deformation"
                  icon="icons/surface/flatten_quilt_deformation.svg"
-                 environments="part,sheet"/>
+                 environments="workbench.part"/>
+
+
+        <!-- =====  Model tab (Model) ===== -->
 
         <command id="modelIntent.componentInterface"
                  label="Component Interface"
                  tooltip="Define component interfaces"
                  category="modelIntent"
+                 iconRef="model_intent.component_interface"
                  icon="icons/model_intent/component_interface.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="modelIntent.publishGeometry"
                  label="Publish Geometry"
                  tooltip="Publish geometry for downstream use"
                  category="modelIntent"
+                 iconRef="model_intent.publish_geometry"
                  icon="icons/model_intent/publish_geometry.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="modelIntent.familyTable"
                  label="Family Table"
                  tooltip="Create or edit family tables"
                  category="modelIntent"
+                 iconRef="model_intent.family_table"
                  icon="icons/model_intent/family_table.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="modelIntent.parameters"
                  label="Parameters"
                  tooltip="Edit model parameters"
                  category="modelIntent"
+                 iconRef="model_intent.parameters"
                  icon="icons/model_intent/parameters.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 
         <command id="modelIntent.switchDimensions"
                  label="Switch Dimensions"
                  tooltip="Switch driving/driven dimensions"
                  category="modelIntent"
+                 iconRef="model_intent.switch_dimensions"
                  icon="icons/model_intent/switch_dimensions.svg"
-                 environments="part,asm,sheet"/>
+                 environments="workbench.part,workbench.assembly"/>
 </commands>
 
 </CommandsConfig>
diff --git a/Designer/Data/FunctionAreaConfig.xml b/Designer/Data/FunctionAreaConfig.xml
index 34b4e409..6f70b556 100644
--- a/Designer/Data/FunctionAreaConfig.xml
+++ b/Designer/Data/FunctionAreaConfig.xml
@@ -6,24 +6,29 @@
     <!-- ========================================================= -->
     <ribbons>
         <ribbon id="sd.part"
-                label="NX - Part Modeling"
-                workbench="Part"
+                label="SD - Part Modeling"
+                workbench="workbench.part"
                 defaultTab="tab_part_home"/>
 
         <ribbon id="sd.sketch"
-                label="NX - Sketch"
-                workbench="Sketch"
+                label="SD - Sketch"
+                workbench="workbench.sketch"
                 defaultTab="tab_sketch_home"/>
 
         <ribbon id="sd.asm"
-                label="NX - Assembly"
-                workbench="Assembly"
+                label="SD - Assembly"
+                workbench="workbench.sssembly"
                 defaultTab="tab_asm_home"/>
 
-        <ribbon id="sd.sheetMetal"
-                label="NX - Sheet Metal"
-                workbench="SheetMetal"
-                defaultTab="tab_sheet_home"/>
+        <ribbon id="sd.home"
+                label="SD - Home"
+                workbench="workbench.home"
+                defaultTab="tab_home"/>
+                
+        <ribbon id="sd.sheetmetal"
+                label="SD - SheetMetal"
+                workbench="workbench.part"
+                defaultTab="tab_sheetmetal_home"/>
     </ribbons>
 
     <!-- ========================================================= -->
@@ -31,6 +36,36 @@
     <!-- ========================================================= -->
     <ribbon-layouts>
 
+        <!-- ===================== Default Home ===================== -->
+        <layout ribbon="sd.home">
+
+            <!-- Tab: Default Home -->
+            <tab id="tab_home" label="Home" order="10">
+                <!-- Data -->
+                <group id="grp_home_data" label="Data" order="10">
+                    <control type="large-button" commandRef="file.new"    row="0" column="0" />
+                    <control type="large-button" commandRef="file.open"   row="0" column="1" />
+                    <control type="large-button" commandRef="data.openLastSession" row="0" column="2"/>
+                    <control type="large-button" commandRef="data.selectWorkingDirectory" row="0" column="3"/>
+                    <control type="large-button" commandRef="data.eraseNotDisplayed" row="0" column="4"/>
+                </group>
+
+                <!-- Settings -->
+                <group id="grp_home_setting" label="Settings" order="20">
+                    <control type="large-button" commandRef="settings.modelDisplay"      row="0" column="0"/>
+                    <control type="large-button" commandRef="settings.systemAppearance"  row="0" column="1"/>
+                </group>
+                
+                <!-- Utilities -->
+                <group id="grp_home_utilities" label="Utilities" order="30">
+                    <control type="large-button" commandRef="utilities.playTrailFile"   row="0" column="0"/>
+                    <control type="large-button" commandRef="utilities.auxApplication"  row="0" column="1"/>
+                </group>
+            </tab>
+        </layout>
+
+
+
         <!-- ===================== Part environment ===================== -->
         <layout ribbon="sd.part">
 
@@ -653,55 +688,67 @@
     <classic-menus>
 
         <!-- ===================== Menu bars per workbench ===================== -->
-
-        <!-- Part modeling classic menu bar -->
-        <menuBar id="nx.part.menuBar" workbench="Part" label="NX Part - Classic" order="10">
-            <menu id="menu_file"   label="File"   order="10"/>
-            <menu id="menu_edit"   label="Edit"   order="20"/>
-            <menu id="menu_view"   label="View"   order="30"/>
-            <menu id="menu_insert" label="Insert" order="40"/>
-            <menu id="menu_tools"  label="Tools"  order="50"/>
-            <menu id="menu_window" label="Window" order="60"/>
-            <menu id="menu_help"   label="Help"   order="70"/>
-        </menuBar>
-
-        <!-- Sketch environment classic menu bar -->
-        <menuBar id="nx.sketch.menuBar" workbench="Sketch" label="NX Sketch - Classic" order="20">
-            <menu id="menu_file"       label="File"        order="10"/>
-            <menu id="menu_edit"       label="Edit"        order="20"/>
-            <menu id="menu_sketch"     label="Sketch"      order="30"/>
-            <menu id="menu_dimension"  label="Dimensions"  order="40"/>
-            <menu id="menu_constraint" label="Constraints" order="50"/>
-            <menu id="menu_view"       label="View"        order="60"/>
-            <menu id="menu_tools"      label="Tools"       order="70"/>
-            <menu id="menu_window"     label="Window"      order="80"/>
-            <menu id="menu_help"       label="Help"        order="90"/>
-        </menuBar>
-
-        <!-- Assembly environment classic menu bar -->
-        <menuBar id="nx.asm.menuBar" workbench="Assembly" label="NX Assembly - Classic" order="30">
-            <menu id="menu_file"     label="File"     order="10"/>
-            <menu id="menu_edit"     label="Edit"     order="20"/>
-            <menu id="menu_assembly" label="Assembly" order="30"/>
-            <menu id="menu_insert"   label="Insert"   order="40"/>
-            <menu id="menu_view"     label="View"     order="50"/>
-            <menu id="menu_tools"    label="Tools"    order="60"/>
-            <menu id="menu_window"   label="Window"   order="70"/>
-            <menu id="menu_help"     label="Help"     order="80"/>
-        </menuBar>
-
-        <!-- Sheet metal environment classic menu bar -->
-        <menuBar id="nx.sheet.menuBar" workbench="SheetMetal" label="NX Sheet Metal - Classic" order="40">
-            <menu id="menu_file"       label="File"        order="10"/>
-            <menu id="menu_edit"       label="Edit"        order="20"/>
-            <menu id="menu_sheetMetal" label="Sheet Metal" order="30"/>
-            <menu id="menu_sketch"     label="Sketch"      order="40"/>
-            <menu id="menu_view"       label="View"        order="50"/>
-            <menu id="menu_tools"      label="Tools"       order="60"/>
-            <menu id="menu_window"     label="Window"      order="70"/>
-            <menu id="menu_help"       label="Help"        order="80"/>
-        </menuBar>
-
+        <menuBars>
+        
+            <!-- Default startup home classic menu bar -->
+            <menuBar id="sd.home.menuBar" workbench="workbench.home" label="SD Part - Classic" order="10">
+                <menu id="menu_file"   label="File"   order="10"/>
+                <menu id="menu_edit"   label="Edit"   order="20"/>
+                <menu id="menu_view"   label="View"   order="30"/>
+                <menu id="menu_insert" label="Insert" order="40"/>
+                <menu id="menu_tools"  label="Tools"  order="50"/>
+                <menu id="menu_window" label="Window" order="60"/>
+                <menu id="menu_help"   label="Help"   order="70"/>
+            </menuBar>
+        
+            <!-- Part modeling classic menu bar -->
+            <menuBar id="sd.part.menuBar" workbench="workbench.part" label="SD Part - Classic" order="10">
+                <menu id="menu_file"   label="File"   order="10"/>
+                <menu id="menu_edit"   label="Edit"   order="20"/>
+                <menu id="menu_view"   label="View"   order="30"/>
+                <menu id="menu_insert" label="Insert" order="40"/>
+                <menu id="menu_tools"  label="Tools"  order="50"/>
+                <menu id="menu_window" label="Window" order="60"/>
+                <menu id="menu_help"   label="Help"   order="70"/>
+            </menuBar>
+            
+            <!-- Sketch environment classic menu bar -->
+            <menuBar id="sd.sketch.menuBar" workbench="workbench.sketch" label="SD Sketch - Classic" order="20">
+                <menu id="menu_file"       label="File"        order="10"/>
+                <menu id="menu_edit"       label="Edit"        order="20"/>
+                <menu id="menu_sketch"     label="Sketch"      order="30"/>
+                <menu id="menu_dimension"  label="Dimensions"  order="40"/>
+                <menu id="menu_constraint" label="Constraints" order="50"/>
+                <menu id="menu_view"       label="View"        order="60"/>
+                <menu id="menu_tools"      label="Tools"       order="70"/>
+                <menu id="menu_window"     label="Window"      order="80"/>
+                <menu id="menu_help"       label="Help"        order="90"/>
+            </menuBar>
+            
+            <!-- Assembly environment classic menu bar -->
+            <menuBar id="sd.asm.menuBar" workbench="workbench.assembly" label="SD Assembly - Classic" order="30">
+                <menu id="menu_file"     label="File"     order="10"/>
+                <menu id="menu_edit"     label="Edit"     order="20"/>
+                <menu id="menu_assembly" label="Assembly" order="30"/>
+                <menu id="menu_insert"   label="Insert"   order="40"/>
+                <menu id="menu_view"     label="View"     order="50"/>
+                <menu id="menu_tools"    label="Tools"    order="60"/>
+                <menu id="menu_window"   label="Window"   order="70"/>
+                <menu id="menu_help"     label="Help"     order="80"/>
+            </menuBar>
+            
+            <!-- Sheet metal environment classic menu bar -->
+            <menuBar id="sd.sheet.menuBar" workbench="workbench.part" label="SD Sheet Metal - Classic" order="40">
+                <menu id="menu_file"       label="File"        order="10"/>
+                <menu id="menu_edit"       label="Edit"        order="20"/>
+                <menu id="menu_sheetMetal" label="Sheet Metal" order="30"/>
+                <menu id="menu_sketch"     label="Sketch"      order="40"/>
+                <menu id="menu_view"       label="View"        order="50"/>
+                <menu id="menu_tools"      label="Tools"       order="60"/>
+                <menu id="menu_window"     label="Window"      order="70"/>
+                <menu id="menu_help"       label="Help"        order="80"/>
+            </menuBar>
+        </menuBars>
         <!-- ===================== Menu definitions (shared) ===================== -->
         <menus>
 
diff --git a/Designer/Data/IconLibraryConfig.xml b/Designer/Data/IconLibraryConfig.xml
new file mode 100644
index 00000000..831ba289
--- /dev/null
+++ b/Designer/Data/IconLibraryConfig.xml
@@ -0,0 +1,1197 @@
+<?xml version="1.0" encoding="utf-8"?>
+<IconLibraryConfig version="1.0">
+    <icon-library id="global" qrcPrefix="">
+        <!-- ============================================================= -->
+        <!-- TitleBar / Window / QAT icons (explicit light/dark variants)  -->
+        <!-- ============================================================= -->
+        <icon id="app">
+            <theme name="light" svg=":/TitleBar/brand/light/app.svg" png16=":/TitleBar/brand/light/png/16/app.png" png32=":/TitleBar/brand/light/png/32/app.png" png48=":/TitleBar/brand/light/png/48/app.png" png64=":/TitleBar/brand/light/png/64/app.png"/>
+            <theme name="dark" svg=":/TitleBar/brand/dark/app.svg" png16=":/TitleBar/brand/dark/png/16/app.png" png32=":/TitleBar/brand/dark/png/32/app.png" png48=":/TitleBar/brand/dark/png/48/app.png" png64=":/TitleBar/brand/dark/png/64/app.png"/>
+        </icon>
+        <icon id="file.new">
+            <theme name="light" svg=":/TitleBar/quick/light/new.svg" png16=":/TitleBar/quick/light/png/16/new.png" png32=":/TitleBar/quick/light/png/32/new.png" png48=":/TitleBar/quick/light/png/48/new.png" png64=":/TitleBar/quick/light/png/64/new.png"/>
+            <theme name="dark" svg=":/TitleBar/quick/dark/new.svg" png16=":/TitleBar/quick/dark/png/16/new.png" png32=":/TitleBar/quick/dark/png/32/new.png" png48=":/TitleBar/quick/dark/png/48/new.png" png64=":/TitleBar/quick/dark/png/64/new.png"/>
+        </icon>
+        <icon id="file.open">
+            <theme name="light" svg=":/TitleBar/quick/light/open.svg" png16=":/TitleBar/quick/light/png/16/open.png" png32=":/TitleBar/quick/light/png/32/open.png" png48=":/TitleBar/quick/light/png/48/open.png" png64=":/TitleBar/quick/light/png/64/open.png"/>
+            <theme name="dark" svg=":/TitleBar/quick/dark/open.svg" png16=":/TitleBar/quick/dark/png/16/open.png" png32=":/TitleBar/quick/dark/png/32/open.png" png48=":/TitleBar/quick/dark/png/48/open.png" png64=":/TitleBar/quick/dark/png/64/open.png"/>
+        </icon>
+        <icon id="save">
+            <theme name="light" svg=":/TitleBar/quick/light/save.svg" png16=":/TitleBar/quick/light/png/16/save.png" png32=":/TitleBar/quick/light/png/32/save.png" png48=":/TitleBar/quick/light/png/48/save.png" png64=":/TitleBar/quick/light/png/64/save.png"/>
+            <theme name="dark" svg=":/TitleBar/quick/dark/save.svg" png16=":/TitleBar/quick/dark/png/16/save.png" png32=":/TitleBar/quick/dark/png/32/save.png" png48=":/TitleBar/quick/dark/png/48/save.png" png64=":/TitleBar/quick/dark/png/64/save.png"/>
+        </icon>
+        <icon id="undo">
+            <theme name="light" svg=":/TitleBar/quick/light/undo.svg" png16=":/TitleBar/quick/light/png/16/undo.png" png32=":/TitleBar/quick/light/png/32/undo.png" png48=":/TitleBar/quick/light/png/48/undo.png" png64=":/TitleBar/quick/light/png/64/undo.png"/>
+            <theme name="dark" svg=":/TitleBar/quick/dark/undo.svg" png16=":/TitleBar/quick/dark/png/16/undo.png" png32=":/TitleBar/quick/dark/png/32/undo.png" png48=":/TitleBar/quick/dark/png/48/undo.png" png64=":/TitleBar/quick/dark/png/64/undo.png"/>
+        </icon>
+        <icon id="redo">
+            <theme name="light" svg=":/TitleBar/quick/light/redo.svg" png16=":/TitleBar/quick/light/png/16/redo.png" png32=":/TitleBar/quick/light/png/32/redo.png" png48=":/TitleBar/quick/light/png/48/redo.png" png64=":/TitleBar/quick/light/png/64/redo.png"/>
+            <theme name="dark" svg=":/TitleBar/quick/dark/redo.svg" png16=":/TitleBar/quick/dark/png/16/redo.png" png32=":/TitleBar/quick/dark/png/32/redo.png" png48=":/TitleBar/quick/dark/png/48/redo.png" png64=":/TitleBar/quick/dark/png/64/redo.png"/>
+        </icon>
+        <icon id="regen">
+            <theme name="light" svg=":/TitleBar/quick/light/regen.svg" png16=":/TitleBar/quick/light/png/16/regenerate.png" png32=":/TitleBar/quick/light/png/32/regenerate.png" png48=":/TitleBar/quick/light/png/48/regenerate.png" png64=":/TitleBar/quick/light/png/64/regenerate.png"/>
+            <theme name="dark" svg=":/TitleBar/quick/dark/regen.svg" png16=":/TitleBar/quick/dark/png/16/regenerate.png" png32=":/TitleBar/quick/dark/png/32/regenerate.png" png48=":/TitleBar/quick/dark/png/48/regenerate.png" png64=":/TitleBar/quick/dark/png/64/regenerate.png"/>
+        </icon>
+        <icon id="windows">
+            <theme name="light" svg=":/TitleBar/quick/light/windows.svg" png16=":/TitleBar/quick/light/png/16/windows.png" png32=":/TitleBar/quick/light/png/32/windows.png" png48=":/TitleBar/quick/light/png/48/windows.png" png64=":/TitleBar/quick/light/png/64/windows.png"/>
+            <theme name="dark" svg=":/TitleBar/quick/dark/windows.svg" png16=":/TitleBar/quick/dark/png/16/windows.png" png32=":/TitleBar/quick/dark/png/32/windows.png" png48=":/TitleBar/quick/dark/png/48/windows.png" png64=":/TitleBar/quick/dark/png/64/windows.png"/>
+        </icon>
+        <icon id="qat">
+            <theme name="light" svg=":/TitleBar/quick/light/quickaccess.svg" png16=":/TitleBar/quick/light/png/16/dropdown.png" png32=":/TitleBar/quick/light/png/32/dropdown.png" png48=":/TitleBar/quick/light/png/48/dropdown.png" png64=":/TitleBar/quick/light/png/64/dropdown.png"/>
+            <theme name="dark" svg=":/TitleBar/quick/dark/quickaccess.svg" png16=":/TitleBar/quick/dark/png/16/dropdown.png" png32=":/TitleBar/quick/dark/png/32/dropdown.png" png48=":/TitleBar/quick/dark/png/48/dropdown.png" png64=":/TitleBar/quick/dark/png/64/dropdown.png"/>
+        </icon>
+        <icon id="minimize">
+            <theme name="light" svg=":/TitleBar/window/light/minimize.svg" png16=":/TitleBar/window/light/png/16/minimize.png" png32=":/TitleBar/window/light/png/32/minimize.png" png48=":/TitleBar/window/light/png/48/minimize.png" png64=":/TitleBar/window/light/png/64/minimize.png"/>
+            <theme name="dark" svg=":/TitleBar/window/dark/minimize.svg" png16=":/TitleBar/window/dark/png/16/minimize.png" png32=":/TitleBar/window/dark/png/32/minimize.png" png48=":/TitleBar/window/dark/png/48/minimize.png" png64=":/TitleBar/window/dark/png/64/minimize.png"/>
+        </icon>
+        <icon id="maximize">
+            <theme name="light" svg=":/TitleBar/window/light/maximize.svg" png16=":/TitleBar/window/light/png/16/maximize.png" png32=":/TitleBar/window/light/png/32/maximize.png" png48=":/TitleBar/window/light/png/48/maximize.png" png64=":/TitleBar/window/light/png/64/maximize.png"/>
+            <theme name="dark" svg=":/TitleBar/window/dark/maximize.svg" png16=":/TitleBar/window/dark/png/16/maximize.png" png32=":/TitleBar/window/dark/png/32/maximize.png" png48=":/TitleBar/window/dark/png/48/maximize.png" png64=":/TitleBar/window/dark/png/64/maximize.png"/>
+        </icon>
+        <icon id="restore">
+            <theme name="light" svg=":/TitleBar/window/light/restore.svg" png16=":/TitleBar/window/light/png/16/restore.png" png32=":/TitleBar/window/light/png/32/restore.png" png48=":/TitleBar/window/light/png/48/restore.png" png64=":/TitleBar/window/light/png/64/restore.png"/>
+            <theme name="dark" svg=":/TitleBar/window/dark/restore.svg" png16=":/TitleBar/window/dark/png/16/restore.png" png32=":/TitleBar/window/dark/png/32/restore.png" png48=":/TitleBar/window/dark/png/48/restore.png" png64=":/TitleBar/window/dark/png/64/restore.png"/>
+        </icon>
+        <icon id="close">
+            <theme name="light" svg=":/TitleBar/window/light/close.svg" png16=":/TitleBar/window/light/png/16/close.png" png32=":/TitleBar/window/light/png/32/close.png" png48=":/TitleBar/window/light/png/48/close.png" png64=":/TitleBar/window/light/png/64/close.png"/>
+            <theme name="dark" svg=":/TitleBar/window/dark/close.svg" png16=":/TitleBar/window/dark/png/16/close.png" png32=":/TitleBar/window/dark/png/32/close.png" png48=":/TitleBar/window/dark/png/48/close.png" png64=":/TitleBar/window/dark/png/64/close.png"/>
+        </icon>
+
+
+        <!-- ============================================================= -->
+        <!-- Home-Ribbon  -->
+        <!-- ============================================================= -->
+         <icon id="home.open_last_session">
+           <theme name="light" png16=":/Ribbon/home/data/light/png/16/open_last_session.png" png32=":/Ribbon/home/data/light/png/32/open_last_session.png" png48=":/Ribbon/home/data/light/png/48/open_last_session.png" png64=":/Ribbon/home/data/light/png/64/open_last_session.png"/>
+           <theme name="dark"  png16=":/Ribbon/home/data/dark/png/16/open_last_session.png" png32=":/Ribbon/home/data/dark/png/32/open_last_session.png" png48=":/Ribbon/home/data/dark/png/48/open_last_session.png" png64=":/Ribbon/home/data/dark/png/64/open_last_session.png"/>
+         </icon>
+         <icon id="home.select_working_directory">
+           <theme name="light" png16=":/Ribbon/home/data/light/png/16/select_working_directory.png" png32=":/Ribbon/home/data/light/png/32/select_working_directory.png" png48=":/Ribbon/home/data/light/png/48/select_working_directory.png" png64=":/Ribbon/home/data/light/png/64/select_working_directory.png"/>
+           <theme name="dark"  png16=":/Ribbon/home/data/dark/png/16/select_working_directory.png" png32=":/Ribbon/home/data/dark/png/32/select_working_directory.png" png48=":/Ribbon/home/data/dark/png/48/select_working_directory.png" png64=":/Ribbon/home/data/dark/png/64/select_working_directory.png"/>
+         </icon>
+         <icon id="home.erase_not_displayed">
+           <theme name="light" png16=":/Ribbon/home/data/light/png/16/erase_not_displayed.png" png32=":/Ribbon/home/data/light/png/32/erase_not_displayed.png" png48=":/Ribbon/home/data/light/png/48/erase_not_displayed.png" png64=":/Ribbon/home/data/light/png/64/erase_not_displayed.png"/>
+           <theme name="dark"  png16=":/Ribbon/home/data/dark/png/16/erase_not_displayed.png" png32=":/Ribbon/home/data/dark/png/32/erase_not_displayed.png" png48=":/Ribbon/home/data/dark/png/48/erase_not_displayed.png" png64=":/Ribbon/home/data/dark/png/64/erase_not_displayed.png"/>
+         </icon>
+         <icon id="home.model_display">
+           <theme name="light" png16=":/Ribbon/home/settings/light/png/16/model_display.png" png32=":/Ribbon/home/settings/light/png/32/model_display.png" png48=":/Ribbon/home/settings/light/png/48/model_display.png" png64=":/Ribbon/home/settings/light/png/64/model_display.png"/>
+           <theme name="dark"  png16=":/Ribbon/home/settings/dark/png/16/model_display.png" png32=":/Ribbon/home/settings/dark/png/32/model_display.png" png48=":/Ribbon/home/settings/dark/png/48/model_display.png" png64=":/Ribbon/home/settings/dark/png/64/model_display.png"/>
+         </icon>
+         <icon id="home.system_appearance">
+           <theme name="light" png16=":/Ribbon/home/settings/light/png/16/system_appearance.png" png32=":/Ribbon/home/settings/light/png/32/system_appearance.png" png48=":/Ribbon/home/settings/light/png/48/system_appearance.png" png64=":/Ribbon/home/settings/light/png/64/system_appearance.png"/>
+           <theme name="dark"  png16=":/Ribbon/home/settings/dark/png/16/system_appearance.png" png32=":/Ribbon/home/settings/dark/png/32/system_appearance.png" png48=":/Ribbon/home/settings/dark/png/48/system_appearance.png" png64=":/Ribbon/home/settings/dark/png/64/system_appearance.png"/>
+         </icon>
+         <icon id="home.play_trail_file">
+           <theme name="light" png16=":/Ribbon/home/utilities/light/png/16/play_trail_file.png" png32=":/Ribbon/home/utilities/light/png/32/play_trail_file.png" png48=":/Ribbon/home/utilities/light/png/48/play_trail_file.png" png64=":/Ribbon/home/utilities/light/png/64/play_trail_file.png"/>
+           <theme name="dark"  png16=":/Ribbon/home/utilities/dark/png/16/play_trail_file.png" png32=":/Ribbon/home/utilities/dark/png/32/play_trail_file.png" png48=":/Ribbon/home/utilities/dark/png/48/play_trail_file.png" png64=":/Ribbon/home/utilities/dark/png/64/play_trail_file.png"/>
+         </icon>
+         <icon id="home.aux_application">
+           <theme name="light" png16=":/Ribbon/home/utilities/light/png/16/auxiliary_applications.png" png32=":/Ribbon/home/utilities/light/png/32/auxiliary_applications.png" png48=":/Ribbon/home/utilities/light/png/48/auxiliary_applications.png" png64=":/Ribbon/home/utilities/light/png/64/auxiliary_applications.png"/>
+           <theme name="dark"  png16=":/Ribbon/home/utilities/dark/png/16/auxiliary_applications.png" png32=":/Ribbon/home/utilities/dark/png/32/auxiliary_applications.png" png48=":/Ribbon/home/utilities/dark/png/48/auxiliary_applications.png" png64=":/Ribbon/home/utilities/dark/png/64/auxiliary_applications.png"/>
+         </icon>
+
+        <!-- ============================================================= -->
+        <!-- Shared command icons (theme-agnostic; duplicated for both)     -->
+        <!-- ============================================================= -->
+        <icon id="analysis.body_check">
+            <theme name="light" svg="icons/analysis/body_check.svg"/>
+            <theme name="dark" svg="icons/analysis/body_check.svg"/>
+        </icon>
+        <icon id="analysis.interference">
+            <theme name="light" svg="icons/analysis/interference.svg"/>
+            <theme name="dark" svg="icons/analysis/interference.svg"/>
+        </icon>
+        <icon id="analysis.mass">
+            <theme name="light" svg="icons/analysis/mass.svg"/>
+            <theme name="dark" svg="icons/analysis/mass.svg"/>
+        </icon>
+        <icon id="app.assembly">
+            <theme name="light" svg="icons/app/assembly.svg"/>
+            <theme name="dark" svg="icons/app/assembly.svg"/>
+        </icon>
+        <icon id="app.bim">
+            <theme name="light" svg="icons/app/bim.svg"/>
+            <theme name="dark" svg="icons/app/bim.svg"/>
+        </icon>
+        <icon id="app.part_modeling">
+            <theme name="light" svg="icons/app/part_modeling.svg"/>
+            <theme name="dark" svg="icons/app/part_modeling.svg"/>
+        </icon>
+        <icon id="app.sheet_metal">
+            <theme name="light" svg="icons/app/sheet_metal.svg"/>
+            <theme name="dark" svg="icons/app/sheet_metal.svg"/>
+        </icon>
+        <icon id="app.ship">
+            <theme name="light" svg="icons/app/ship.svg"/>
+            <theme name="dark" svg="icons/app/ship.svg"/>
+        </icon>
+        <icon id="app.sketch">
+            <theme name="light" svg="icons/app/sketch.svg"/>
+            <theme name="dark" svg="icons/app/sketch.svg"/>
+        </icon>
+        <icon id="asm.add_component">
+            <theme name="light" svg="icons/asm/add_component.svg"/>
+            <theme name="dark" svg="icons/asm/add_component.svg"/>
+        </icon>
+        <icon id="asm.align">
+            <theme name="light" svg="icons/asm/align.svg"/>
+            <theme name="dark" svg="icons/asm/align.svg"/>
+        </icon>
+        <icon id="asm.arrange">
+            <theme name="light" svg="icons/asm/arrange.svg"/>
+            <theme name="dark" svg="icons/asm/arrange.svg"/>
+        </icon>
+        <icon id="asm.constraint">
+            <theme name="light" svg="icons/asm/constraint.svg"/>
+            <theme name="dark" svg="icons/asm/constraint.svg"/>
+        </icon>
+        <icon id="asm.distance">
+            <theme name="light" svg="icons/asm/distance.svg"/>
+            <theme name="dark" svg="icons/asm/distance.svg"/>
+        </icon>
+        <icon id="asm.explode">
+            <theme name="light" svg="icons/asm/explode.svg"/>
+            <theme name="dark" svg="icons/asm/explode.svg"/>
+        </icon>
+        <icon id="asm.mate">
+            <theme name="light" svg="icons/asm/mate.svg"/>
+            <theme name="dark" svg="icons/asm/mate.svg"/>
+        </icon>
+        <icon id="asm.new_component">
+            <theme name="light" svg="icons/asm/new_component.svg"/>
+            <theme name="dark" svg="icons/asm/new_component.svg"/>
+        </icon>
+        <icon id="asm.replace_component">
+            <theme name="light" svg="icons/asm/replace_component.svg"/>
+            <theme name="dark" svg="icons/asm/replace_component.svg"/>
+        </icon>
+        <icon id="asm.unexplode">
+            <theme name="light" svg="icons/asm/unexplode.svg"/>
+            <theme name="dark" svg="icons/asm/unexplode.svg"/>
+        </icon>
+        <icon id="curve.arc">
+            <theme name="light" svg="icons/curve/arc.svg"/>
+            <theme name="dark" svg="icons/curve/arc.svg"/>
+        </icon>
+        <icon id="curve.arc_3pt_tangent_end">
+            <theme name="light" svg="icons/curve/arc_3pt_tangent_end.svg"/>
+            <theme name="dark" svg="icons/curve/arc_3pt_tangent_end.svg"/>
+        </icon>
+        <icon id="curve.arc_3tangent">
+            <theme name="light" svg="icons/curve/arc_3tangent.svg"/>
+            <theme name="dark" svg="icons/curve/arc_3tangent.svg"/>
+        </icon>
+        <icon id="curve.arc_center_ends">
+            <theme name="light" svg="icons/curve/arc_center_ends.svg"/>
+            <theme name="dark" svg="icons/curve/arc_center_ends.svg"/>
+        </icon>
+        <icon id="curve.arc_concentric">
+            <theme name="light" svg="icons/curve/arc_concentric.svg"/>
+            <theme name="dark" svg="icons/curve/arc_concentric.svg"/>
+        </icon>
+        <icon id="curve.arc_conic">
+            <theme name="light" svg="icons/curve/arc_conic.svg"/>
+            <theme name="dark" svg="icons/curve/arc_conic.svg"/>
+        </icon>
+        <icon id="curve.centerline">
+            <theme name="light" svg="icons/curve/centerline.svg"/>
+            <theme name="dark" svg="icons/curve/centerline.svg"/>
+        </icon>
+        <icon id="curve.circle">
+            <theme name="light" svg="icons/curve/circle.svg"/>
+            <theme name="dark" svg="icons/curve/circle.svg"/>
+        </icon>
+        <icon id="curve.circle_3pt">
+            <theme name="light" svg="icons/curve/circle_3pt.svg"/>
+            <theme name="dark" svg="icons/curve/circle_3pt.svg"/>
+        </icon>
+        <icon id="curve.circle_3tangent">
+            <theme name="light" svg="icons/curve/circle_3tangent.svg"/>
+            <theme name="dark" svg="icons/curve/circle_3tangent.svg"/>
+        </icon>
+        <icon id="curve.circle_center_point">
+            <theme name="light" svg="icons/curve/circle_center_point.svg"/>
+            <theme name="dark" svg="icons/curve/circle_center_point.svg"/>
+        </icon>
+        <icon id="curve.circle_concentric">
+            <theme name="light" svg="icons/curve/circle_concentric.svg"/>
+            <theme name="dark" svg="icons/curve/circle_concentric.svg"/>
+        </icon>
+        <icon id="curve.ellipse">
+            <theme name="light" svg="icons/curve/ellipse.svg"/>
+            <theme name="dark" svg="icons/curve/ellipse.svg"/>
+        </icon>
+        <icon id="curve.ellipse_axis_ends">
+            <theme name="light" svg="icons/curve/ellipse_axis_ends.svg"/>
+            <theme name="dark" svg="icons/curve/ellipse_axis_ends.svg"/>
+        </icon>
+        <icon id="curve.ellipse_center_axis">
+            <theme name="light" svg="icons/curve/ellipse_center_axis.svg"/>
+            <theme name="dark" svg="icons/curve/ellipse_center_axis.svg"/>
+        </icon>
+        <icon id="curve.extend">
+            <theme name="light" svg="icons/curve/extend.svg"/>
+            <theme name="dark" svg="icons/curve/extend.svg"/>
+        </icon>
+        <icon id="curve.fillet">
+            <theme name="light" svg="icons/curve/fillet.svg"/>
+            <theme name="dark" svg="icons/curve/fillet.svg"/>
+        </icon>
+        <icon id="curve.fit_spline">
+            <theme name="light" svg="icons/curve/fit_spline.svg"/>
+            <theme name="dark" svg="icons/curve/fit_spline.svg"/>
+        </icon>
+        <icon id="curve.join">
+            <theme name="light" svg="icons/curve/join.svg"/>
+            <theme name="dark" svg="icons/curve/join.svg"/>
+        </icon>
+        <icon id="curve.line">
+            <theme name="light" svg="icons/curve/line.svg"/>
+            <theme name="dark" svg="icons/curve/line.svg"/>
+        </icon>
+        <icon id="curve.offset">
+            <theme name="light" svg="icons/curve/offset.svg"/>
+            <theme name="dark" svg="icons/curve/offset.svg"/>
+        </icon>
+        <icon id="curve.parallelogram">
+            <theme name="light" svg="icons/curve/parallelogram.svg"/>
+            <theme name="dark" svg="icons/curve/parallelogram.svg"/>
+        </icon>
+        <icon id="curve.point">
+            <theme name="light" svg="icons/curve/point.svg"/>
+            <theme name="dark" svg="icons/curve/point.svg"/>
+        </icon>
+        <icon id="curve.rect_center">
+            <theme name="light" svg="icons/curve/rect_center.svg"/>
+            <theme name="dark" svg="icons/curve/rect_center.svg"/>
+        </icon>
+        <icon id="curve.rect_corner">
+            <theme name="light" svg="icons/curve/rect_corner.svg"/>
+            <theme name="dark" svg="icons/curve/rect_corner.svg"/>
+        </icon>
+        <icon id="curve.rect_slanted">
+            <theme name="light" svg="icons/curve/rect_slanted.svg"/>
+            <theme name="dark" svg="icons/curve/rect_slanted.svg"/>
+        </icon>
+        <icon id="curve.rectangle">
+            <theme name="light" svg="icons/curve/rectangle.svg"/>
+            <theme name="dark" svg="icons/curve/rectangle.svg"/>
+        </icon>
+        <icon id="curve.spline_through">
+            <theme name="light" svg="icons/curve/spline_through.svg"/>
+            <theme name="dark" svg="icons/curve/spline_through.svg"/>
+        </icon>
+        <icon id="curve.studio_spline">
+            <theme name="light" svg="icons/curve/studio_spline.svg"/>
+            <theme name="dark" svg="icons/curve/studio_spline.svg"/>
+        </icon>
+        <icon id="curve.trim">
+            <theme name="light" svg="icons/curve/trim.svg"/>
+            <theme name="dark" svg="icons/curve/trim.svg"/>
+        </icon>
+        <icon id="datum.axis">
+            <theme name="light" svg="icons/datum/axis.svg"/>
+            <theme name="dark" svg="icons/datum/axis.svg"/>
+        </icon>
+        <icon id="datum.cs">
+            <theme name="light" svg="icons/datum/cs.svg"/>
+            <theme name="dark" svg="icons/datum/cs.svg"/>
+        </icon>
+        <icon id="datum.curve">
+            <theme name="light" svg="icons/datum/curve.svg"/>
+            <theme name="dark" svg="icons/datum/curve.svg"/>
+        </icon>
+        <icon id="datum.default_cs">
+            <theme name="light" svg="icons/datum/default_cs.svg"/>
+            <theme name="dark" svg="icons/datum/default_cs.svg"/>
+        </icon>
+        <icon id="datum.graph">
+            <theme name="light" svg="icons/datum/graph.svg"/>
+            <theme name="dark" svg="icons/datum/graph.svg"/>
+        </icon>
+        <icon id="datum.offset_planes">
+            <theme name="light" svg="icons/datum/offset_planes.svg"/>
+            <theme name="dark" svg="icons/datum/offset_planes.svg"/>
+        </icon>
+        <icon id="datum.plane">
+            <theme name="light" svg="icons/datum/plane.svg"/>
+            <theme name="dark" svg="icons/datum/plane.svg"/>
+        </icon>
+        <icon id="datum.point">
+            <theme name="light" svg="icons/datum/point.svg"/>
+            <theme name="dark" svg="icons/datum/point.svg"/>
+        </icon>
+        <icon id="datum.reference">
+            <theme name="light" svg="icons/datum/reference.svg"/>
+            <theme name="dark" svg="icons/datum/reference.svg"/>
+        </icon>
+        <icon id="datum.ribbon">
+            <theme name="light" svg="icons/datum/ribbon.svg"/>
+            <theme name="dark" svg="icons/datum/ribbon.svg"/>
+        </icon>
+        <icon id="display.hidden_line">
+            <theme name="light" svg="icons/display/hidden_line.svg"/>
+            <theme name="dark" svg="icons/display/hidden_line.svg"/>
+        </icon>
+        <icon id="display.hide">
+            <theme name="light" svg="icons/display/hide.svg"/>
+            <theme name="dark" svg="icons/display/hide.svg"/>
+        </icon>
+        <icon id="display.isolate">
+            <theme name="light" svg="icons/display/isolate.svg"/>
+            <theme name="dark" svg="icons/display/isolate.svg"/>
+        </icon>
+        <icon id="display.shaded">
+            <theme name="light" svg="icons/display/shaded.svg"/>
+            <theme name="dark" svg="icons/display/shaded.svg"/>
+        </icon>
+        <icon id="display.shaded_edges">
+            <theme name="light" svg="icons/display/shaded_edges.svg"/>
+            <theme name="dark" svg="icons/display/shaded_edges.svg"/>
+        </icon>
+        <icon id="display.show">
+            <theme name="light" svg="icons/display/show.svg"/>
+            <theme name="dark" svg="icons/display/show.svg"/>
+        </icon>
+        <icon id="display.wireframe">
+            <theme name="light" svg="icons/display/wireframe.svg"/>
+            <theme name="dark" svg="icons/display/wireframe.svg"/>
+        </icon>
+        <icon id="edit.copy">
+            <theme name="light" svg="icons/edit/copy.svg"/>
+            <theme name="dark" svg="icons/edit/copy.svg"/>
+        </icon>
+        <icon id="edit.cut">
+            <theme name="light" svg="icons/edit/cut.svg"/>
+            <theme name="dark" svg="icons/edit/cut.svg"/>
+        </icon>
+        <icon id="edit.delete">
+            <theme name="light" svg="icons/edit/delete.svg"/>
+            <theme name="dark" svg="icons/edit/delete.svg"/>
+        </icon>
+        <icon id="edit.paste">
+            <theme name="light" svg="icons/edit/paste.svg"/>
+            <theme name="dark" svg="icons/edit/paste.svg"/>
+        </icon>
+        <icon id="edit.redo">
+            <theme name="light" svg="icons/edit/redo.svg"/>
+            <theme name="dark" svg="icons/edit/redo.svg"/>
+        </icon>
+        <icon id="edit.select_all">
+            <theme name="light" svg="icons/edit/select_all.svg"/>
+            <theme name="dark" svg="icons/edit/select_all.svg"/>
+        </icon>
+        <icon id="edit.undo">
+            <theme name="light" svg="icons/edit/undo.svg"/>
+            <theme name="dark" svg="icons/edit/undo.svg"/>
+        </icon>
+        <icon id="file.close">
+            <theme name="light" svg="icons/file/close.svg"/>
+            <theme name="dark" svg="icons/file/close.svg"/>
+        </icon>
+        <icon id="file.exit">
+            <theme name="light" svg="icons/file/exit.svg"/>
+            <theme name="dark" svg="icons/file/exit.svg"/>
+        </icon>
+        <icon id="file.save">
+            <theme name="light" svg="icons/file/save.svg"/>
+            <theme name="dark" svg="icons/file/save.svg"/>
+        </icon>
+        <icon id="file.save_as">
+            <theme name="light" svg="icons/file/save_as.svg"/>
+            <theme name="dark" svg="icons/file/save_as.svg"/>
+        </icon>
+        <icon id="gc.check_update">
+            <theme name="light" svg="icons/gc/check_update.svg"/>
+            <theme name="dark" svg="icons/gc/check_update.svg"/>
+        </icon>
+        <icon id="gc.settings">
+            <theme name="light" svg="icons/gc/settings.svg"/>
+            <theme name="dark" svg="icons/gc/settings.svg"/>
+        </icon>
+        <icon id="gc.std_part_library">
+            <theme name="light" svg="icons/gc/std_part_library.svg"/>
+            <theme name="dark" svg="icons/gc/std_part_library.svg"/>
+        </icon>
+        <icon id="help.about">
+            <theme name="light" svg="icons/help/about.svg"/>
+            <theme name="dark" svg="icons/help/about.svg"/>
+        </icon>
+        <icon id="help.contents">
+            <theme name="light" svg="icons/help/contents.svg"/>
+            <theme name="dark" svg="icons/help/contents.svg"/>
+        </icon>
+        <icon id="measure.angle">
+            <theme name="light" svg="icons/measure/angle.svg"/>
+            <theme name="dark" svg="icons/measure/angle.svg"/>
+        </icon>
+        <icon id="measure.dialog">
+            <theme name="light" svg="icons/measure/dialog.svg"/>
+            <theme name="dark" svg="icons/measure/dialog.svg"/>
+        </icon>
+        <icon id="measure.distance">
+            <theme name="light" svg="icons/measure/distance.svg"/>
+            <theme name="dark" svg="icons/measure/distance.svg"/>
+        </icon>
+        <icon id="measure.draft">
+            <theme name="light" svg="icons/measure/draft.svg"/>
+            <theme name="dark" svg="icons/measure/draft.svg"/>
+        </icon>
+        <icon id="measure.mass_props">
+            <theme name="light" svg="icons/measure/mass_props.svg"/>
+            <theme name="dark" svg="icons/measure/mass_props.svg"/>
+        </icon>
+        <icon id="measure.radius">
+            <theme name="light" svg="icons/measure/radius.svg"/>
+            <theme name="dark" svg="icons/measure/radius.svg"/>
+        </icon>
+        <icon id="measure.section">
+            <theme name="light" svg="icons/measure/section.svg"/>
+            <theme name="dark" svg="icons/measure/section.svg"/>
+        </icon>
+        <icon id="model.auto_round">
+            <theme name="light" svg="icons/model/auto_round.svg"/>
+            <theme name="dark" svg="icons/model/auto_round.svg"/>
+        </icon>
+        <icon id="model.blend">
+            <theme name="light" svg="icons/model/blend.svg"/>
+            <theme name="dark" svg="icons/model/blend.svg"/>
+        </icon>
+        <icon id="model.chamfer">
+            <theme name="light" svg="icons/model/chamfer.svg"/>
+            <theme name="dark" svg="icons/model/chamfer.svg"/>
+        </icon>
+        <icon id="model.collapse">
+            <theme name="light" svg="icons/model/collapse.svg"/>
+            <theme name="dark" svg="icons/model/collapse.svg"/>
+        </icon>
+        <icon id="model.copy_from">
+            <theme name="light" svg="icons/model/copy_from.svg"/>
+            <theme name="dark" svg="icons/model/copy_from.svg"/>
+        </icon>
+        <icon id="model.copy_geometry">
+            <theme name="light" svg="icons/model/copy_geometry.svg"/>
+            <theme name="dark" svg="icons/model/copy_geometry.svg"/>
+        </icon>
+        <icon id="model.corner_chamfer">
+            <theme name="light" svg="icons/model/corner_chamfer.svg"/>
+            <theme name="dark" svg="icons/model/corner_chamfer.svg"/>
+        </icon>
+        <icon id="model.cosmetic_groove">
+            <theme name="light" svg="icons/model/cosmetic_groove.svg"/>
+            <theme name="dark" svg="icons/model/cosmetic_groove.svg"/>
+        </icon>
+        <icon id="model.cosmetic_sketch">
+            <theme name="light" svg="icons/model/cosmetic_sketch.svg"/>
+            <theme name="dark" svg="icons/model/cosmetic_sketch.svg"/>
+        </icon>
+        <icon id="model.cosmetic_thread">
+            <theme name="light" svg="icons/model/cosmetic_thread.svg"/>
+            <theme name="dark" svg="icons/model/cosmetic_thread.svg"/>
+        </icon>
+        <icon id="model.delete">
+            <theme name="light" svg="icons/model/delete.svg"/>
+            <theme name="dark" svg="icons/model/delete.svg"/>
+        </icon>
+        <icon id="model.designated_area">
+            <theme name="light" svg="icons/model/designated_area.svg"/>
+            <theme name="dark" svg="icons/model/designated_area.svg"/>
+        </icon>
+        <icon id="model.draft">
+            <theme name="light" svg="icons/model/draft.svg"/>
+            <theme name="dark" svg="icons/model/draft.svg"/>
+        </icon>
+        <icon id="model.ecad_area">
+            <theme name="light" svg="icons/model/ecad_area.svg"/>
+            <theme name="dark" svg="icons/model/ecad_area.svg"/>
+        </icon>
+        <icon id="model.edge_chamfer">
+            <theme name="light" svg="icons/model/edge_chamfer.svg"/>
+            <theme name="dark" svg="icons/model/edge_chamfer.svg"/>
+        </icon>
+        <icon id="model.extend">
+            <theme name="light" svg="icons/model/extend.svg"/>
+            <theme name="dark" svg="icons/model/extend.svg"/>
+        </icon>
+        <icon id="model.extrude">
+            <theme name="light" svg="icons/model/extrude.svg"/>
+            <theme name="dark" svg="icons/model/extrude.svg"/>
+        </icon>
+        <icon id="model.feature_delete">
+            <theme name="light" svg="icons/model/feature_delete.svg"/>
+            <theme name="dark" svg="icons/model/feature_delete.svg"/>
+        </icon>
+        <icon id="model.feature_suppress">
+            <theme name="light" svg="icons/model/feature_suppress.svg"/>
+            <theme name="dark" svg="icons/model/feature_suppress.svg"/>
+        </icon>
+        <icon id="model.feature_unsuppress">
+            <theme name="light" svg="icons/model/feature_unsuppress.svg"/>
+            <theme name="dark" svg="icons/model/feature_unsuppress.svg"/>
+        </icon>
+        <icon id="model.flip_normal">
+            <theme name="light" svg="icons/model/flip_normal.svg"/>
+            <theme name="dark" svg="icons/model/flip_normal.svg"/>
+        </icon>
+        <icon id="model.geometry_pattern">
+            <theme name="light" svg="icons/model/geometry_pattern.svg"/>
+            <theme name="dark" svg="icons/model/geometry_pattern.svg"/>
+        </icon>
+        <icon id="model.helical_sweep">
+            <theme name="light" svg="icons/model/helical_sweep.svg"/>
+            <theme name="dark" svg="icons/model/helical_sweep.svg"/>
+        </icon>
+        <icon id="model.hole">
+            <theme name="light" svg="icons/model/hole.svg"/>
+            <theme name="dark" svg="icons/model/hole.svg"/>
+        </icon>
+        <icon id="model.import">
+            <theme name="light" svg="icons/model/import.svg"/>
+            <theme name="dark" svg="icons/model/import.svg"/>
+        </icon>
+        <icon id="model.independent_geometry">
+            <theme name="light" svg="icons/model/independent_geometry.svg"/>
+            <theme name="dark" svg="icons/model/independent_geometry.svg"/>
+        </icon>
+        <icon id="model.intersect">
+            <theme name="light" svg="icons/model/intersect.svg"/>
+            <theme name="dark" svg="icons/model/intersect.svg"/>
+        </icon>
+        <icon id="model.lattice">
+            <theme name="light" svg="icons/model/lattice.svg"/>
+            <theme name="dark" svg="icons/model/lattice.svg"/>
+        </icon>
+        <icon id="model.layout_feature">
+            <theme name="light" svg="icons/model/layout_feature.svg"/>
+            <theme name="dark" svg="icons/model/layout_feature.svg"/>
+        </icon>
+        <icon id="model.merge">
+            <theme name="light" svg="icons/model/merge.svg"/>
+            <theme name="dark" svg="icons/model/merge.svg"/>
+        </icon>
+        <icon id="model.merge_inheritance">
+            <theme name="light" svg="icons/model/merge_inheritance.svg"/>
+            <theme name="dark" svg="icons/model/merge_inheritance.svg"/>
+        </icon>
+        <icon id="model.mirror">
+            <theme name="light" svg="icons/model/mirror.svg"/>
+            <theme name="dark" svg="icons/model/mirror.svg"/>
+        </icon>
+        <icon id="model.offset">
+            <theme name="light" svg="icons/model/offset.svg"/>
+            <theme name="dark" svg="icons/model/offset.svg"/>
+        </icon>
+        <icon id="model.pattern">
+            <theme name="light" svg="icons/model/pattern.svg"/>
+            <theme name="dark" svg="icons/model/pattern.svg"/>
+        </icon>
+        <icon id="model.pattern_table">
+            <theme name="light" svg="icons/model/pattern_table.svg"/>
+            <theme name="dark" svg="icons/model/pattern_table.svg"/>
+        </icon>
+        <icon id="model.profile_rib">
+            <theme name="light" svg="icons/model/profile_rib.svg"/>
+            <theme name="dark" svg="icons/model/profile_rib.svg"/>
+        </icon>
+        <icon id="model.project">
+            <theme name="light" svg="icons/model/project.svg"/>
+            <theme name="dark" svg="icons/model/project.svg"/>
+        </icon>
+        <icon id="model.project_remove">
+            <theme name="light" svg="icons/model/project_remove.svg"/>
+            <theme name="dark" svg="icons/model/project_remove.svg"/>
+        </icon>
+        <icon id="model.regenerate">
+            <theme name="light" svg="icons/model/regenerate.svg"/>
+            <theme name="dark" svg="icons/model/regenerate.svg"/>
+        </icon>
+        <icon id="model.revolve">
+            <theme name="light" svg="icons/model/revolve.svg"/>
+            <theme name="dark" svg="icons/model/revolve.svg"/>
+        </icon>
+        <icon id="model.rib">
+            <theme name="light" svg="icons/model/rib.svg"/>
+            <theme name="dark" svg="icons/model/rib.svg"/>
+        </icon>
+        <icon id="model.rotational_blend">
+            <theme name="light" svg="icons/model/rotational_blend.svg"/>
+            <theme name="dark" svg="icons/model/rotational_blend.svg"/>
+        </icon>
+        <icon id="model.round">
+            <theme name="light" svg="icons/model/round.svg"/>
+            <theme name="dark" svg="icons/model/round.svg"/>
+        </icon>
+        <icon id="model.shell">
+            <theme name="light" svg="icons/model/shell.svg"/>
+            <theme name="dark" svg="icons/model/shell.svg"/>
+        </icon>
+        <icon id="model.shrinkwrap">
+            <theme name="light" svg="icons/model/shrinkwrap.svg"/>
+            <theme name="dark" svg="icons/model/shrinkwrap.svg"/>
+        </icon>
+        <icon id="model.solidify">
+            <theme name="light" svg="icons/model/solidify.svg"/>
+            <theme name="dark" svg="icons/model/solidify.svg"/>
+        </icon>
+        <icon id="model.spiral_bend">
+            <theme name="light" svg="icons/model/spiral_bend.svg"/>
+            <theme name="dark" svg="icons/model/spiral_bend.svg"/>
+        </icon>
+        <icon id="model.split_surface">
+            <theme name="light" svg="icons/model/split_surface.svg"/>
+            <theme name="dark" svg="icons/model/split_surface.svg"/>
+        </icon>
+        <icon id="model.sweep">
+            <theme name="light" svg="icons/model/sweep.svg"/>
+            <theme name="dark" svg="icons/model/sweep.svg"/>
+        </icon>
+        <icon id="model.sweep_blend">
+            <theme name="light" svg="icons/model/sweep_blend.svg"/>
+            <theme name="dark" svg="icons/model/sweep_blend.svg"/>
+        </icon>
+        <icon id="model.thicken">
+            <theme name="light" svg="icons/model/thicken.svg"/>
+            <theme name="dark" svg="icons/model/thicken.svg"/>
+        </icon>
+        <icon id="model.toroidal_bend">
+            <theme name="light" svg="icons/model/toroidal_bend.svg"/>
+            <theme name="dark" svg="icons/model/toroidal_bend.svg"/>
+        </icon>
+        <icon id="model.trajectory_rib">
+            <theme name="light" svg="icons/model/trajectory_rib.svg"/>
+            <theme name="dark" svg="icons/model/trajectory_rib.svg"/>
+        </icon>
+        <icon id="model.trim">
+            <theme name="light" svg="icons/model/trim.svg"/>
+            <theme name="dark" svg="icons/model/trim.svg"/>
+        </icon>
+        <icon id="model.user_defined_feature">
+            <theme name="light" svg="icons/model/user_defined_feature.svg"/>
+            <theme name="dark" svg="icons/model/user_defined_feature.svg"/>
+        </icon>
+        <icon id="model.variable_pull_draft">
+            <theme name="light" svg="icons/model/variable_pull_draft.svg"/>
+            <theme name="dark" svg="icons/model/variable_pull_draft.svg"/>
+        </icon>
+        <icon id="model.volume_helical_sweep">
+            <theme name="light" svg="icons/model/volume_helical_sweep.svg"/>
+            <theme name="dark" svg="icons/model/volume_helical_sweep.svg"/>
+        </icon>
+        <icon id="model.wrap">
+            <theme name="light" svg="icons/model/wrap.svg"/>
+            <theme name="dark" svg="icons/model/wrap.svg"/>
+        </icon>
+        <icon id="model_intent.component_interface">
+            <theme name="light" svg="icons/model_intent/component_interface.svg"/>
+            <theme name="dark" svg="icons/model_intent/component_interface.svg"/>
+        </icon>
+        <icon id="model_intent.family_table">
+            <theme name="light" svg="icons/model_intent/family_table.svg"/>
+            <theme name="dark" svg="icons/model_intent/family_table.svg"/>
+        </icon>
+        <icon id="model_intent.parameters">
+            <theme name="light" svg="icons/model_intent/parameters.svg"/>
+            <theme name="dark" svg="icons/model_intent/parameters.svg"/>
+        </icon>
+        <icon id="model_intent.publish_geometry">
+            <theme name="light" svg="icons/model_intent/publish_geometry.svg"/>
+            <theme name="dark" svg="icons/model_intent/publish_geometry.svg"/>
+        </icon>
+        <icon id="model_intent.switch_dimensions">
+            <theme name="light" svg="icons/model_intent/switch_dimensions.svg"/>
+            <theme name="dark" svg="icons/model_intent/switch_dimensions.svg"/>
+        </icon>
+        <icon id="select.filter">
+            <theme name="light" svg="icons/select/filter.svg"/>
+            <theme name="dark" svg="icons/select/filter.svg"/>
+        </icon>
+        <icon id="select.lasso">
+            <theme name="light" svg="icons/select/lasso.svg"/>
+            <theme name="dark" svg="icons/select/lasso.svg"/>
+        </icon>
+        <icon id="select.rectangle">
+            <theme name="light" svg="icons/select/rectangle.svg"/>
+            <theme name="dark" svg="icons/select/rectangle.svg"/>
+        </icon>
+        <icon id="select.select">
+            <theme name="light" svg="icons/select/select.svg"/>
+            <theme name="dark" svg="icons/select/select.svg"/>
+        </icon>
+        <icon id="select.single">
+            <theme name="light" svg="icons/select/single.svg"/>
+            <theme name="dark" svg="icons/select/single.svg"/>
+        </icon>
+        <icon id="sheet.base_flange">
+            <theme name="light" svg="icons/sheet/base_flange.svg"/>
+            <theme name="dark" svg="icons/sheet/base_flange.svg"/>
+        </icon>
+        <icon id="sheet.bend">
+            <theme name="light" svg="icons/sheet/bend.svg"/>
+            <theme name="dark" svg="icons/sheet/bend.svg"/>
+        </icon>
+        <icon id="sheet.break_corner">
+            <theme name="light" svg="icons/sheet/break_corner.svg"/>
+            <theme name="dark" svg="icons/sheet/break_corner.svg"/>
+        </icon>
+        <icon id="sheet.contour_flange">
+            <theme name="light" svg="icons/sheet/contour_flange.svg"/>
+            <theme name="dark" svg="icons/sheet/contour_flange.svg"/>
+        </icon>
+        <icon id="sheet.corner_relief">
+            <theme name="light" svg="icons/sheet/corner_relief.svg"/>
+            <theme name="dark" svg="icons/sheet/corner_relief.svg"/>
+        </icon>
+        <icon id="sheet.cutout">
+            <theme name="light" svg="icons/sheet/cutout.svg"/>
+            <theme name="dark" svg="icons/sheet/cutout.svg"/>
+        </icon>
+        <icon id="sheet.edge_flange">
+            <theme name="light" svg="icons/sheet/edge_flange.svg"/>
+            <theme name="dark" svg="icons/sheet/edge_flange.svg"/>
+        </icon>
+        <icon id="sheet.export_flat">
+            <theme name="light" svg="icons/sheet/export_flat.svg"/>
+            <theme name="dark" svg="icons/sheet/export_flat.svg"/>
+        </icon>
+        <icon id="sheet.flatten">
+            <theme name="light" svg="icons/sheet/flatten.svg"/>
+            <theme name="dark" svg="icons/sheet/flatten.svg"/>
+        </icon>
+        <icon id="sheet.hole">
+            <theme name="light" svg="icons/sheet/hole.svg"/>
+            <theme name="dark" svg="icons/sheet/hole.svg"/>
+        </icon>
+        <icon id="sheet.jog">
+            <theme name="light" svg="icons/sheet/jog.svg"/>
+            <theme name="dark" svg="icons/sheet/jog.svg"/>
+        </icon>
+        <icon id="sheet.lofted_flange">
+            <theme name="light" svg="icons/sheet/lofted_flange.svg"/>
+            <theme name="dark" svg="icons/sheet/lofted_flange.svg"/>
+        </icon>
+        <icon id="sheet.rebend">
+            <theme name="light" svg="icons/sheet/rebend.svg"/>
+            <theme name="dark" svg="icons/sheet/rebend.svg"/>
+        </icon>
+        <icon id="sheet.tab">
+            <theme name="light" svg="icons/sheet/tab.svg"/>
+            <theme name="dark" svg="icons/sheet/tab.svg"/>
+        </icon>
+        <icon id="sheet.unbend">
+            <theme name="light" svg="icons/sheet/unbend.svg"/>
+            <theme name="dark" svg="icons/sheet/unbend.svg"/>
+        </icon>
+        <icon id="sketch.chamfer">
+            <theme name="light" svg="icons/sketch/chamfer.svg"/>
+            <theme name="dark" svg="icons/sketch/chamfer.svg"/>
+        </icon>
+        <icon id="sketch.chamfer_trim">
+            <theme name="light" svg="icons/sketch/chamfer_trim.svg"/>
+            <theme name="dark" svg="icons/sketch/chamfer_trim.svg"/>
+        </icon>
+        <icon id="sketch.constr_coincident">
+            <theme name="light" svg="icons/sketch/constr_coincident.svg"/>
+            <theme name="dark" svg="icons/sketch/constr_coincident.svg"/>
+        </icon>
+        <icon id="sketch.constr_equal">
+            <theme name="light" svg="icons/sketch/constr_equal.svg"/>
+            <theme name="dark" svg="icons/sketch/constr_equal.svg"/>
+        </icon>
+        <icon id="sketch.constr_fix">
+            <theme name="light" svg="icons/sketch/constr_fix.svg"/>
+            <theme name="dark" svg="icons/sketch/constr_fix.svg"/>
+        </icon>
+        <icon id="sketch.constr_horizontal">
+            <theme name="light" svg="icons/sketch/constr_horizontal.svg"/>
+            <theme name="dark" svg="icons/sketch/constr_horizontal.svg"/>
+        </icon>
+        <icon id="sketch.constr_midpoint">
+            <theme name="light" svg="icons/sketch/constr_midpoint.svg"/>
+            <theme name="dark" svg="icons/sketch/constr_midpoint.svg"/>
+        </icon>
+        <icon id="sketch.constr_parallel">
+            <theme name="light" svg="icons/sketch/constr_parallel.svg"/>
+            <theme name="dark" svg="icons/sketch/constr_parallel.svg"/>
+        </icon>
+        <icon id="sketch.constr_perp">
+            <theme name="light" svg="icons/sketch/constr_perp.svg"/>
+            <theme name="dark" svg="icons/sketch/constr_perp.svg"/>
+        </icon>
+        <icon id="sketch.constr_symmetric">
+            <theme name="light" svg="icons/sketch/constr_symmetric.svg"/>
+            <theme name="dark" svg="icons/sketch/constr_symmetric.svg"/>
+        </icon>
+        <icon id="sketch.constr_tangent">
+            <theme name="light" svg="icons/sketch/constr_tangent.svg"/>
+            <theme name="dark" svg="icons/sketch/constr_tangent.svg"/>
+        </icon>
+        <icon id="sketch.constr_vertical">
+            <theme name="light" svg="icons/sketch/constr_vertical.svg"/>
+            <theme name="dark" svg="icons/sketch/constr_vertical.svg"/>
+        </icon>
+        <icon id="sketch.construction">
+            <theme name="light" svg="icons/sketch/construction.svg"/>
+            <theme name="dark" svg="icons/sketch/construction.svg"/>
+        </icon>
+        <icon id="sketch.convert_to">
+            <theme name="light" svg="icons/sketch/convert_to.svg"/>
+            <theme name="dark" svg="icons/sketch/convert_to.svg"/>
+        </icon>
+        <icon id="sketch.corner">
+            <theme name="light" svg="icons/sketch/corner.svg"/>
+            <theme name="dark" svg="icons/sketch/corner.svg"/>
+        </icon>
+        <icon id="sketch.delete">
+            <theme name="light" svg="icons/sketch/delete.svg"/>
+            <theme name="dark" svg="icons/sketch/delete.svg"/>
+        </icon>
+        <icon id="sketch.delete_segment">
+            <theme name="light" svg="icons/sketch/delete_segment.svg"/>
+            <theme name="dark" svg="icons/sketch/delete_segment.svg"/>
+        </icon>
+        <icon id="sketch.dim_angle">
+            <theme name="light" svg="icons/sketch/dim_angle.svg"/>
+            <theme name="dark" svg="icons/sketch/dim_angle.svg"/>
+        </icon>
+        <icon id="sketch.dim_baseline">
+            <theme name="light" svg="icons/sketch/dim_baseline.svg"/>
+            <theme name="dark" svg="icons/sketch/dim_baseline.svg"/>
+        </icon>
+        <icon id="sketch.dim_diameter">
+            <theme name="light" svg="icons/sketch/dim_diameter.svg"/>
+            <theme name="dark" svg="icons/sketch/dim_diameter.svg"/>
+        </icon>
+        <icon id="sketch.dim_horizontal">
+            <theme name="light" svg="icons/sketch/dim_horizontal.svg"/>
+            <theme name="dark" svg="icons/sketch/dim_horizontal.svg"/>
+        </icon>
+        <icon id="sketch.dim_perimeter">
+            <theme name="light" svg="icons/sketch/dim_perimeter.svg"/>
+            <theme name="dark" svg="icons/sketch/dim_perimeter.svg"/>
+        </icon>
+        <icon id="sketch.dim_radius">
+            <theme name="light" svg="icons/sketch/dim_radius.svg"/>
+            <theme name="dark" svg="icons/sketch/dim_radius.svg"/>
+        </icon>
+        <icon id="sketch.dim_reference">
+            <theme name="light" svg="icons/sketch/dim_reference.svg"/>
+            <theme name="dark" svg="icons/sketch/dim_reference.svg"/>
+        </icon>
+        <icon id="sketch.dim_smart">
+            <theme name="light" svg="icons/sketch/dim_smart.svg"/>
+            <theme name="dark" svg="icons/sketch/dim_smart.svg"/>
+        </icon>
+        <icon id="sketch.dim_vertical">
+            <theme name="light" svg="icons/sketch/dim_vertical.svg"/>
+            <theme name="dark" svg="icons/sketch/dim_vertical.svg"/>
+        </icon>
+        <icon id="sketch.display_constraints">
+            <theme name="light" svg="icons/sketch/display_constraints.svg"/>
+            <theme name="dark" svg="icons/sketch/display_constraints.svg"/>
+        </icon>
+        <icon id="sketch.display_dimensions">
+            <theme name="light" svg="icons/sketch/display_dimensions.svg"/>
+            <theme name="dark" svg="icons/sketch/display_dimensions.svg"/>
+        </icon>
+        <icon id="sketch.display_grid">
+            <theme name="light" svg="icons/sketch/display_grid.svg"/>
+            <theme name="dark" svg="icons/sketch/display_grid.svg"/>
+        </icon>
+        <icon id="sketch.display_vertices">
+            <theme name="light" svg="icons/sketch/display_vertices.svg"/>
+            <theme name="dark" svg="icons/sketch/display_vertices.svg"/>
+        </icon>
+        <icon id="sketch.divide">
+            <theme name="light" svg="icons/sketch/divide.svg"/>
+            <theme name="dark" svg="icons/sketch/divide.svg"/>
+        </icon>
+        <icon id="sketch.edit_sketch">
+            <theme name="light" svg="icons/sketch/edit_sketch.svg"/>
+            <theme name="dark" svg="icons/sketch/edit_sketch.svg"/>
+        </icon>
+        <icon id="sketch.extend">
+            <theme name="light" svg="icons/sketch/extend.svg"/>
+            <theme name="dark" svg="icons/sketch/extend.svg"/>
+        </icon>
+        <icon id="sketch.feature_requirements">
+            <theme name="light" svg="icons/sketch/feature_requirements.svg"/>
+            <theme name="dark" svg="icons/sketch/feature_requirements.svg"/>
+        </icon>
+        <icon id="sketch.fillet">
+            <theme name="light" svg="icons/sketch/fillet.svg"/>
+            <theme name="dark" svg="icons/sketch/fillet.svg"/>
+        </icon>
+        <icon id="sketch.fillet_circular">
+            <theme name="light" svg="icons/sketch/fillet_circular.svg"/>
+            <theme name="dark" svg="icons/sketch/fillet_circular.svg"/>
+        </icon>
+        <icon id="sketch.fillet_circular_trim">
+            <theme name="light" svg="icons/sketch/fillet_circular_trim.svg"/>
+            <theme name="dark" svg="icons/sketch/fillet_circular_trim.svg"/>
+        </icon>
+        <icon id="sketch.fillet_elliptical">
+            <theme name="light" svg="icons/sketch/fillet_elliptical.svg"/>
+            <theme name="dark" svg="icons/sketch/fillet_elliptical.svg"/>
+        </icon>
+        <icon id="sketch.fillet_elliptical_trim">
+            <theme name="light" svg="icons/sketch/fillet_elliptical_trim.svg"/>
+            <theme name="dark" svg="icons/sketch/fillet_elliptical_trim.svg"/>
+        </icon>
+        <icon id="sketch.flip_plane">
+            <theme name="light" svg="icons/sketch/flip_plane.svg"/>
+            <theme name="dark" svg="icons/sketch/flip_plane.svg"/>
+        </icon>
+        <icon id="sketch.grid_settings">
+            <theme name="light" svg="icons/sketch/grid_settings.svg"/>
+            <theme name="dark" svg="icons/sketch/grid_settings.svg"/>
+        </icon>
+        <icon id="sketch.inspect_entity">
+            <theme name="light" svg="icons/sketch/inspect_entity.svg"/>
+            <theme name="dark" svg="icons/sketch/inspect_entity.svg"/>
+        </icon>
+        <icon id="sketch.inspect_intersection">
+            <theme name="light" svg="icons/sketch/inspect_intersection.svg"/>
+            <theme name="dark" svg="icons/sketch/inspect_intersection.svg"/>
+        </icon>
+        <icon id="sketch.inspect_tangency">
+            <theme name="light" svg="icons/sketch/inspect_tangency.svg"/>
+            <theme name="dark" svg="icons/sketch/inspect_tangency.svg"/>
+        </icon>
+        <icon id="sketch.line_style_clear">
+            <theme name="light" svg="icons/sketch/line_style_clear.svg"/>
+            <theme name="dark" svg="icons/sketch/line_style_clear.svg"/>
+        </icon>
+        <icon id="sketch.line_style_set">
+            <theme name="light" svg="icons/sketch/line_style_set.svg"/>
+            <theme name="dark" svg="icons/sketch/line_style_set.svg"/>
+        </icon>
+        <icon id="sketch.mirror">
+            <theme name="light" svg="icons/sketch/mirror.svg"/>
+            <theme name="dark" svg="icons/sketch/mirror.svg"/>
+        </icon>
+        <icon id="sketch.modify">
+            <theme name="light" svg="icons/sketch/modify.svg"/>
+            <theme name="dark" svg="icons/sketch/modify.svg"/>
+        </icon>
+        <icon id="sketch.new_sketch">
+            <theme name="light" svg="icons/sketch/new_sketch.svg"/>
+            <theme name="dark" svg="icons/sketch/new_sketch.svg"/>
+        </icon>
+        <icon id="sketch.offset">
+            <theme name="light" svg="icons/sketch/offset.svg"/>
+            <theme name="dark" svg="icons/sketch/offset.svg"/>
+        </icon>
+        <icon id="sketch.pattern">
+            <theme name="light" svg="icons/sketch/pattern.svg"/>
+            <theme name="dark" svg="icons/sketch/pattern.svg"/>
+        </icon>
+        <icon id="sketch.project">
+            <theme name="light" svg="icons/sketch/project.svg"/>
+            <theme name="dark" svg="icons/sketch/project.svg"/>
+        </icon>
+        <icon id="sketch.properties">
+            <theme name="light" svg="icons/sketch/properties.svg"/>
+            <theme name="dark" svg="icons/sketch/properties.svg"/>
+        </icon>
+        <icon id="sketch.references">
+            <theme name="light" svg="icons/sketch/references.svg"/>
+            <theme name="dark" svg="icons/sketch/references.svg"/>
+        </icon>
+        <icon id="sketch.replace">
+            <theme name="light" svg="icons/sketch/replace.svg"/>
+            <theme name="dark" svg="icons/sketch/replace.svg"/>
+        </icon>
+        <icon id="sketch.reuse">
+            <theme name="light" svg="icons/sketch/reuse.svg"/>
+            <theme name="dark" svg="icons/sketch/reuse.svg"/>
+        </icon>
+        <icon id="sketch.rotate_resize">
+            <theme name="light" svg="icons/sketch/rotate_resize.svg"/>
+            <theme name="dark" svg="icons/sketch/rotate_resize.svg"/>
+        </icon>
+        <icon id="sketch.section_flip">
+            <theme name="light" svg="icons/sketch/section_flip.svg"/>
+            <theme name="dark" svg="icons/sketch/section_flip.svg"/>
+        </icon>
+        <icon id="sketch.section_restore">
+            <theme name="light" svg="icons/sketch/section_restore.svg"/>
+            <theme name="dark" svg="icons/sketch/section_restore.svg"/>
+        </icon>
+        <icon id="sketch.section_set_horizontal">
+            <theme name="light" svg="icons/sketch/section_set_horizontal.svg"/>
+            <theme name="dark" svg="icons/sketch/section_set_horizontal.svg"/>
+        </icon>
+        <icon id="sketch.section_set_vertical">
+            <theme name="light" svg="icons/sketch/section_set_vertical.svg"/>
+            <theme name="dark" svg="icons/sketch/section_set_vertical.svg"/>
+        </icon>
+        <icon id="sketch.setup">
+            <theme name="light" svg="icons/sketch/setup.svg"/>
+            <theme name="dark" svg="icons/sketch/setup.svg"/>
+        </icon>
+        <icon id="sketch.text">
+            <theme name="light" svg="icons/sketch/text.svg"/>
+            <theme name="dark" svg="icons/sketch/text.svg"/>
+        </icon>
+        <icon id="sketch.thicken">
+            <theme name="light" svg="icons/sketch/thicken.svg"/>
+            <theme name="dark" svg="icons/sketch/thicken.svg"/>
+        </icon>
+        <icon id="sketch.toggle_lock">
+            <theme name="light" svg="icons/sketch/toggle_lock.svg"/>
+            <theme name="dark" svg="icons/sketch/toggle_lock.svg"/>
+        </icon>
+        <icon id="sketch.trim">
+            <theme name="light" svg="icons/sketch/trim.svg"/>
+            <theme name="dark" svg="icons/sketch/trim.svg"/>
+        </icon>
+        <icon id="sketch.underconstrained">
+            <theme name="light" svg="icons/sketch/underconstrained.svg"/>
+            <theme name="dark" svg="icons/sketch/underconstrained.svg"/>
+        </icon>
+        <icon id="sketch.view">
+            <theme name="light" svg="icons/sketch/view.svg"/>
+            <theme name="dark" svg="icons/sketch/view.svg"/>
+        </icon>
+        <icon id="surface.blend_tangent">
+            <theme name="light" svg="icons/surface/blend_tangent.svg"/>
+            <theme name="dark" svg="icons/surface/blend_tangent.svg"/>
+        </icon>
+        <icon id="surface.boundary_blend">
+            <theme name="light" svg="icons/surface/boundary_blend.svg"/>
+            <theme name="dark" svg="icons/surface/boundary_blend.svg"/>
+        </icon>
+        <icon id="surface.fill">
+            <theme name="light" svg="icons/surface/fill.svg"/>
+            <theme name="dark" svg="icons/surface/fill.svg"/>
+        </icon>
+        <icon id="surface.flatten_quilt">
+            <theme name="light" svg="icons/surface/flatten_quilt.svg"/>
+            <theme name="dark" svg="icons/surface/flatten_quilt.svg"/>
+        </icon>
+        <icon id="surface.flatten_quilt_deformation">
+            <theme name="light" svg="icons/surface/flatten_quilt_deformation.svg"/>
+            <theme name="dark" svg="icons/surface/flatten_quilt_deformation.svg"/>
+        </icon>
+        <icon id="surface.foreign_surface">
+            <theme name="light" svg="icons/surface/foreign_surface.svg"/>
+            <theme name="dark" svg="icons/surface/foreign_surface.svg"/>
+        </icon>
+        <icon id="surface.freestyle">
+            <theme name="light" svg="icons/surface/freestyle.svg"/>
+            <theme name="dark" svg="icons/surface/freestyle.svg"/>
+        </icon>
+        <icon id="surface.restyle">
+            <theme name="light" svg="icons/surface/restyle.svg"/>
+            <theme name="dark" svg="icons/surface/restyle.svg"/>
+        </icon>
+        <icon id="surface.style">
+            <theme name="light" svg="icons/surface/style.svg"/>
+            <theme name="dark" svg="icons/surface/style.svg"/>
+        </icon>
+        <icon id="surface.vertex_round">
+            <theme name="light" svg="icons/surface/vertex_round.svg"/>
+            <theme name="dark" svg="icons/surface/vertex_round.svg"/>
+        </icon>
+        <icon id="synchronous.delete_face">
+            <theme name="light" svg="icons/synchronous/delete_face.svg"/>
+            <theme name="dark" svg="icons/synchronous/delete_face.svg"/>
+        </icon>
+        <icon id="synchronous.move_face">
+            <theme name="light" svg="icons/synchronous/move_face.svg"/>
+            <theme name="dark" svg="icons/synchronous/move_face.svg"/>
+        </icon>
+        <icon id="synchronous.offset_region">
+            <theme name="light" svg="icons/synchronous/offset_region.svg"/>
+            <theme name="dark" svg="icons/synchronous/offset_region.svg"/>
+        </icon>
+        <icon id="synchronous.pull">
+            <theme name="light" svg="icons/synchronous/pull.svg"/>
+            <theme name="dark" svg="icons/synchronous/pull.svg"/>
+        </icon>
+        <icon id="tools.command_line">
+            <theme name="light" svg="icons/tools/command_line.svg"/>
+            <theme name="dark" svg="icons/tools/command_line.svg"/>
+        </icon>
+        <icon id="tools.expressions">
+            <theme name="light" svg="icons/tools/expressions.svg"/>
+            <theme name="dark" svg="icons/tools/expressions.svg"/>
+        </icon>
+        <icon id="tools.journal_pause">
+            <theme name="light" svg="icons/tools/journal_pause.svg"/>
+            <theme name="dark" svg="icons/tools/journal_pause.svg"/>
+        </icon>
+        <icon id="tools.journal_play">
+            <theme name="light" svg="icons/tools/journal_play.svg"/>
+            <theme name="dark" svg="icons/tools/journal_play.svg"/>
+        </icon>
+        <icon id="tools.journal_record">
+            <theme name="light" svg="icons/tools/journal_record.svg"/>
+            <theme name="dark" svg="icons/tools/journal_record.svg"/>
+        </icon>
+        <icon id="tools.python_console">
+            <theme name="light" svg="icons/tools/python_console.svg"/>
+            <theme name="dark" svg="icons/tools/python_console.svg"/>
+        </icon>
+        <icon id="ui.cancel">
+            <theme name="light" svg="icons/ui/cancel.svg"/>
+            <theme name="dark" svg="icons/ui/cancel.svg"/>
+        </icon>
+        <icon id="ui.file_system">
+            <theme name="light" svg="icons/ui/file_system.svg"/>
+            <theme name="dark" svg="icons/ui/file_system.svg"/>
+        </icon>
+        <icon id="ui.ok">
+            <theme name="light" svg="icons/ui/ok.svg"/>
+            <theme name="dark" svg="icons/ui/ok.svg"/>
+        </icon>
+        <icon id="ui.restore_layout">
+            <theme name="light" svg="icons/ui/restore_layout.svg"/>
+            <theme name="dark" svg="icons/ui/restore_layout.svg"/>
+        </icon>
+        <icon id="ui.save_layout">
+            <theme name="light" svg="icons/ui/save_layout.svg"/>
+            <theme name="dark" svg="icons/ui/save_layout.svg"/>
+        </icon>
+        <icon id="ui.toggle_mode">
+            <theme name="light" svg="icons/ui/toggle_mode.svg"/>
+            <theme name="dark" svg="icons/ui/toggle_mode.svg"/>
+        </icon>
+        <icon id="view.clipping_plane">
+            <theme name="light" svg="icons/view/clipping_plane.svg"/>
+            <theme name="dark" svg="icons/view/clipping_plane.svg"/>
+        </icon>
+        <icon id="view.dynamic_section">
+            <theme name="light" svg="icons/view/dynamic_section.svg"/>
+            <theme name="dark" svg="icons/view/dynamic_section.svg"/>
+        </icon>
+        <icon id="view.front">
+            <theme name="light" svg="icons/view/front.svg"/>
+            <theme name="dark" svg="icons/view/front.svg"/>
+        </icon>
+        <icon id="view.right">
+            <theme name="light" svg="icons/view/right.svg"/>
+            <theme name="dark" svg="icons/view/right.svg"/>
+        </icon>
+        <icon id="view.top">
+            <theme name="light" svg="icons/view/top.svg"/>
+            <theme name="dark" svg="icons/view/top.svg"/>
+        </icon>
+        <icon id="view.trimetric">
+            <theme name="light" svg="icons/view/trimetric.svg"/>
+            <theme name="dark" svg="icons/view/trimetric.svg"/>
+        </icon>
+        <icon id="window.arrange">
+            <theme name="light" svg="icons/window/arrange.svg"/>
+            <theme name="dark" svg="icons/window/arrange.svg"/>
+        </icon>
+        <icon id="window.new_window">
+            <theme name="light" svg="icons/window/new_window.svg"/>
+            <theme name="dark" svg="icons/window/new_window.svg"/>
+        </icon>
+        <icon id="window.tile_horizontal">
+            <theme name="light" svg="icons/window/tile_horizontal.svg"/>
+            <theme name="dark" svg="icons/window/tile_horizontal.svg"/>
+        </icon>
+    </icon-library>
+</IconLibraryConfig>
diff --git a/Designer/Data/TitleBarConfig.xml b/Designer/Data/TitleBarConfig.xml
index 2ab99272..d3777572 100644
--- a/Designer/Data/TitleBarConfig.xml
+++ b/Designer/Data/TitleBarConfig.xml
@@ -1,29 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TitleBarConfig version="1.0">
-
     <!-- ========================================================= -->
     <!-- Title bar declarations                                   -->
     <!-- ========================================================= -->
     <titlebars>
         <!-- Part / Modeling -->
         <titlebar id="sd.part.titlebar"
-                  workbench="Part"
+                  workbench="workbench.part"
                   label="SD Part TitleBar"/>
 
-        <!-- Sketch-in-Part / Sketch environment -->
+        <!-- Sketch environment -->
         <titlebar id="sd.sketch.titlebar"
-                  workbench="Sketch"
+                  workbench="workbench.sketch"
                   label="SD Sketch TitleBar"/>
 
         <!-- Assembly -->
         <titlebar id="sd.asm.titlebar"
-                  workbench="Assembly"
+                  workbench="workbench.assembly"
                   label="SD Assembly TitleBar"/>
 
-        <!-- Sheet Metal -->
-        <titlebar id="sd.sheet.titlebar"
-                  workbench="SheetMetal"
-                  label="SD Sheet Metal TitleBar"/>
+        <!-- Home -->
+        <titlebar id="sd.home.titlebar"
+                  workbench="workbench.home"
+                  label="SD Home TitleBar"/>
+
+        <!-- Drawing -->
+        <titlebar id="sd.drawing.titlebar"
+                  workbench="workbench.drawing"
+                  label="SD Drawing TitleBar"/>
+
+        <!-- Manufacturing -->
+        <titlebar id="sd.mfg.titlebar"
+                  workbench="workbench.mfg"
+                  label="SD Manufacturing TitleBar"/>
+
+        <!-- BIM -->
+        <titlebar id="sd.bim.titlebar"
+                  workbench="workbench.bim"
+                  label="SD Bim TitleBar"/>
     </titlebars>
 
 
@@ -35,64 +49,67 @@
         <!-- ===================== Part / Modeling ===================== -->
         <layout titlebar="sd.part.titlebar">
 
-            <!-- Left area: quick access commands -->
+            <!-- Left area: App + quick access commands -->
             <area id="left" order="10">
-                <!-- File button (opens big "File" dialog / backstage) -->
-                <control type="file-button"
-                         commandRef="ui.fileMenu"
-                         order="5"
-                         icon="icons/ui/file_menu.svg"
-                         label="File"/>
 
-                <!-- Undo / Redo -->
-                <control type="command-button"
-                         commandRef="edit.undo"
-                         order="10"/>
-                <control type="command-button"
-                         commandRef="edit.redo"
-                         order="20"/>
+                <!-- app: SolidDesigner application button (left-most entry) -->
+                <control type="brand-button"
+                         id="app"
+                         commandRef="ui.appMenu"
+                         order="5"
+                         iconRef="app"
+                         tooltip="SolidDesigner"/>
 
-                <!-- Clipboard -->
-                <control type="command-button"
-                         commandRef="edit.cut"
-                         order="30"/>
+                <!-- QAT: new/open/save/undo/redo/regenerate/windows/dropdown -->
                 <control type="command-button"
-                         commandRef="edit.copy"
-                         order="40"/>
-                <control type="command-button"
-                         commandRef="edit.paste"
-                         order="50"/>
+                         id="new"
+                         commandRef="file.new"
+                         order="10"
+                         iconRef="new"/>
 
-                <!-- Drag between windows -->
                 <control type="command-button"
-                         commandRef="window.dragBetween"
-                         order="60"/>
+                         id="open"
+                         commandRef="file.open"
+                         order="20"
+                         iconRef="open"/>
 
-                <!-- Minimize ribbon -->
                 <control type="command-button"
-                         commandRef="ui.minimizeRibbon"
-                         order="70"/>
+                         id="save"
+                         commandRef="file.save"
+                         order="30"
+                         iconRef="save"/>
 
-                <!-- Speech recognition -->
                 <control type="command-button"
-                         commandRef="ui.speechRecognition"
-                         order="80"/>
+                         id="undo"
+                         commandRef="edit.undo"
+                         order="40"
+                         iconRef="undo"/>
 
-                <!-- Touch mode -->
                 <control type="command-button"
-                         commandRef="ui.touchMode"
-                         order="90"/>
+                         id="redo"
+                         commandRef="edit.redo"
+                         order="50"
+                         iconRef="redo"/>
 
-                <!-- Switch window / Window menu / Toolbar options -->
                 <control type="command-button"
-                         commandRef="window.switch"
-                         order="100"/>
-                <control type="command-button"
-                         commandRef="window.menu"
-                         order="110"/>
-                <control type="command-button"
-                         commandRef="ui.toolbarOptions"
-                         order="120"/>
+                         id="regenerate"
+                         commandRef="model.regenerate"
+                         order="60"
+                         iconRef="regenerate"/>
+
+                <!-- windows: view/window management (needs dropdown arrow) -->
+                <control type="menu-button"
+                         id="windows"
+                         commandRef="ui.windowsMenu"
+                         order="70"
+                         iconRef="windows"/>
+
+                <!-- dropdown: QAT overflow / more -->
+                <control type="menu-button"
+                         id="dropdown"
+                         commandRef="ui.qatMenu"
+                         order="80"
+                         iconRef="qat"/>
             </area>
 
             <!-- Center area: document title & environment label -->
@@ -100,36 +117,37 @@
                 <!-- These are not commands but data bindings -->
                 <control type="label"
                          id="label.documentTitle"
+                         order="10"
                          binding="document.title"
                          format="%document%"/>
+
                 <control type="label"
                          id="label.workbench"
+                         order="20"
                          binding="workbench.displayName"
                          format=" - %workbench%"/>
             </area>
 
-            <!-- Right area: brand + window buttons -->
+            <!-- Right area: window buttons -->
             <area id="right" order="30">
-                <!-- Brand button: SIEMENS / Alice logo -->
-                <control type="brand-button"
-                         commandRef="ui.brandMenu"
-                         order="5"
-                         icon="icons/brand/siemens.svg"
-                         tooltip="Product information"/>
-
                 <!-- Window system buttons -->
                 <control type="window-button"
-                         commandRef="ui.window.minimize"
+                         id="minimize"
                          order="10"
-                         role="minimize"/>
-                <control type="window-button"
-                         commandRef="ui.window.restore"
-                         order="20"
-                         role="restore"/>
+                         role="minimize"
+                         iconRef="minimize"/>
+
                 <control type="window-button"
-                         commandRef="ui.window.close"
+                         id="restore"
                          order="30"
-                         role="close"/>
+                         role="restore"
+                         iconRef="restore"/>
+
+                <control type="window-button"
+                         id="close"
+                         order="40"
+                         role="close"
+                         iconRef="close"/>
             </area>
         </layout>
 
@@ -137,197 +155,524 @@
         <layout titlebar="sd.sketch.titlebar">
 
             <area id="left" order="10">
-                <control type="file-button"
-                         commandRef="ui.fileMenu"
+                <control type="brand-button"
+                         id="app"
+                         commandRef="ui.appMenu"
                          order="5"
-                         icon="icons/ui/file_menu.svg"
-                         label="File"/>
+                         iconRef="app"
+                         tooltip="SolidDesigner"/>
 
                 <control type="command-button"
-                         commandRef="edit.undo"
-                         order="10"/>
+                         id="new"
+                         commandRef="file.new"
+                         order="10"
+                         iconRef="new"/>
+
                 <control type="command-button"
-                         commandRef="edit.redo"
-                         order="20"/>
+                         id="open"
+                         commandRef="file.open"
+                         order="20"
+                         iconRef="open"/>
 
-                <!-- Sketch frequently used commands -->
                 <control type="command-button"
-                         commandRef="sketch.finish"
-                         order="30"/>
+                         id="save"
+                         commandRef="file.save"
+                         order="30"
+                         iconRef="save"/>
+
                 <control type="command-button"
-                         commandRef="sketch.cancel"
-                         order="40"/>
+                         id="undo"
+                         commandRef="edit.undo"
+                         order="40"
+                         iconRef="undo"/>
 
                 <control type="command-button"
-                         commandRef="ui.minimizeRibbon"
-                         order="70"/>
+                         id="redo"
+                         commandRef="edit.redo"
+                         order="50"
+                         iconRef="redo"/>
+
                 <control type="command-button"
-                         commandRef="ui.touchMode"
-                         order="80"/>
+                         id="regenerate"
+                         commandRef="model.regenerate"
+                         order="60"
+                         iconRef="regen"/>
+
+                <control type="menu-button"
+                         id="windows"
+                         commandRef="ui.windowsMenu"
+                         order="70"
+                         iconRef="windows"/>
+
+                <control type="menu-button"
+                         id="dropdown"
+                         commandRef="ui.qatMenu"
+                         order="80"
+                         iconRef="qat"/>
             </area>
 
             <area id="center" order="20">
                 <control type="label"
                          id="label.documentTitle"
+                         order="10"
                          binding="document.title"
                          format="%document%"/>
                 <control type="label"
                          id="label.workbench"
+                         order="20"
                          binding="workbench.displayName"
                          format=" - %workbench%"/>
             </area>
 
+            <!-- Right area: window buttons -->
             <area id="right" order="30">
-                <control type="brand-button"
-                         commandRef="ui.brandMenu"
-                         order="5"
-                         icon="icons/brand/siemens.svg"
-                         tooltip="Product information"/>
-
+                <!-- Window system buttons -->
                 <control type="window-button"
-                         commandRef="ui.window.minimize"
+                         id="minimize"
                          order="10"
-                         role="minimize"/>
-                <control type="window-button"
-                         commandRef="ui.window.restore"
-                         order="20"
-                         role="restore"/>
+                         role="minimize"
+                         iconRef="minimize"/>
+
                 <control type="window-button"
-                         commandRef="ui.window.close"
+                         id="restore"
                          order="30"
-                         role="close"/>
+                         role="restore"
+                         iconRef="restore"/>
+                <control type="window-button"
+                         id="close"
+                         order="40"
+                         role="close"
+                         iconRef="close"/>
             </area>
         </layout>
 
         <!-- ===================== Assembly ===================== -->
         <layout titlebar="sd.asm.titlebar">
-
             <area id="left" order="10">
-                <control type="file-button"
-                         commandRef="ui.fileMenu"
+                <control type="brand-button"
+                         id="app"
+                         commandRef="ui.appMenu"
                          order="5"
-                         icon="icons/ui/file_menu.svg"
-                         label="File"/>
+                         icon=":/TitleBar/brand/app.svg"
+                         tooltip="SolidDesigner"/>
 
                 <control type="command-button"
-                         commandRef="edit.undo"
-                         order="10"/>
+                         id="new"
+                         commandRef="file.new"
+                         order="10"
+                         iconRef="new"/>
                 <control type="command-button"
-                         commandRef="edit.redo"
-                         order="20"/>
-
-                <!-- Assembly often used -->
+                         id="open"
+                         commandRef="file.open"
+                         order="20"
+                         iconRef="open"/>
                 <control type="command-button"
-                         commandRef="asm.addComponent"
-                         order="30"/>
+                         id="save"
+                         commandRef="file.save"
+                         order="30"
+                         iconRef="save"/>
                 <control type="command-button"
-                         commandRef="asm.constraint"
-                         order="40"/>
-
+                         id="undo"
+                         commandRef="edit.undo"
+                         order="40"
+                         iconRef="undo"/>
                 <control type="command-button"
-                         commandRef="ui.minimizeRibbon"
-                         order="70"/>
+                         id="redo"
+                         commandRef="edit.redo"
+                         order="50"
+                         iconRef="redo"/>
                 <control type="command-button"
-                         commandRef="window.switch"
-                         order="80"/>
+                         id="regenerate"
+                         commandRef="model.regenerate"
+                         order="60"
+                         iconRef="regen"/>
+                <control type="menu-button"
+                         id="windows"
+                         commandRef="ui.windowsMenu"
+                         order="70"
+                         iconRef="windows"/>
+                <control type="menu-button"
+                         id="dropdown"
+                         commandRef="ui.qatMenu"
+                         order="80"
+                         iconRef="qat"/>
             </area>
 
             <area id="center" order="20">
                 <control type="label"
                          id="label.documentTitle"
+                         order="10"
                          binding="document.title"
                          format="%document%"/>
                 <control type="label"
                          id="label.workbench"
+                         order="20"
                          binding="workbench.displayName"
                          format=" - %workbench%"/>
             </area>
 
+            <!-- Right area: window buttons -->
             <area id="right" order="30">
+                <!-- Window system buttons -->
+                <control type="window-button"
+                         id="minimize"
+                         order="10"
+                         role="minimize"
+                         iconRef="minimize"/>
+                 <control type="window-button"
+                         id="restore"
+                         order="30"
+                         role="restore"
+                         iconRef="restore"/>
+                <control type="window-button"
+                         id="close"
+                         order="40"
+                         role="close"
+                         iconRef="close"/>
+            </area>
+        </layout>
+
+        <!-- ===================== Home ===================== -->
+        <layout titlebar="sd.home.titlebar">
+            <area id="left" order="10">
                 <control type="brand-button"
-                         commandRef="ui.brandMenu"
+                         id="app"
+                         commandRef="ui.appMenu"
+                         iconRef="app"
                          order="5"
-                         icon="icons/brand/siemens.svg"
-                         tooltip="Product information"/>
+                         tooltip="SolidDesigner"/>
 
-                <control type="window-button"
-                         commandRef="ui.window.minimize"
+                <control type="command-button"
+                         id="new"
+                         commandRef="file.new"
                          order="10"
-                         role="minimize"/>
-                <control type="window-button"
-                         commandRef="ui.window.restore"
+                         iconRef="new"/>
+                <control type="command-button"
+                         id="open"
+                         commandRef="file.open"
                          order="20"
-                         role="restore"/>
+                         iconRef="open"/>
+                <control type="command-button"
+                         id="save"
+                         commandRef="file.save"
+                         order="30"
+                         iconRef="save"/>
+                <control type="command-button"
+                         id="undo"
+                         commandRef="edit.undo"
+                         order="40"
+                         iconRef="undo"/>
+                <control type="command-button"
+                         id="redo"
+                         commandRef="edit.redo"
+                         order="50"
+                         iconRef="redo"/>
+                <control type="command-button"
+                         id="regenerate"
+                         commandRef="model.regenerate"
+                         order="60"
+                         iconRef="regen"/>
+                <control type="menu-button"
+                         id="windows"
+                         commandRef="ui.windowsMenu"
+                         order="70"
+                         iconRef="windows"/>
+                <control type="menu-button"
+                         id="dropdown"
+                         commandRef="ui.qatMenu"
+                         order="80"
+                         iconRef="qat"/>
+            </area>
+
+            <area id="center" order="20">
+                <control type="label"
+                         id="label.documentTitle"
+                         order="10"
+                         binding="document.title"
+                         format="%document%"/>
+                <control type="label"
+                         id="label.workbench"
+                         order="20"
+                         binding="workbench.displayName"
+                         format=" - %workbench%"/>
+            </area>
+
+            <!-- Right area: window buttons -->
+            <area id="right" order="30">
+                <!-- Window system buttons -->
+                <control type="window-button"
+                         id="minimize"
+                         order="10"
+                         role="minimize"
+                         iconRef="minimize"/>
                 <control type="window-button"
-                         commandRef="ui.window.close"
+                         id="restore"
                          order="30"
-                         role="close"/>
+                         role="restore"
+                         iconRef="restore"/>
+                <control type="window-button"
+                         id="close"
+                         order="40"
+                         role="close"
+                         iconRef="close"/>
             </area>
         </layout>
 
-        <!-- ===================== Sheet Metal ===================== -->
-        <layout titlebar="sd.sheet.titlebar">
 
+        <!-- ===================== Drawing ===================== -->
+        <layout titlebar="sd.drawing.titlebar">
             <area id="left" order="10">
-                <control type="file-button"
-                         commandRef="ui.fileMenu"
+                <control type="brand-button"
+                         id="app"
+                         commandRef="ui.appMenu"
+                         iconRef="app"
                          order="5"
-                         icon="icons/ui/file_menu.svg"
-                         label="File"/>
+                         tooltip="SolidDesigner"/>
 
                 <control type="command-button"
+                         id="new"
+                         commandRef="file.new"
+                         order="10"
+                         iconRef="new"/>
+                <control type="command-button"
+                         id="open"
+                         commandRef="file.open"
+                         order="20"
+                         iconRef="open"/>
+                <control type="command-button"
+                         id="save"
+                         commandRef="file.save"
+                         order="30"
+                         iconRef="save"/>
+                <control type="command-button"
+                         id="undo"
                          commandRef="edit.undo"
-                         order="10"/>
+                         order="40"
+                         iconRef="undo"/>
                 <control type="command-button"
+                         id="redo"
                          commandRef="edit.redo"
-                         order="20"/>
+                         order="50"
+                         iconRef="redo"/>
+                <control type="command-button"
+                         id="regenerate"
+                         commandRef="model.regenerate"
+                         order="60"
+                         iconRef="regen"/>
+                <control type="menu-button"
+                         id="windows"
+                         commandRef="ui.windowsMenu"
+                         order="70"
+                         iconRef="windows"/>
+                <control type="menu-button"
+                         id="dropdown"
+                         commandRef="ui.qatMenu"
+                         order="80"
+                         iconRef="qat"/>
+            </area>
+
+            <area id="center" order="20">
+                <control type="label"
+                         id="label.documentTitle"
+                         order="10"
+                         binding="document.title"
+                         format="%document%"/>
+                <control type="label"
+                         id="label.workbench"
+                         order="20"
+                         binding="workbench.displayName"
+                         format=" - %workbench%"/>
+            </area>
+
+            <area id="right" order="30">
+                <control type="window-button"
+                         id="minimize"
+                         order="10"
+                         role="minimize"
+                         iconRef="minimize"/>
+                <control type="window-button"
+                         id="restore"
+                         order="30"
+                         role="restore"
+                         iconRef="restore"/>
+                <control type="window-button"
+                         id="close"
+                         order="40"
+                         role="close"
+                         iconRef="close"/>
+            </area>
+        </layout>
+
+
+        <!-- ===================== Manufacturing ===================== -->
+        <layout titlebar="sd.mfg.titlebar">
+            <area id="left" order="10">
+                <control type="brand-button"
+                         id="app"
+                         commandRef="ui.appMenu"
+                         iconRef="app"
+                         order="5"
+                         tooltip="SolidDesigner"/>
 
-                <!-- Sheet metal hot commands -->
                 <control type="command-button"
-                         commandRef="sheet.baseFlange"
-                         order="30"/>
+                         id="new"
+                         commandRef="file.new"
+                         order="10"
+                         iconRef="new"/>
                 <control type="command-button"
-                         commandRef="sheet.edgeFlange"
-                         order="40"/>
-
+                         id="open"
+                         commandRef="file.open"
+                         order="20"
+                         iconRef="open"/>
+                <control type="command-button"
+                         id="save"
+                         commandRef="file.save"
+                         order="30"
+                         iconRef="save"/>
+                <control type="command-button"
+                         id="undo"
+                         commandRef="edit.undo"
+                         order="40"
+                         iconRef="undo"/>
                 <control type="command-button"
-                         commandRef="ui.minimizeRibbon"
-                         order="70"/>
+                         id="redo"
+                         commandRef="edit.redo"
+                         order="50"
+                         iconRef="redo"/>
                 <control type="command-button"
-                         commandRef="window.switch"
-                         order="80"/>
+                         id="regenerate"
+                         commandRef="model.regenerate"
+                         order="60"
+                         iconRef="regen"/>
+                <control type="menu-button"
+                         id="windows"
+                         commandRef="ui.windowsMenu"
+                         order="70"
+                         iconRef="windows"/>
+                <control type="menu-button"
+                         id="dropdown"
+                         commandRef="ui.qatMenu"
+                         order="80"
+                         iconRef="qat"/>
             </area>
 
             <area id="center" order="20">
                 <control type="label"
                          id="label.documentTitle"
+                         order="10"
                          binding="document.title"
                          format="%document%"/>
                 <control type="label"
                          id="label.workbench"
+                         order="20"
                          binding="workbench.displayName"
                          format=" - %workbench%"/>
             </area>
 
+            <!-- Right area: window buttons -->
             <area id="right" order="30">
+                <!-- Window system buttons -->
+                <control type="window-button"
+                         id="minimize"
+                         order="10"
+                         role="minimize"
+                         iconRef="minimize"/>
+                <control type="window-button"
+                         id="restore"
+                         order="30"
+                         role="restore"
+                         iconRef="restore"/>
+                <control type="window-button"
+                         id="close"
+                         order="40"
+                         role="close"
+                         iconRef="close"/>
+            </area>
+        </layout>
+
+
+        <!-- ===================== BIM ===================== -->
+        <layout titlebar="sd.bim.titlebar">
+            <area id="left" order="10">
                 <control type="brand-button"
-                         commandRef="ui.brandMenu"
+                         id="app"
+                         commandRef="ui.appMenu"
+                         iconRef="app"
                          order="5"
-                         icon="icons/brand/siemens.svg"
-                         tooltip="Product information"/>
+                         tooltip="SolidDesigner"/>
 
-                <control type="window-button"
-                         commandRef="ui.window.minimize"
+                <control type="command-button"
+                         id="new"
+                         commandRef="file.new"
                          order="10"
-                         role="minimize"/>
-                <control type="window-button"
-                         commandRef="ui.window.restore"
+                         iconRef="new"/>
+                <control type="command-button"
+                         id="open"
+                         commandRef="file.open"
                          order="20"
-                         role="restore"/>
+                         iconRef="open"/>
+                <control type="command-button"
+                         id="save"
+                         commandRef="file.save"
+                         order="30"
+                         iconRef="save"/>
+                <control type="command-button"
+                         id="undo"
+                         commandRef="edit.undo"
+                         order="40"
+                         iconRef="undo"/>
+                <control type="command-button"
+                         id="redo"
+                         commandRef="edit.redo"
+                         order="50"
+                         iconRef="redo"/>
+                <control type="command-button"
+                         id="regenerate"
+                         commandRef="model.regenerate"
+                         order="60"
+                         iconRef="regen"/>
+                <control type="menu-button"
+                         id="windows"
+                         commandRef="ui.windowsMenu"
+                         order="70"
+                         iconRef="windows"/>
+                <control type="menu-button"
+                         id="dropdown"
+                         commandRef="ui.qatMenu"
+                         order="80"
+                         iconRef="qat"/>
+            </area>
+
+            <area id="center" order="20">
+                <control type="label"
+                         id="label.documentTitle"
+                         order="10"
+                         binding="document.title"
+                         format="%document%"/>
+                <control type="label"
+                         id="label.workbench"
+                         order="20"
+                         binding="workbench.displayName"
+                         format=" - %workbench%"/>
+            </area>
+
+            <!-- Right area: window buttons -->
+            <area id="right" order="30">
                 <control type="window-button"
-                         commandRef="ui.window.close"
+                         id="minimize"
+                         order="10"
+                         role="minimize"
+                         iconRef="minimize"/>
+                <control type="window-button"
+                         id="restore"
                          order="30"
-                         role="close"/>
+                         role="restore"
+                         iconRef="restore"/>
+                <control type="window-button"
+                         id="close"
+                         order="40"
+                         role="close"
+                         iconRef="close"/>
             </area>
         </layout>
 
diff --git a/Designer/Data/UiApplicationConfig.xml b/Designer/Data/UiApplicationConfig.xml
index 24a3be9c..8669b165 100644
--- a/Designer/Data/UiApplicationConfig.xml
+++ b/Designer/Data/UiApplicationConfig.xml
@@ -2,6 +2,8 @@
 <UiApplicationConfig version="1.0" product="SolidDesigner">
   <!-- splash screen config file -->
   <Include href="SplashScreenConfig.xml"/>
+  <!-- Icon config file -->
+  <Include href="IconLibraryConfig.xml"/>
   <!-- titlebar config file -->
   <Include href="TitleBarConfig.xml"/>
   <!-- functiona area config file -->
diff --git a/Designer/UI/SolidDesignerCommand/SolidDesignerCommands.h b/Designer/UI/SolidDesignerCommand/SolidDesignerCommands.h
index 769ba31f..411e8e6c 100644
--- a/Designer/UI/SolidDesignerCommand/SolidDesignerCommands.h
+++ b/Designer/UI/SolidDesignerCommand/SolidDesignerCommands.h
@@ -76,6 +76,11 @@ namespace sdr
         inline constexpr std::string_view CURVE_STUDIOSPLINE             = "curve.studioSpline"; // Studio Spline
         inline constexpr std::string_view CURVE_TRIM                     = "curve.trim"; // Trim Curve
 
+        // === Category: data ===
+        inline constexpr std::string_view DATA_ERASENOTDISPLAYED         = "data.eraseNotDisplayed"; // Erase Not Displayed
+        inline constexpr std::string_view DATA_OPENLASTSESSION           = "data.openLastSession"; // Open Last Session
+        inline constexpr std::string_view DATA_SELECTWORKINGDIRECTORY    = "data.selectWorkingDirectory"; // Select Working Directory
+
         // === Category: datum ===
         inline constexpr std::string_view DATUM_AXIS                     = "datum.axis"; // Axis
         inline constexpr std::string_view DATUM_CS                       = "datum.cs"; // Coordinate System
@@ -208,6 +213,10 @@ namespace sdr
         inline constexpr std::string_view SELECT_SINGLE                  = "select.single"; // Single Select
         inline constexpr std::string_view SKETCH_SELECT                  = "sketch.select"; // Select
 
+        // === Category: settings ===
+        inline constexpr std::string_view SETTINGS_MODELDISPLAY          = "settings.modelDisplay"; // Model Display
+        inline constexpr std::string_view SETTINGS_SYSTEMAPPEARANCE      = "settings.systemAppearance"; // System Appearance
+
         // === Category: shapes ===
         inline constexpr std::string_view MODEL_BLEND                    = "model.blend"; // Blend
         inline constexpr std::string_view MODEL_BLEND_ROTATIONAL         = "model.blend.rotational"; // Rotational Blend
@@ -347,6 +356,15 @@ namespace sdr
         inline constexpr std::string_view UI_SAVELAYOUT                  = "ui.saveLayout"; // Save Layout
         inline constexpr std::string_view UI_TOGGLEMODE                  = "ui.toggleMode"; // Toggle Ribbon / Classic
 
+        // === Category: ui.titlebar ===
+        inline constexpr std::string_view UI_APPMENU                     = "ui.appMenu"; // SolidDesigner
+        inline constexpr std::string_view UI_QATMENU                     = "ui.qatMenu"; // Quick Access
+        inline constexpr std::string_view UI_WINDOWSMENU                 = "ui.windowsMenu"; // Windows
+
+        // === Category: utilities ===
+        inline constexpr std::string_view UTILITIES_AUXAPPLICATION       = "utilities.auxApplication"; // Auxiliary Application
+        inline constexpr std::string_view UTILITIES_PLAYTRAILFILE        = "utilities.playTrailFile"; // Play Trail File
+
         // === Category: view ===
         inline constexpr std::string_view VIEW_CLIPPINGPLANE             = "view.clippingPlane"; // Clipping Plane
         inline constexpr std::string_view VIEW_DYNAMICSECTION            = "view.dynamicSection"; // Dynamic Section
diff --git a/Designer/UI/SolidDesignerUI/CMakeLists.txt b/Designer/UI/SolidDesignerUI/CMakeLists.txt
index 85d20e72..fc8be6a0 100644
--- a/Designer/UI/SolidDesignerUI/CMakeLists.txt
+++ b/Designer/UI/SolidDesignerUI/CMakeLists.txt
@@ -11,10 +11,7 @@ if(WIN32)
   set(CMAKE_PREFIX_PATH "C:/Qt/Qt5.15.14/5.15.14/msvc2019_64")
 endif()
 
-find_package(Qt5Core       5.15 REQUIRED)
-find_package(Qt5Gui        5.15 REQUIRED)
-find_package(Qt5Widgets    5.15 REQUIRED)
-
+find_package(Qt5 COMPONENTS Core Gui Widgets Network Quick Qml REQUIRED)
 
 message("${PROJECT_SOURCE_DIR}")
 
@@ -22,9 +19,6 @@ message("${PROJECT_SOURCE_DIR}")
 FILE(GLOB SOURCE_FILES "${PROJECT_SOURCE_DIR}/Designer/UI/SolidDesignerUI/*.cpp")
 FILE(GLOB HEADER_FILES "${PROJECT_SOURCE_DIR}/Designer/UI/SolidDesignerUI/*.h")
 
-#source_group("" FILES ${SOURCE_FILES})
-#source_group("" FILES ${HEADER_FILES})
-
 
 set(RESOURCES ${PROJECT_SOURCE_DIR}/Designer/UI/SolidDesignerUI/StyleTemplate.qrc)
 source_group("resources" FILES ${RESOURCES})
@@ -35,13 +29,6 @@ source_group("resources" FILES ${RESOURCES})
 #-----------------------------------------------------------------------------
 link_directories(${ALICE_LIB_DIR})
 
-#-----------------------------------------------------------------------------
-# 头文件搜索路径
-#-----------------------------------------------------------------------------
-include_directories(${CMAKE_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${PROJECT_SOURCE_DIR}/Alice/Core/Foundation/AliceBasicTool/Public)
-
 #=============================================================================
 #指定工程为动态库程序
 add_library(SolidDesignerUI SHARED ${SOURCE_FILES} ${HEADER_FILES})
@@ -55,6 +42,17 @@ target_compile_definitions(SolidDesignerUI
         SOLID_DESIGNER_UI_HOME
 )
 
+
+#-----------------------------------------------------------------------------
+# 头文件搜索路径<private文件夹的引用应该尽限于ALICE内部使用>
+#-----------------------------------------------------------------------------
+target_include_directories(SolidDesignerUI
+  PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/Public
+    ${PROJECT_SOURCE_DIR}/Alice/Core/Foundation/AliceBasicTool/Public
+)
+
 #-----------------------------------------------------------------------------
 # 根据系统及机器位数设置链接的位数
 # 必须放在link之后,否则设置无效
diff --git a/Designer/UIResource/Ribbon/home/data/dark/png/16/erase_not_displayed.png b/Designer/UIResource/Ribbon/home/data/dark/png/16/erase_not_displayed.png
new file mode 100644
index 00000000..d3f38f7c
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/data/dark/png/16/erase_not_displayed.png differ
diff --git a/Designer/UIResource/Ribbon/home/data/dark/png/16/open_last_session.png b/Designer/UIResource/Ribbon/home/data/dark/png/16/open_last_session.png
new file mode 100644
index 00000000..ea251dbd
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/data/dark/png/16/open_last_session.png differ
diff --git a/Designer/UIResource/Ribbon/home/data/dark/png/16/select_working_directory.png b/Designer/UIResource/Ribbon/home/data/dark/png/16/select_working_directory.png
new file mode 100644
index 00000000..a0721b66
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/data/dark/png/16/select_working_directory.png differ
diff --git a/Designer/UIResource/Ribbon/home/data/dark/png/32/erase_not_displayed.png b/Designer/UIResource/Ribbon/home/data/dark/png/32/erase_not_displayed.png
new file mode 100644
index 00000000..95c3fa55
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/data/dark/png/32/erase_not_displayed.png differ
diff --git a/Designer/UIResource/Ribbon/home/data/dark/png/32/open_last_session.png b/Designer/UIResource/Ribbon/home/data/dark/png/32/open_last_session.png
new file mode 100644
index 00000000..b619b6ee
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/data/dark/png/32/open_last_session.png differ
diff --git a/Designer/UIResource/Ribbon/home/data/dark/png/32/select_working_directory.png b/Designer/UIResource/Ribbon/home/data/dark/png/32/select_working_directory.png
new file mode 100644
index 00000000..16097da7
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/data/dark/png/32/select_working_directory.png differ
diff --git a/Designer/UIResource/Ribbon/home/data/dark/png/48/erase_not_displayed.png b/Designer/UIResource/Ribbon/home/data/dark/png/48/erase_not_displayed.png
new file mode 100644
index 00000000..298dac44
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/data/dark/png/48/erase_not_displayed.png differ
diff --git a/Designer/UIResource/Ribbon/home/data/dark/png/48/open_last_session.png b/Designer/UIResource/Ribbon/home/data/dark/png/48/open_last_session.png
new file mode 100644
index 00000000..08f6b033
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/data/dark/png/48/open_last_session.png differ
diff --git a/Designer/UIResource/Ribbon/home/data/dark/png/48/select_working_directory.png b/Designer/UIResource/Ribbon/home/data/dark/png/48/select_working_directory.png
new file mode 100644
index 00000000..d4eea195
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/data/dark/png/48/select_working_directory.png differ
diff --git a/Designer/UIResource/Ribbon/home/data/dark/png/64/erase_not_displayed.png b/Designer/UIResource/Ribbon/home/data/dark/png/64/erase_not_displayed.png
new file mode 100644
index 00000000..3b6acba0
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/data/dark/png/64/erase_not_displayed.png differ
diff --git a/Designer/UIResource/Ribbon/home/data/dark/png/64/open_last_session.png b/Designer/UIResource/Ribbon/home/data/dark/png/64/open_last_session.png
new file mode 100644
index 00000000..0af92299
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/data/dark/png/64/open_last_session.png differ
diff --git a/Designer/UIResource/Ribbon/home/data/dark/png/64/select_working_directory.png b/Designer/UIResource/Ribbon/home/data/dark/png/64/select_working_directory.png
new file mode 100644
index 00000000..c5780133
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/data/dark/png/64/select_working_directory.png differ
diff --git a/Designer/UIResource/Ribbon/home/data/light/png/16/erase_not_displayed.png b/Designer/UIResource/Ribbon/home/data/light/png/16/erase_not_displayed.png
new file mode 100644
index 00000000..3dfc9ff3
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/data/light/png/16/erase_not_displayed.png differ
diff --git a/Designer/UIResource/Ribbon/home/data/light/png/16/open_last_session.png b/Designer/UIResource/Ribbon/home/data/light/png/16/open_last_session.png
new file mode 100644
index 00000000..a8e1eeb1
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/data/light/png/16/open_last_session.png differ
diff --git a/Designer/UIResource/Ribbon/home/data/light/png/16/select_working_directory.png b/Designer/UIResource/Ribbon/home/data/light/png/16/select_working_directory.png
new file mode 100644
index 00000000..f370b78f
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/data/light/png/16/select_working_directory.png differ
diff --git a/Designer/UIResource/Ribbon/home/data/light/png/32/erase_not_displayed.png b/Designer/UIResource/Ribbon/home/data/light/png/32/erase_not_displayed.png
new file mode 100644
index 00000000..3d0c922c
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/data/light/png/32/erase_not_displayed.png differ
diff --git a/Designer/UIResource/Ribbon/home/data/light/png/32/open_last_session.png b/Designer/UIResource/Ribbon/home/data/light/png/32/open_last_session.png
new file mode 100644
index 00000000..2e53463c
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/data/light/png/32/open_last_session.png differ
diff --git a/Designer/UIResource/Ribbon/home/data/light/png/32/select_working_directory.png b/Designer/UIResource/Ribbon/home/data/light/png/32/select_working_directory.png
new file mode 100644
index 00000000..efe43b64
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/data/light/png/32/select_working_directory.png differ
diff --git a/Designer/UIResource/Ribbon/home/data/light/png/48/erase_not_displayed.png b/Designer/UIResource/Ribbon/home/data/light/png/48/erase_not_displayed.png
new file mode 100644
index 00000000..2ce1cad0
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/data/light/png/48/erase_not_displayed.png differ
diff --git a/Designer/UIResource/Ribbon/home/data/light/png/48/open_last_session.png b/Designer/UIResource/Ribbon/home/data/light/png/48/open_last_session.png
new file mode 100644
index 00000000..734f62da
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/data/light/png/48/open_last_session.png differ
diff --git a/Designer/UIResource/Ribbon/home/data/light/png/48/select_working_directory.png b/Designer/UIResource/Ribbon/home/data/light/png/48/select_working_directory.png
new file mode 100644
index 00000000..103a71b6
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/data/light/png/48/select_working_directory.png differ
diff --git a/Designer/UIResource/Ribbon/home/data/light/png/64/erase_not_displayed.png b/Designer/UIResource/Ribbon/home/data/light/png/64/erase_not_displayed.png
new file mode 100644
index 00000000..99578350
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/data/light/png/64/erase_not_displayed.png differ
diff --git a/Designer/UIResource/Ribbon/home/data/light/png/64/open_last_session.png b/Designer/UIResource/Ribbon/home/data/light/png/64/open_last_session.png
new file mode 100644
index 00000000..12efaa55
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/data/light/png/64/open_last_session.png differ
diff --git a/Designer/UIResource/Ribbon/home/data/light/png/64/select_working_directory.png b/Designer/UIResource/Ribbon/home/data/light/png/64/select_working_directory.png
new file mode 100644
index 00000000..e7945882
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/data/light/png/64/select_working_directory.png differ
diff --git a/Designer/UIResource/Ribbon/home/settings/dark/png/16/model_display.png b/Designer/UIResource/Ribbon/home/settings/dark/png/16/model_display.png
new file mode 100644
index 00000000..3f75dadc
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/settings/dark/png/16/model_display.png differ
diff --git a/Designer/UIResource/Ribbon/home/settings/dark/png/16/system_appearance.png b/Designer/UIResource/Ribbon/home/settings/dark/png/16/system_appearance.png
new file mode 100644
index 00000000..3bae4d3a
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/settings/dark/png/16/system_appearance.png differ
diff --git a/Designer/UIResource/Ribbon/home/settings/dark/png/32/model_display.png b/Designer/UIResource/Ribbon/home/settings/dark/png/32/model_display.png
new file mode 100644
index 00000000..75f58d3a
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/settings/dark/png/32/model_display.png differ
diff --git a/Designer/UIResource/Ribbon/home/settings/dark/png/32/system_appearance.png b/Designer/UIResource/Ribbon/home/settings/dark/png/32/system_appearance.png
new file mode 100644
index 00000000..45ff6a22
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/settings/dark/png/32/system_appearance.png differ
diff --git a/Designer/UIResource/Ribbon/home/settings/dark/png/48/model_display.png b/Designer/UIResource/Ribbon/home/settings/dark/png/48/model_display.png
new file mode 100644
index 00000000..1fb2ff46
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/settings/dark/png/48/model_display.png differ
diff --git a/Designer/UIResource/Ribbon/home/settings/dark/png/48/system_appearance.png b/Designer/UIResource/Ribbon/home/settings/dark/png/48/system_appearance.png
new file mode 100644
index 00000000..57190280
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/settings/dark/png/48/system_appearance.png differ
diff --git a/Designer/UIResource/Ribbon/home/settings/dark/png/64/model_display.png b/Designer/UIResource/Ribbon/home/settings/dark/png/64/model_display.png
new file mode 100644
index 00000000..391787ea
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/settings/dark/png/64/model_display.png differ
diff --git a/Designer/UIResource/Ribbon/home/settings/dark/png/64/system_appearance.png b/Designer/UIResource/Ribbon/home/settings/dark/png/64/system_appearance.png
new file mode 100644
index 00000000..7299d2da
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/settings/dark/png/64/system_appearance.png differ
diff --git a/Designer/UIResource/Ribbon/home/settings/light/png/16/model_display.png b/Designer/UIResource/Ribbon/home/settings/light/png/16/model_display.png
new file mode 100644
index 00000000..d342ea2c
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/settings/light/png/16/model_display.png differ
diff --git a/Designer/UIResource/Ribbon/home/settings/light/png/16/system_appearance.png b/Designer/UIResource/Ribbon/home/settings/light/png/16/system_appearance.png
new file mode 100644
index 00000000..e084bc43
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/settings/light/png/16/system_appearance.png differ
diff --git a/Designer/UIResource/Ribbon/home/settings/light/png/32/model_display.png b/Designer/UIResource/Ribbon/home/settings/light/png/32/model_display.png
new file mode 100644
index 00000000..01b50f4a
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/settings/light/png/32/model_display.png differ
diff --git a/Designer/UIResource/Ribbon/home/settings/light/png/32/system_appearance.png b/Designer/UIResource/Ribbon/home/settings/light/png/32/system_appearance.png
new file mode 100644
index 00000000..069039cb
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/settings/light/png/32/system_appearance.png differ
diff --git a/Designer/UIResource/Ribbon/home/settings/light/png/48/model_display.png b/Designer/UIResource/Ribbon/home/settings/light/png/48/model_display.png
new file mode 100644
index 00000000..a6b7fd68
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/settings/light/png/48/model_display.png differ
diff --git a/Designer/UIResource/Ribbon/home/settings/light/png/48/system_appearance.png b/Designer/UIResource/Ribbon/home/settings/light/png/48/system_appearance.png
new file mode 100644
index 00000000..ae7310cc
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/settings/light/png/48/system_appearance.png differ
diff --git a/Designer/UIResource/Ribbon/home/settings/light/png/64/model_display.png b/Designer/UIResource/Ribbon/home/settings/light/png/64/model_display.png
new file mode 100644
index 00000000..7ce22437
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/settings/light/png/64/model_display.png differ
diff --git a/Designer/UIResource/Ribbon/home/settings/light/png/64/system_appearance.png b/Designer/UIResource/Ribbon/home/settings/light/png/64/system_appearance.png
new file mode 100644
index 00000000..73e0a7ad
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/settings/light/png/64/system_appearance.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/dark/png/16/auxiliary_applications.png b/Designer/UIResource/Ribbon/home/utilities/dark/png/16/auxiliary_applications.png
new file mode 100644
index 00000000..a01df50e
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/dark/png/16/auxiliary_applications.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/dark/png/16/distributed_computing.png b/Designer/UIResource/Ribbon/home/utilities/dark/png/16/distributed_computing.png
new file mode 100644
index 00000000..60b4f974
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/dark/png/16/distributed_computing.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/dark/png/16/nc_post_processor.png b/Designer/UIResource/Ribbon/home/utilities/dark/png/16/nc_post_processor.png
new file mode 100644
index 00000000..74813cef
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/dark/png/16/nc_post_processor.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/dark/png/16/play_trail_file.png b/Designer/UIResource/Ribbon/home/utilities/dark/png/16/play_trail_file.png
new file mode 100644
index 00000000..46c91919
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/dark/png/16/play_trail_file.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/dark/png/16/simulate_results.png b/Designer/UIResource/Ribbon/home/utilities/dark/png/16/simulate_results.png
new file mode 100644
index 00000000..15b3c41e
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/dark/png/16/simulate_results.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/dark/png/32/auxiliary_applications.png b/Designer/UIResource/Ribbon/home/utilities/dark/png/32/auxiliary_applications.png
new file mode 100644
index 00000000..a97816f8
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/dark/png/32/auxiliary_applications.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/dark/png/32/distributed_computing.png b/Designer/UIResource/Ribbon/home/utilities/dark/png/32/distributed_computing.png
new file mode 100644
index 00000000..3851b522
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/dark/png/32/distributed_computing.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/dark/png/32/nc_post_processor.png b/Designer/UIResource/Ribbon/home/utilities/dark/png/32/nc_post_processor.png
new file mode 100644
index 00000000..164e141e
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/dark/png/32/nc_post_processor.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/dark/png/32/play_trail_file.png b/Designer/UIResource/Ribbon/home/utilities/dark/png/32/play_trail_file.png
new file mode 100644
index 00000000..de19f32a
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/dark/png/32/play_trail_file.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/dark/png/32/simulate_results.png b/Designer/UIResource/Ribbon/home/utilities/dark/png/32/simulate_results.png
new file mode 100644
index 00000000..fcc30458
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/dark/png/32/simulate_results.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/dark/png/48/auxiliary_applications.png b/Designer/UIResource/Ribbon/home/utilities/dark/png/48/auxiliary_applications.png
new file mode 100644
index 00000000..3dd343d6
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/dark/png/48/auxiliary_applications.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/dark/png/48/distributed_computing.png b/Designer/UIResource/Ribbon/home/utilities/dark/png/48/distributed_computing.png
new file mode 100644
index 00000000..1b00efb9
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/dark/png/48/distributed_computing.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/dark/png/48/nc_post_processor.png b/Designer/UIResource/Ribbon/home/utilities/dark/png/48/nc_post_processor.png
new file mode 100644
index 00000000..f63fc4b8
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/dark/png/48/nc_post_processor.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/dark/png/48/play_trail_file.png b/Designer/UIResource/Ribbon/home/utilities/dark/png/48/play_trail_file.png
new file mode 100644
index 00000000..228d6e4a
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/dark/png/48/play_trail_file.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/dark/png/48/simulate_results.png b/Designer/UIResource/Ribbon/home/utilities/dark/png/48/simulate_results.png
new file mode 100644
index 00000000..a00d23e2
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/dark/png/48/simulate_results.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/dark/png/64/auxiliary_applications.png b/Designer/UIResource/Ribbon/home/utilities/dark/png/64/auxiliary_applications.png
new file mode 100644
index 00000000..dae66c74
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/dark/png/64/auxiliary_applications.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/dark/png/64/distributed_computing.png b/Designer/UIResource/Ribbon/home/utilities/dark/png/64/distributed_computing.png
new file mode 100644
index 00000000..b1c8ef65
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/dark/png/64/distributed_computing.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/dark/png/64/nc_post_processor.png b/Designer/UIResource/Ribbon/home/utilities/dark/png/64/nc_post_processor.png
new file mode 100644
index 00000000..d83889c6
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/dark/png/64/nc_post_processor.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/dark/png/64/play_trail_file.png b/Designer/UIResource/Ribbon/home/utilities/dark/png/64/play_trail_file.png
new file mode 100644
index 00000000..3ea0f6a8
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/dark/png/64/play_trail_file.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/dark/png/64/simulate_results.png b/Designer/UIResource/Ribbon/home/utilities/dark/png/64/simulate_results.png
new file mode 100644
index 00000000..a4fb23be
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/dark/png/64/simulate_results.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/light/png/16/auxiliary_applications.png b/Designer/UIResource/Ribbon/home/utilities/light/png/16/auxiliary_applications.png
new file mode 100644
index 00000000..745c1a18
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/light/png/16/auxiliary_applications.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/light/png/16/distributed_computing.png b/Designer/UIResource/Ribbon/home/utilities/light/png/16/distributed_computing.png
new file mode 100644
index 00000000..e7dc61a8
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/light/png/16/distributed_computing.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/light/png/16/nc_post_processor.png b/Designer/UIResource/Ribbon/home/utilities/light/png/16/nc_post_processor.png
new file mode 100644
index 00000000..c0034243
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/light/png/16/nc_post_processor.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/light/png/16/play_trail_file.png b/Designer/UIResource/Ribbon/home/utilities/light/png/16/play_trail_file.png
new file mode 100644
index 00000000..26d10535
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/light/png/16/play_trail_file.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/light/png/16/simulate_results.png b/Designer/UIResource/Ribbon/home/utilities/light/png/16/simulate_results.png
new file mode 100644
index 00000000..a7137232
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/light/png/16/simulate_results.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/light/png/32/auxiliary_applications.png b/Designer/UIResource/Ribbon/home/utilities/light/png/32/auxiliary_applications.png
new file mode 100644
index 00000000..2915e7c7
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/light/png/32/auxiliary_applications.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/light/png/32/distributed_computing.png b/Designer/UIResource/Ribbon/home/utilities/light/png/32/distributed_computing.png
new file mode 100644
index 00000000..3f2a27db
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/light/png/32/distributed_computing.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/light/png/32/nc_post_processor.png b/Designer/UIResource/Ribbon/home/utilities/light/png/32/nc_post_processor.png
new file mode 100644
index 00000000..7043f9b6
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/light/png/32/nc_post_processor.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/light/png/32/play_trail_file.png b/Designer/UIResource/Ribbon/home/utilities/light/png/32/play_trail_file.png
new file mode 100644
index 00000000..8d88e172
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/light/png/32/play_trail_file.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/light/png/32/simulate_results.png b/Designer/UIResource/Ribbon/home/utilities/light/png/32/simulate_results.png
new file mode 100644
index 00000000..b1be2473
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/light/png/32/simulate_results.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/light/png/48/auxiliary_applications.png b/Designer/UIResource/Ribbon/home/utilities/light/png/48/auxiliary_applications.png
new file mode 100644
index 00000000..69582011
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/light/png/48/auxiliary_applications.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/light/png/48/distributed_computing.png b/Designer/UIResource/Ribbon/home/utilities/light/png/48/distributed_computing.png
new file mode 100644
index 00000000..c9d4e6d8
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/light/png/48/distributed_computing.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/light/png/48/nc_post_processor.png b/Designer/UIResource/Ribbon/home/utilities/light/png/48/nc_post_processor.png
new file mode 100644
index 00000000..e04fe0c0
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/light/png/48/nc_post_processor.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/light/png/48/play_trail_file.png b/Designer/UIResource/Ribbon/home/utilities/light/png/48/play_trail_file.png
new file mode 100644
index 00000000..8a6ed719
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/light/png/48/play_trail_file.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/light/png/48/simulate_results.png b/Designer/UIResource/Ribbon/home/utilities/light/png/48/simulate_results.png
new file mode 100644
index 00000000..379ae2f9
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/light/png/48/simulate_results.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/light/png/64/auxiliary_applications.png b/Designer/UIResource/Ribbon/home/utilities/light/png/64/auxiliary_applications.png
new file mode 100644
index 00000000..5a94bd89
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/light/png/64/auxiliary_applications.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/light/png/64/distributed_computing.png b/Designer/UIResource/Ribbon/home/utilities/light/png/64/distributed_computing.png
new file mode 100644
index 00000000..89cad1b8
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/light/png/64/distributed_computing.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/light/png/64/nc_post_processor.png b/Designer/UIResource/Ribbon/home/utilities/light/png/64/nc_post_processor.png
new file mode 100644
index 00000000..99ae54cd
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/light/png/64/nc_post_processor.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/light/png/64/play_trail_file.png b/Designer/UIResource/Ribbon/home/utilities/light/png/64/play_trail_file.png
new file mode 100644
index 00000000..967f1504
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/light/png/64/play_trail_file.png differ
diff --git a/Designer/UIResource/Ribbon/home/utilities/light/png/64/simulate_results.png b/Designer/UIResource/Ribbon/home/utilities/light/png/64/simulate_results.png
new file mode 100644
index 00000000..b78c9cca
Binary files /dev/null and b/Designer/UIResource/Ribbon/home/utilities/light/png/64/simulate_results.png differ
diff --git a/Designer/UIResource/Ribbon/ribbon.qrc b/Designer/UIResource/Ribbon/ribbon.qrc
new file mode 100644
index 00000000..0ced2e86
--- /dev/null
+++ b/Designer/UIResource/Ribbon/ribbon.qrc
@@ -0,0 +1,65 @@
+<RCC>
+  <qresource prefix="/Ribbon">
+    <file>home/data/light/png/16/open_last_session.png</file>
+    <file>home/data/light/png/16/select_working_directory.png</file>
+    <file>home/data/light/png/16/erase_not_displayed.png</file>
+    <file>home/data/light/png/32/open_last_session.png</file>
+    <file>home/data/light/png/32/select_working_directory.png</file>
+    <file>home/data/light/png/32/erase_not_displayed.png</file>
+    <file>home/data/light/png/48/open_last_session.png</file>
+    <file>home/data/light/png/48/select_working_directory.png</file>
+    <file>home/data/light/png/48/erase_not_displayed.png</file>
+    <file>home/data/light/png/64/open_last_session.png</file>
+    <file>home/data/light/png/64/select_working_directory.png</file>
+    <file>home/data/light/png/64/erase_not_displayed.png</file>
+    
+    <file>home/data/dark/png/16/open_last_session.png</file>
+    <file>home/data/dark/png/16/select_working_directory.png</file>
+    <file>home/data/dark/png/16/erase_not_displayed.png</file>
+    <file>home/data/dark/png/32/open_last_session.png</file>
+    <file>home/data/dark/png/32/select_working_directory.png</file>
+    <file>home/data/dark/png/32/erase_not_displayed.png</file>
+    <file>home/data/dark/png/48/open_last_session.png</file>
+    <file>home/data/dark/png/48/select_working_directory.png</file>
+    <file>home/data/dark/png/48/erase_not_displayed.png</file>
+    <file>home/data/dark/png/64/open_last_session.png</file>
+    <file>home/data/dark/png/64/select_working_directory.png</file>
+    <file>home/data/dark/png/64/erase_not_displayed.png</file>
+    
+    <file>home/settings/light/png/16/model_display.png</file>
+    <file>home/settings/light/png/16/system_appearance.png</file>
+    <file>home/settings/light/png/32/model_display.png</file>
+    <file>home/settings/light/png/32/system_appearance.png</file>
+    <file>home/settings/light/png/48/model_display.png</file>
+    <file>home/settings/light/png/48/system_appearance.png</file>
+    <file>home/settings/light/png/64/model_display.png</file>
+    <file>home/settings/light/png/64/system_appearance.png</file>
+    <file>home/settings/dark/png/16/model_display.png</file>
+    <file>home/settings/dark/png/16/system_appearance.png</file>
+    <file>home/settings/dark/png/32/model_display.png</file>
+    <file>home/settings/dark/png/32/system_appearance.png</file>
+    <file>home/settings/dark/png/48/model_display.png</file>
+    <file>home/settings/dark/png/48/system_appearance.png</file>
+    <file>home/settings/dark/png/64/model_display.png</file>
+    <file>home/settings/dark/png/64/system_appearance.png</file>
+    
+    <file>home/utilities/light/png/16/play_trail_file.png</file>
+    <file>home/utilities/light/png/32/play_trail_file.png</file>
+    <file>home/utilities/light/png/48/play_trail_file.png</file>
+    <file>home/utilities/light/png/64/play_trail_file.png</file>
+    <file>home/utilities/dark/png/16/play_trail_file.png</file>
+    <file>home/utilities/dark/png/32/play_trail_file.png</file>
+    <file>home/utilities/dark/png/48/play_trail_file.png</file>
+    <file>home/utilities/dark/png/64/play_trail_file.png</file>
+    
+    <file>home/utilities/light/png/16/auxiliary_applications.png</file>
+    <file>home/utilities/light/png/32/auxiliary_applications.png</file>
+    <file>home/utilities/light/png/48/auxiliary_applications.png</file>
+    <file>home/utilities/light/png/64/auxiliary_applications.png</file>
+    <file>home/utilities/dark/png/16/auxiliary_applications.png</file>
+    <file>home/utilities/dark/png/32/auxiliary_applications.png</file>
+    <file>home/utilities/dark/png/48/auxiliary_applications.png</file>
+    <file>home/utilities/dark/png/64/auxiliary_applications.png</file>
+    
+  </qresource>
+</RCC>
\ No newline at end of file
diff --git a/Designer/UIResource/TitleBar/brand/dark/png/16/app.png b/Designer/UIResource/TitleBar/brand/dark/png/16/app.png
new file mode 100644
index 00000000..0c874032
Binary files /dev/null and b/Designer/UIResource/TitleBar/brand/dark/png/16/app.png differ
diff --git a/Designer/UIResource/TitleBar/brand/dark/png/32/app.png b/Designer/UIResource/TitleBar/brand/dark/png/32/app.png
new file mode 100644
index 00000000..7a868914
Binary files /dev/null and b/Designer/UIResource/TitleBar/brand/dark/png/32/app.png differ
diff --git a/Designer/UIResource/TitleBar/brand/dark/png/48/app.png b/Designer/UIResource/TitleBar/brand/dark/png/48/app.png
new file mode 100644
index 00000000..70a2126e
Binary files /dev/null and b/Designer/UIResource/TitleBar/brand/dark/png/48/app.png differ
diff --git a/Designer/UIResource/TitleBar/brand/dark/png/64/app.png b/Designer/UIResource/TitleBar/brand/dark/png/64/app.png
new file mode 100644
index 00000000..a92d1002
Binary files /dev/null and b/Designer/UIResource/TitleBar/brand/dark/png/64/app.png differ
diff --git a/Designer/UIResource/TitleBar/brand/light/png/16/app.png b/Designer/UIResource/TitleBar/brand/light/png/16/app.png
new file mode 100644
index 00000000..b41ece2f
Binary files /dev/null and b/Designer/UIResource/TitleBar/brand/light/png/16/app.png differ
diff --git a/Designer/UIResource/TitleBar/brand/light/png/32/app.png b/Designer/UIResource/TitleBar/brand/light/png/32/app.png
new file mode 100644
index 00000000..7c65e058
Binary files /dev/null and b/Designer/UIResource/TitleBar/brand/light/png/32/app.png differ
diff --git a/Designer/UIResource/TitleBar/brand/light/png/48/app.png b/Designer/UIResource/TitleBar/brand/light/png/48/app.png
new file mode 100644
index 00000000..cfb248b8
Binary files /dev/null and b/Designer/UIResource/TitleBar/brand/light/png/48/app.png differ
diff --git a/Designer/UIResource/TitleBar/brand/light/png/64/app.png b/Designer/UIResource/TitleBar/brand/light/png/64/app.png
new file mode 100644
index 00000000..4e801817
Binary files /dev/null and b/Designer/UIResource/TitleBar/brand/light/png/64/app.png differ
diff --git a/Designer/UIResource/TitleBar/brand/sd_mark_16.svg b/Designer/UIResource/TitleBar/brand/sd_mark_16.svg
deleted file mode 100644
index 3c34108c..00000000
--- a/Designer/UIResource/TitleBar/brand/sd_mark_16.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- icons/brand/sd_mark_16.svg -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="16" height="16" viewBox="0 0 16 16">
-  <defs>
-    <linearGradient id="sd_grad_blue_green" x1="0" y1="16" x2="16" y2="0" gradientUnits="userSpaceOnUse">
-      <stop offset="0%"  stop-color="#0B63CE"/>
-      <stop offset="50%" stop-color="#00A4E8"/>
-      <stop offset="100%" stop-color="#20B15A"/>
-    </linearGradient>
-  </defs>
-
-  <!-- 外部等边三角形轮廓 -->
-  <path d="M8 1.3 L14.2 13.5 H1.8 Z"
-        fill="none"
-        stroke="#051726"
-        stroke-width="0.9"
-        stroke-linejoin="round"/>
-
-  <!-- 左侧蓝色条 -->
-  <path d="M8 1.6 L4.0 9.6 L2.2 13.0 L1.8 13.5 L5.8 13.5 Z"
-        fill="#0B63CE"/>
-
-  <!-- 右侧绿色条 -->
-  <path d="M8 1.6 L10.3 6.2 L13.0 11.5 L14.2 13.5 H10.6 Z"
-        fill="#20B15A"/>
-
-  <!-- 底部过渡条（蓝→绿渐变） -->
-  <path d="M5.8 13.5 H10.6 L9.1 10.4 L8 8.2 L6.7 10.7 Z"
-        fill="url(#sd_grad_blue_green)"/>
-</svg>
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/16/customize.png b/Designer/UIResource/TitleBar/quick/dark/png/16/customize.png
new file mode 100644
index 00000000..6c8faae8
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/16/customize.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/16/new.png b/Designer/UIResource/TitleBar/quick/dark/png/16/new.png
new file mode 100644
index 00000000..ac2532a5
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/16/new.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/16/open.png b/Designer/UIResource/TitleBar/quick/dark/png/16/open.png
new file mode 100644
index 00000000..d908c7e6
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/16/open.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/16/qat.png b/Designer/UIResource/TitleBar/quick/dark/png/16/qat.png
new file mode 100644
index 00000000..37853be0
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/16/qat.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/16/redo.png b/Designer/UIResource/TitleBar/quick/dark/png/16/redo.png
new file mode 100644
index 00000000..2587f754
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/16/redo.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/16/regenerate.png b/Designer/UIResource/TitleBar/quick/dark/png/16/regenerate.png
new file mode 100644
index 00000000..6c8faae8
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/16/regenerate.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/16/save.png b/Designer/UIResource/TitleBar/quick/dark/png/16/save.png
new file mode 100644
index 00000000..9f296476
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/16/save.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/16/undo.png b/Designer/UIResource/TitleBar/quick/dark/png/16/undo.png
new file mode 100644
index 00000000..f7154af0
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/16/undo.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/16/windows.png b/Designer/UIResource/TitleBar/quick/dark/png/16/windows.png
new file mode 100644
index 00000000..f9ed430d
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/16/windows.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/32/customize.png b/Designer/UIResource/TitleBar/quick/dark/png/32/customize.png
new file mode 100644
index 00000000..208a908d
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/32/customize.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/32/new.png b/Designer/UIResource/TitleBar/quick/dark/png/32/new.png
new file mode 100644
index 00000000..f52186b6
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/32/new.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/32/open.png b/Designer/UIResource/TitleBar/quick/dark/png/32/open.png
new file mode 100644
index 00000000..75035c4f
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/32/open.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/32/qat.png b/Designer/UIResource/TitleBar/quick/dark/png/32/qat.png
new file mode 100644
index 00000000..4a810300
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/32/qat.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/32/redo.png b/Designer/UIResource/TitleBar/quick/dark/png/32/redo.png
new file mode 100644
index 00000000..66173833
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/32/redo.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/32/regenerate.png b/Designer/UIResource/TitleBar/quick/dark/png/32/regenerate.png
new file mode 100644
index 00000000..208a908d
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/32/regenerate.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/32/save.png b/Designer/UIResource/TitleBar/quick/dark/png/32/save.png
new file mode 100644
index 00000000..e1bf55bf
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/32/save.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/32/undo.png b/Designer/UIResource/TitleBar/quick/dark/png/32/undo.png
new file mode 100644
index 00000000..72b6a837
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/32/undo.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/32/windows.png b/Designer/UIResource/TitleBar/quick/dark/png/32/windows.png
new file mode 100644
index 00000000..b226f6a1
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/32/windows.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/48/customize.png b/Designer/UIResource/TitleBar/quick/dark/png/48/customize.png
new file mode 100644
index 00000000..5ea8f2ed
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/48/customize.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/48/new.png b/Designer/UIResource/TitleBar/quick/dark/png/48/new.png
new file mode 100644
index 00000000..f781e43e
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/48/new.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/48/open.png b/Designer/UIResource/TitleBar/quick/dark/png/48/open.png
new file mode 100644
index 00000000..fa906c96
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/48/open.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/48/qat.png b/Designer/UIResource/TitleBar/quick/dark/png/48/qat.png
new file mode 100644
index 00000000..fd6d5a0c
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/48/qat.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/48/redo.png b/Designer/UIResource/TitleBar/quick/dark/png/48/redo.png
new file mode 100644
index 00000000..f452e445
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/48/redo.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/48/regenerate.png b/Designer/UIResource/TitleBar/quick/dark/png/48/regenerate.png
new file mode 100644
index 00000000..5ea8f2ed
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/48/regenerate.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/48/save.png b/Designer/UIResource/TitleBar/quick/dark/png/48/save.png
new file mode 100644
index 00000000..a6e93d84
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/48/save.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/48/undo.png b/Designer/UIResource/TitleBar/quick/dark/png/48/undo.png
new file mode 100644
index 00000000..0c36165a
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/48/undo.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/48/windows.png b/Designer/UIResource/TitleBar/quick/dark/png/48/windows.png
new file mode 100644
index 00000000..17944183
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/48/windows.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/64/customize.png b/Designer/UIResource/TitleBar/quick/dark/png/64/customize.png
new file mode 100644
index 00000000..32497fe2
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/64/customize.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/64/new.png b/Designer/UIResource/TitleBar/quick/dark/png/64/new.png
new file mode 100644
index 00000000..02c13e48
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/64/new.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/64/open.png b/Designer/UIResource/TitleBar/quick/dark/png/64/open.png
new file mode 100644
index 00000000..873bcc56
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/64/open.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/64/qat.png b/Designer/UIResource/TitleBar/quick/dark/png/64/qat.png
new file mode 100644
index 00000000..3217fcf7
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/64/qat.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/64/redo.png b/Designer/UIResource/TitleBar/quick/dark/png/64/redo.png
new file mode 100644
index 00000000..442b9a79
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/64/redo.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/64/regenerate.png b/Designer/UIResource/TitleBar/quick/dark/png/64/regenerate.png
new file mode 100644
index 00000000..32497fe2
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/64/regenerate.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/64/save.png b/Designer/UIResource/TitleBar/quick/dark/png/64/save.png
new file mode 100644
index 00000000..18bc83d5
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/64/save.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/64/undo.png b/Designer/UIResource/TitleBar/quick/dark/png/64/undo.png
new file mode 100644
index 00000000..4700d88c
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/64/undo.png differ
diff --git a/Designer/UIResource/TitleBar/quick/dark/png/64/windows.png b/Designer/UIResource/TitleBar/quick/dark/png/64/windows.png
new file mode 100644
index 00000000..04c47f5e
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/dark/png/64/windows.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/16/customize.png b/Designer/UIResource/TitleBar/quick/light/png/16/customize.png
new file mode 100644
index 00000000..e2f2b3c7
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/16/customize.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/16/new.png b/Designer/UIResource/TitleBar/quick/light/png/16/new.png
new file mode 100644
index 00000000..e8123b74
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/16/new.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/16/open.png b/Designer/UIResource/TitleBar/quick/light/png/16/open.png
new file mode 100644
index 00000000..29a1c134
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/16/open.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/16/qat.png b/Designer/UIResource/TitleBar/quick/light/png/16/qat.png
new file mode 100644
index 00000000..362fdbfc
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/16/qat.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/16/redo.png b/Designer/UIResource/TitleBar/quick/light/png/16/redo.png
new file mode 100644
index 00000000..a8d9badb
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/16/redo.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/16/regenerate.png b/Designer/UIResource/TitleBar/quick/light/png/16/regenerate.png
new file mode 100644
index 00000000..e2f2b3c7
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/16/regenerate.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/16/save.png b/Designer/UIResource/TitleBar/quick/light/png/16/save.png
new file mode 100644
index 00000000..b543e450
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/16/save.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/16/undo.png b/Designer/UIResource/TitleBar/quick/light/png/16/undo.png
new file mode 100644
index 00000000..57e4bcdf
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/16/undo.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/16/windows.png b/Designer/UIResource/TitleBar/quick/light/png/16/windows.png
new file mode 100644
index 00000000..63cc8916
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/16/windows.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/32/customize.png b/Designer/UIResource/TitleBar/quick/light/png/32/customize.png
new file mode 100644
index 00000000..ee828a0c
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/32/customize.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/32/new.png b/Designer/UIResource/TitleBar/quick/light/png/32/new.png
new file mode 100644
index 00000000..3117043c
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/32/new.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/32/open.png b/Designer/UIResource/TitleBar/quick/light/png/32/open.png
new file mode 100644
index 00000000..1caccf74
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/32/open.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/32/qat.png b/Designer/UIResource/TitleBar/quick/light/png/32/qat.png
new file mode 100644
index 00000000..24e248cf
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/32/qat.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/32/redo.png b/Designer/UIResource/TitleBar/quick/light/png/32/redo.png
new file mode 100644
index 00000000..10fb0c0b
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/32/redo.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/32/regenerate.png b/Designer/UIResource/TitleBar/quick/light/png/32/regenerate.png
new file mode 100644
index 00000000..ee828a0c
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/32/regenerate.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/32/save.png b/Designer/UIResource/TitleBar/quick/light/png/32/save.png
new file mode 100644
index 00000000..9bccd6fe
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/32/save.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/32/undo.png b/Designer/UIResource/TitleBar/quick/light/png/32/undo.png
new file mode 100644
index 00000000..768cc16b
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/32/undo.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/32/windows.png b/Designer/UIResource/TitleBar/quick/light/png/32/windows.png
new file mode 100644
index 00000000..4f329c6e
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/32/windows.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/48/customize.png b/Designer/UIResource/TitleBar/quick/light/png/48/customize.png
new file mode 100644
index 00000000..8d6305c1
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/48/customize.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/48/new.png b/Designer/UIResource/TitleBar/quick/light/png/48/new.png
new file mode 100644
index 00000000..5a4f1416
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/48/new.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/48/open.png b/Designer/UIResource/TitleBar/quick/light/png/48/open.png
new file mode 100644
index 00000000..fc06d9d0
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/48/open.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/48/qat.png b/Designer/UIResource/TitleBar/quick/light/png/48/qat.png
new file mode 100644
index 00000000..24173c45
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/48/qat.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/48/redo.png b/Designer/UIResource/TitleBar/quick/light/png/48/redo.png
new file mode 100644
index 00000000..f7f9133b
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/48/redo.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/48/regenerate.png b/Designer/UIResource/TitleBar/quick/light/png/48/regenerate.png
new file mode 100644
index 00000000..8d6305c1
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/48/regenerate.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/48/save.png b/Designer/UIResource/TitleBar/quick/light/png/48/save.png
new file mode 100644
index 00000000..6fb9ed0c
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/48/save.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/48/undo.png b/Designer/UIResource/TitleBar/quick/light/png/48/undo.png
new file mode 100644
index 00000000..b66d8846
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/48/undo.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/48/windows.png b/Designer/UIResource/TitleBar/quick/light/png/48/windows.png
new file mode 100644
index 00000000..280ef0e3
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/48/windows.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/64/customize.png b/Designer/UIResource/TitleBar/quick/light/png/64/customize.png
new file mode 100644
index 00000000..270d9c6b
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/64/customize.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/64/new.png b/Designer/UIResource/TitleBar/quick/light/png/64/new.png
new file mode 100644
index 00000000..0258969e
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/64/new.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/64/open.png b/Designer/UIResource/TitleBar/quick/light/png/64/open.png
new file mode 100644
index 00000000..a02e58cd
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/64/open.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/64/qat.png b/Designer/UIResource/TitleBar/quick/light/png/64/qat.png
new file mode 100644
index 00000000..23b95f63
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/64/qat.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/64/redo.png b/Designer/UIResource/TitleBar/quick/light/png/64/redo.png
new file mode 100644
index 00000000..2c8b7d1d
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/64/redo.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/64/regenerate.png b/Designer/UIResource/TitleBar/quick/light/png/64/regenerate.png
new file mode 100644
index 00000000..270d9c6b
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/64/regenerate.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/64/save.png b/Designer/UIResource/TitleBar/quick/light/png/64/save.png
new file mode 100644
index 00000000..84e1af52
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/64/save.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/64/undo.png b/Designer/UIResource/TitleBar/quick/light/png/64/undo.png
new file mode 100644
index 00000000..c7f3692a
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/64/undo.png differ
diff --git a/Designer/UIResource/TitleBar/quick/light/png/64/windows.png b/Designer/UIResource/TitleBar/quick/light/png/64/windows.png
new file mode 100644
index 00000000..4b916489
Binary files /dev/null and b/Designer/UIResource/TitleBar/quick/light/png/64/windows.png differ
diff --git a/Designer/UIResource/TitleBar/titlebar.qrc b/Designer/UIResource/TitleBar/titlebar.qrc
new file mode 100644
index 00000000..4bef34e0
--- /dev/null
+++ b/Designer/UIResource/TitleBar/titlebar.qrc
@@ -0,0 +1,114 @@
+<RCC>
+<qresource prefix="/TitleBar">
+    <file>brand/light/png/16/app.png</file>
+    <file>brand/light/png/32/app.png</file>
+    <file>brand/light/png/48/app.png</file>
+    <file>brand/light/png/64/app.png</file>
+    <file>brand/dark/png/16/app.png</file>
+    <file>brand/dark/png/32/app.png</file>
+    <file>brand/dark/png/48/app.png</file>
+    <file>brand/dark/png/64/app.png</file>
+
+    <file>quick/light/png/16/new.png</file>
+    <file>quick/light/png/32/new.png</file>
+    <file>quick/light/png/48/new.png</file>
+    <file>quick/light/png/64/new.png</file>
+    <file>quick/dark/png/16/new.png</file>
+    <file>quick/dark/png/32/new.png</file>
+    <file>quick/dark/png/48/new.png</file>
+    <file>quick/dark/png/64/new.png</file>
+
+    <file>quick/light/png/16/open.png</file>
+    <file>quick/light/png/32/open.png</file>
+    <file>quick/light/png/48/open.png</file>
+    <file>quick/light/png/64/open.png</file>
+    <file>quick/dark/png/16/open.png</file>
+    <file>quick/dark/png/32/open.png</file>
+    <file>quick/dark/png/48/open.png</file>
+    <file>quick/dark/png/64/open.png</file>
+
+    <file>quick/light/png/16/save.png</file>
+    <file>quick/light/png/32/save.png</file>
+    <file>quick/light/png/48/save.png</file>
+    <file>quick/light/png/64/save.png</file>
+    <file>quick/dark/png/16/save.png</file>
+    <file>quick/dark/png/32/save.png</file>
+    <file>quick/dark/png/48/save.png</file>
+    <file>quick/dark/png/64/save.png</file>
+
+    <file>quick/light/png/16/undo.png</file>
+    <file>quick/light/png/32/undo.png</file>
+    <file>quick/light/png/48/undo.png</file>
+    <file>quick/light/png/64/undo.png</file>
+    <file>quick/dark/png/16/undo.png</file>
+    <file>quick/dark/png/32/undo.png</file>
+    <file>quick/dark/png/48/undo.png</file>
+    <file>quick/dark/png/64/undo.png</file>
+    
+    <file>quick/light/png/16/redo.png</file>
+    <file>quick/light/png/32/redo.png</file>
+    <file>quick/light/png/48/redo.png</file>
+    <file>quick/light/png/64/redo.png</file>
+    <file>quick/dark/png/16/redo.png</file>
+    <file>quick/dark/png/32/redo.png</file>
+    <file>quick/dark/png/48/redo.png</file>
+    <file>quick/dark/png/64/redo.png</file>
+    
+    <file>quick/light/png/16/regenerate.png</file>
+    <file>quick/light/png/32/regenerate.png</file>
+    <file>quick/light/png/48/regenerate.png</file>
+    <file>quick/light/png/64/regenerate.png</file>
+    <file>quick/dark/png/16/regenerate.png</file>
+    <file>quick/dark/png/32/regenerate.png</file>
+    <file>quick/dark/png/48/regenerate.png</file>
+    <file>quick/dark/png/64/regenerate.png</file>
+    
+    <file>quick/light/png/16/windows.png</file>
+    <file>quick/light/png/32/windows.png</file>
+    <file>quick/light/png/48/windows.png</file>
+    <file>quick/light/png/64/windows.png</file>
+    <file>quick/dark/png/16/windows.png</file>
+    <file>quick/dark/png/32/windows.png</file>
+    <file>quick/dark/png/48/windows.png</file>
+    <file>quick/dark/png/64/windows.png</file>
+    
+    <file>quick/light/png/16/qat.png</file>
+    <file>quick/light/png/32/qat.png</file>
+    <file>quick/light/png/48/qat.png</file>
+    <file>quick/light/png/64/qat.png</file>
+    <file>quick/dark/png/16/qat.png</file>
+    <file>quick/dark/png/32/qat.png</file>
+    <file>quick/dark/png/48/qat.png</file>
+    <file>quick/dark/png/64/qat.png</file>
+    
+    
+    <file>window/light/png/16/minimize.png</file>
+    <file>window/light/png/32/minimize.png</file>
+    <file>window/light/png/48/minimize.png</file>
+    <file>window/light/png/64/minimize.png</file>
+    <file>window/dark/png/16/minimize.png</file>
+    <file>window/dark/png/32/minimize.png</file>
+    <file>window/dark/png/48/minimize.png</file>
+    <file>window/dark/png/64/minimize.png</file>
+    
+    
+    <file>window/light/png/16/restore.png</file>
+    <file>window/light/png/32/restore.png</file>
+    <file>window/light/png/48/restore.png</file>
+    <file>window/light/png/64/restore.png</file>
+    <file>window/dark/png/16/restore.png</file>
+    <file>window/dark/png/32/restore.png</file>
+    <file>window/dark/png/48/restore.png</file>
+    <file>window/dark/png/64/restore.png</file>
+    
+    <file>window/light/png/16/close.png</file>
+    <file>window/light/png/32/close.png</file>
+    <file>window/light/png/48/close.png</file>
+    <file>window/light/png/64/close.png</file>
+    <file>window/dark/png/16/close.png</file>
+    <file>window/dark/png/32/close.png</file>
+    <file>window/dark/png/48/close.png</file>
+    <file>window/dark/png/64/close.png</file>
+
+</qresource>
+</RCC>
diff --git a/Designer/UIResource/TitleBar/ui/speech_16.svg b/Designer/UIResource/TitleBar/ui/speech_16.svg
deleted file mode 100644
index f8184e53..00000000
--- a/Designer/UIResource/TitleBar/ui/speech_16.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<!-- icons/ui/speech_16.svg -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="16" height="16" viewBox="0 0 16 16">
-  <!-- 麦克风主体 -->
-  <rect x="6" y="3" width="4" height="6"
-        rx="2"
-        fill="none"
-        stroke="#F9FAFB"
-        stroke-width="1.2"/>
-
-  <!-- 下方杆和底座 -->
-  <line x1="8" y1="9" x2="8" y2="11.3"
-        stroke="#F9FAFB"
-        stroke-width="1.0"
-        stroke-linecap="round"/>
-  <line x1="6.2" y1="11.8" x2="9.8" y2="11.8"
-        stroke="#F9FAFB"
-        stroke-width="1.0"
-        stroke-linecap="round"/>
-
-  <!-- 左右声波 -->
-  <path d="M5 5.0 C4.6 5.7 4.6 7.3 5.0 8.0"
-        fill="none" stroke="#F9FAFB" stroke-width="0.9"
-        stroke-linecap="round"/>
-  <path d="M11 5.0 C11.4 5.7 11.4 7.3 11.0 8.0"
-        fill="none" stroke="#F9FAFB" stroke-width="0.9"
-        stroke-linecap="round"/>
-</svg>
diff --git a/Designer/UIResource/TitleBar/ui/window_minimize_16.svg b/Designer/UIResource/TitleBar/ui/window_minimize_16.svg
deleted file mode 100644
index 3aa3efed..00000000
--- a/Designer/UIResource/TitleBar/ui/window_minimize_16.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- icons/ui/window_minimize_16.svg -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="16" height="16" viewBox="0 0 16 16">
-  <line x1="4" y1="9.5" x2="12" y2="9.5"
-        stroke="#F9FAFB"
-        stroke-width="1.4"
-        stroke-linecap="round"/>
-</svg>
diff --git a/Designer/UIResource/TitleBar/window/dark/png/16/close.png b/Designer/UIResource/TitleBar/window/dark/png/16/close.png
new file mode 100644
index 00000000..41bd9cc1
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/dark/png/16/close.png differ
diff --git a/Designer/UIResource/TitleBar/window/dark/png/16/maximize.png b/Designer/UIResource/TitleBar/window/dark/png/16/maximize.png
new file mode 100644
index 00000000..facadc44
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/dark/png/16/maximize.png differ
diff --git a/Designer/UIResource/TitleBar/window/dark/png/16/minimize.png b/Designer/UIResource/TitleBar/window/dark/png/16/minimize.png
new file mode 100644
index 00000000..24ccecd7
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/dark/png/16/minimize.png differ
diff --git a/Designer/UIResource/TitleBar/window/dark/png/16/restore.png b/Designer/UIResource/TitleBar/window/dark/png/16/restore.png
new file mode 100644
index 00000000..63acd690
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/dark/png/16/restore.png differ
diff --git a/Designer/UIResource/TitleBar/window/dark/png/32/close.png b/Designer/UIResource/TitleBar/window/dark/png/32/close.png
new file mode 100644
index 00000000..4b9d7b78
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/dark/png/32/close.png differ
diff --git a/Designer/UIResource/TitleBar/window/dark/png/32/maximize.png b/Designer/UIResource/TitleBar/window/dark/png/32/maximize.png
new file mode 100644
index 00000000..70b60494
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/dark/png/32/maximize.png differ
diff --git a/Designer/UIResource/TitleBar/window/dark/png/32/minimize.png b/Designer/UIResource/TitleBar/window/dark/png/32/minimize.png
new file mode 100644
index 00000000..bc414063
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/dark/png/32/minimize.png differ
diff --git a/Designer/UIResource/TitleBar/window/dark/png/32/restore.png b/Designer/UIResource/TitleBar/window/dark/png/32/restore.png
new file mode 100644
index 00000000..a5cba61e
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/dark/png/32/restore.png differ
diff --git a/Designer/UIResource/TitleBar/window/dark/png/48/close.png b/Designer/UIResource/TitleBar/window/dark/png/48/close.png
new file mode 100644
index 00000000..15226386
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/dark/png/48/close.png differ
diff --git a/Designer/UIResource/TitleBar/window/dark/png/48/maximize.png b/Designer/UIResource/TitleBar/window/dark/png/48/maximize.png
new file mode 100644
index 00000000..87c8b4e0
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/dark/png/48/maximize.png differ
diff --git a/Designer/UIResource/TitleBar/window/dark/png/48/minimize.png b/Designer/UIResource/TitleBar/window/dark/png/48/minimize.png
new file mode 100644
index 00000000..9acc1a1e
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/dark/png/48/minimize.png differ
diff --git a/Designer/UIResource/TitleBar/window/dark/png/48/restore.png b/Designer/UIResource/TitleBar/window/dark/png/48/restore.png
new file mode 100644
index 00000000..c6e4d19a
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/dark/png/48/restore.png differ
diff --git a/Designer/UIResource/TitleBar/window/dark/png/64/close.png b/Designer/UIResource/TitleBar/window/dark/png/64/close.png
new file mode 100644
index 00000000..97869d40
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/dark/png/64/close.png differ
diff --git a/Designer/UIResource/TitleBar/window/dark/png/64/maximize.png b/Designer/UIResource/TitleBar/window/dark/png/64/maximize.png
new file mode 100644
index 00000000..09409282
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/dark/png/64/maximize.png differ
diff --git a/Designer/UIResource/TitleBar/window/dark/png/64/minimize.png b/Designer/UIResource/TitleBar/window/dark/png/64/minimize.png
new file mode 100644
index 00000000..85adc7f3
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/dark/png/64/minimize.png differ
diff --git a/Designer/UIResource/TitleBar/window/dark/png/64/restore.png b/Designer/UIResource/TitleBar/window/dark/png/64/restore.png
new file mode 100644
index 00000000..47b5ae4e
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/dark/png/64/restore.png differ
diff --git a/Designer/UIResource/TitleBar/window/light/png/16/close.png b/Designer/UIResource/TitleBar/window/light/png/16/close.png
new file mode 100644
index 00000000..28ca0af6
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/light/png/16/close.png differ
diff --git a/Designer/UIResource/TitleBar/window/light/png/16/maximize.png b/Designer/UIResource/TitleBar/window/light/png/16/maximize.png
new file mode 100644
index 00000000..300bef5d
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/light/png/16/maximize.png differ
diff --git a/Designer/UIResource/TitleBar/window/light/png/16/minimize.png b/Designer/UIResource/TitleBar/window/light/png/16/minimize.png
new file mode 100644
index 00000000..a9583a57
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/light/png/16/minimize.png differ
diff --git a/Designer/UIResource/TitleBar/window/light/png/16/restore.png b/Designer/UIResource/TitleBar/window/light/png/16/restore.png
new file mode 100644
index 00000000..cbc768e3
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/light/png/16/restore.png differ
diff --git a/Designer/UIResource/TitleBar/window/light/png/32/close.png b/Designer/UIResource/TitleBar/window/light/png/32/close.png
new file mode 100644
index 00000000..9e6a3764
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/light/png/32/close.png differ
diff --git a/Designer/UIResource/TitleBar/window/light/png/32/maximize.png b/Designer/UIResource/TitleBar/window/light/png/32/maximize.png
new file mode 100644
index 00000000..db67bf36
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/light/png/32/maximize.png differ
diff --git a/Designer/UIResource/TitleBar/window/light/png/32/minimize.png b/Designer/UIResource/TitleBar/window/light/png/32/minimize.png
new file mode 100644
index 00000000..80147503
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/light/png/32/minimize.png differ
diff --git a/Designer/UIResource/TitleBar/window/light/png/32/restore.png b/Designer/UIResource/TitleBar/window/light/png/32/restore.png
new file mode 100644
index 00000000..e98554a5
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/light/png/32/restore.png differ
diff --git a/Designer/UIResource/TitleBar/window/light/png/48/close.png b/Designer/UIResource/TitleBar/window/light/png/48/close.png
new file mode 100644
index 00000000..cf159cb1
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/light/png/48/close.png differ
diff --git a/Designer/UIResource/TitleBar/window/light/png/48/maximize.png b/Designer/UIResource/TitleBar/window/light/png/48/maximize.png
new file mode 100644
index 00000000..214924df
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/light/png/48/maximize.png differ
diff --git a/Designer/UIResource/TitleBar/window/light/png/48/minimize.png b/Designer/UIResource/TitleBar/window/light/png/48/minimize.png
new file mode 100644
index 00000000..1e9e6a7e
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/light/png/48/minimize.png differ
diff --git a/Designer/UIResource/TitleBar/window/light/png/48/restore.png b/Designer/UIResource/TitleBar/window/light/png/48/restore.png
new file mode 100644
index 00000000..819a3c48
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/light/png/48/restore.png differ
diff --git a/Designer/UIResource/TitleBar/window/light/png/64/close.png b/Designer/UIResource/TitleBar/window/light/png/64/close.png
new file mode 100644
index 00000000..548b369f
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/light/png/64/close.png differ
diff --git a/Designer/UIResource/TitleBar/window/light/png/64/maximize.png b/Designer/UIResource/TitleBar/window/light/png/64/maximize.png
new file mode 100644
index 00000000..fa24475c
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/light/png/64/maximize.png differ
diff --git a/Designer/UIResource/TitleBar/window/light/png/64/minimize.png b/Designer/UIResource/TitleBar/window/light/png/64/minimize.png
new file mode 100644
index 00000000..7b294322
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/light/png/64/minimize.png differ
diff --git a/Designer/UIResource/TitleBar/window/light/png/64/restore.png b/Designer/UIResource/TitleBar/window/light/png/64/restore.png
new file mode 100644
index 00000000..cd020c9c
Binary files /dev/null and b/Designer/UIResource/TitleBar/window/light/png/64/restore.png differ