diff --git a/src/components/CustomIcon.tsx b/src/components/CustomIcon.tsx
index bd4edfa3b..b3179c9bf 100644
--- a/src/components/CustomIcon.tsx
+++ b/src/components/CustomIcon.tsx
@@ -387,7 +387,7 @@ const CustomIconMap = {
       <path
         fillRule="evenodd"
         clipRule="evenodd"
-        d="M10 2.51583L10.3536 2.86938L12.3536 4.86938L11.6465 5.57649L10.5 4.43004V10.1012C11.0826 10.3071 11.5 10.8627 11.5 11.5158C11.5 12.3443 10.8284 13.0158 10 13.0158C9.17157 13.0158 8.5 12.3443 8.5 11.5158C8.5 10.8627 8.9174 10.3071 9.5 10.1012V4.43004L8.35356 5.57649L7.64645 4.86938L9.64645 2.86938L10 2.51583ZM3.95886 10.8441L8.5 8.06893V9.24088L4.91773 11.43L10 14.5359L15.0823 11.43L11.5 9.24087V8.06893L16.0411 10.8441L17 11.43L17 13.4842H16V12.0412L10.5 15.4023V17.4842H9.5V15.4023L4 12.0412V13.4842H3V11.43L3.95886 10.8441Z"
+        d="M10 3.29317L10.2346 3.41776L15.728 6.33576L15.9935 6.47676V6.77733V12.7391V13.0185L15.7555 13.165L10.2621 16.5456L10 16.7068L9.73796 16.5456L4.24448 13.165L4.00653 13.0185V12.7391V6.77733V6.47676L4.27198 6.33576L9.76546 3.41776L10 3.29317ZM10 4.42549L5.56039 6.78371L10 9.21124L14.4396 6.78371L10 4.42549ZM14.9935 7.62059L10.5 10.0776V15.225L14.9935 12.4597V7.62059ZM9.50001 15.225V10.0776L5.00653 7.62059V12.4597L9.50001 15.225Z"
         fill="currentColor"
       />
     </svg>
@@ -732,7 +732,7 @@ const CustomIconMap = {
       <path
         fillRule="evenodd"
         clipRule="evenodd"
-        d="M13.7954 6.22689C14.7749 5.73715 15 5.2456 15 5C15 4.7544 14.7749 4.26285 13.7954 3.77311C12.8758 3.31327 11.5353 3 10 3C8.46473 3 7.12424 3.31327 6.20457 3.77311C5.22509 4.26285 5 4.7544 5 5C5 5.2456 5.22509 5.73715 6.20457 6.22689C6.29872 6.27397 6.39728 6.3195 6.5 6.36333L6.5 7.43698C4.98593 6.89239 4 6.00376 4 5C4 3.34315 6.68629 2 10 2C13.3137 2 16 3.34315 16 5C16 6.00376 15.0141 6.89239 13.5 7.43698V6.36333C13.6027 6.3195 13.7013 6.27397 13.7954 6.22689ZM11.5 8.5531V9.72505L15.0823 11.9142L10 15.0201L4.91773 11.9142L8.5 9.72505V8.5531L3.95886 11.3282L3 11.9142V13.9683H4V12.5253L9.5 15.8864V17.9683H10.5V15.8864L16 12.5253V13.9683H17L17 11.9142L16.0411 11.3282L11.5 8.5531ZM10 4.29289L10.3536 4.64645L12.3536 6.64644L11.6465 7.35355L10.5 6.20711V10.5854C11.0826 10.7913 11.5 11.3469 11.5 12C11.5 12.8284 10.8284 13.5 10 13.5C9.17157 13.5 8.5 12.8284 8.5 12C8.5 11.3469 8.91741 10.7913 9.5 10.5854V6.20711L8.35356 7.35355L7.64645 6.64644L9.64645 4.64645L10 4.29289Z"
+        d="M9.9995 4.85357C9.15003 4.85357 8.32765 5.04209 7.7242 5.3905C7.11795 5.74052 6.92818 6.12938 6.92818 6.41547C6.92818 6.70156 7.11795 7.09042 7.7242 7.44044C8.32765 7.78884 9.15003 7.97737 9.9995 7.97737C10.849 7.97737 11.6714 7.78884 12.2748 7.44044C12.8811 7.09042 13.0708 6.70156 13.0708 6.41547C13.0708 6.12938 12.8811 5.74052 12.2748 5.3905C11.6714 5.04209 10.849 4.85357 9.9995 4.85357ZM9.9995 3.85357C10.978 3.85357 11.9836 4.06765 12.7748 4.52447C13.4807 4.93205 13.9615 5.50902 14.0544 6.1775L15.8813 12.0861L15.9958 12.4564L15.6656 12.6596L10.2616 15.9852L9.9995 16.1464L9.73745 15.9852L4.33339 12.6596L4.00415 12.457L4.11736 12.0873L5.96911 6.04134C6.10445 5.43072 6.56665 4.90411 7.2242 4.52447C8.01544 4.06765 9.02101 3.85357 9.9995 3.85357ZM6.49467 7.7401L5.18673 12.0105L9.4995 14.6646V8.95868C8.68544 8.8976 7.88098 8.68566 7.2242 8.30647C6.9414 8.1432 6.69474 7.95274 6.49467 7.7401ZM10.4995 8.95868V14.6646L14.8114 12.0111L13.4942 7.75085C13.2959 7.95916 13.0528 8.14595 12.7748 8.30647C12.118 8.68566 11.3136 8.8976 10.4995 8.95868Z"
         fill="currentColor"
       />
     </svg>
@@ -1048,7 +1048,7 @@ const CustomIconMap = {
       <path
         fillRule="evenodd"
         clipRule="evenodd"
-        d="M6.89927 4.693C7.36143 4.41381 7.87 4.21672 8.40842 4.10376C7.83595 4.69964 7.47 5.50199 7.47 6.31393C7.47 7.34818 8.06376 8.11443 8.9218 8.3459C8.85859 8.44278 8.80068 8.54347 8.74845 8.64757C8.69108 8.76191 8.6411 8.87927 8.59864 8.99896L9.87934 8.72674C10.0433 8.52252 10.2451 8.35006 10.4752 8.21957L10.4736 8.21676C11.6445 7.74118 12.53 6.5014 12.53 5.2384C12.53 4.20393 11.936 3.43756 11.0776 3.20628L11.0781 3.19471C9.34471 2.75461 7.64421 2.9631 6.28878 3.78191C4.93335 4.60073 4.01395 5.97492 3.69937 7.6522C3.55495 8.4222 3.54245 9.23235 3.65633 10.0495L3.88904 10L4.59283 9.85042C4.53004 9.23247 4.55179 8.62188 4.6613 8.038C4.93318 6.58836 5.7278 5.40068 6.89927 4.693ZM7.47005 15.1799C6.65634 14.4835 5.96657 13.6244 5.46142 12.6658L4.54925 12.8597L4.57626 12.9127C5.40057 14.5194 6.672 15.8914 8.18092 16.8103C8.28057 16.8945 8.38913 16.9684 8.50564 17.0308L9.08339 16.1011C8.87304 15.9884 8.70487 15.8151 8.5944 15.5972C8.48392 15.3793 8.43471 15.1238 8.45129 14.8543C8.46788 14.5848 8.54973 14.31 8.68929 14.0552C8.82885 13.8005 9.02162 13.574 9.24981 13.3967C9.47801 13.2193 9.73427 13.0969 9.99495 13.0406C10.2556 12.9843 10.5123 12.996 10.7413 13.0747C10.9608 13.15 11.1481 13.2845 11.2874 13.4665C11.7756 13.525 12.1412 13.4705 12.4217 13.3627C12.354 13.1483 12.2554 12.9503 12.128 12.7748C11.8981 12.4582 11.5819 12.225 11.2086 12.0968C11.1027 12.0605 10.9931 12.0329 10.8808 12.0141C10.6353 11.9374 10.407 11.816 10.2071 11.6571L9.0562 11.9017C9.09421 11.9513 9.13379 11.9999 9.17491 12.0473C9.2375 12.1194 9.30323 12.1884 9.37183 12.254C9.16516 12.3521 8.9652 12.4755 8.77697 12.6218C8.40494 12.9109 8.09066 13.2801 7.86313 13.6955C7.6356 14.1108 7.50216 14.5588 7.47513 14.9982C7.47137 15.0592 7.46969 15.1198 7.47005 15.1799ZM9.99038 7.3647L10 7.36268C10.8571 7.18051 11.5518 6.32252 11.5518 5.44631C11.5518 4.5701 10.8571 4.00748 10 4.18965C9.14293 4.37183 8.44815 5.22981 8.44815 6.10602C8.44815 6.9614 9.11029 7.51793 9.93915 7.37442C9.95332 7.36608 9.96757 7.35785 9.98189 7.34973L9.99038 7.3647ZM16.6 8.29822L16.1109 8.40218L14.074 8.83515V9.83515L16.1109 9.40218L16.6 9.29822V8.29822ZM7.96305 11.1341L12.037 10.2681V9.26813L7.96305 10.1341V11.1341ZM3.8891 12L5.92607 11.567V10.567L3.8891 11L3.40002 11.104V12.104L3.8891 12ZM15.4172 11.1225L15.9703 10.8085L16.0604 11.4381L16.4532 14.1827L15.5948 14.3056L15.5027 13.662L15.5423 12.9555L15.3598 13.5867C15.1404 13.9788 14.8672 14.3472 14.529 14.662C13.8137 15.3278 12.8466 15.7187 11.5898 15.635C11.3638 16.0194 10.9459 16.2774 10.4678 16.2774C9.74943 16.2774 9.16711 15.6951 9.16711 14.9767C9.16711 14.2584 9.74943 13.6761 10.4678 13.6761C11.1178 13.6761 11.6565 14.153 11.753 14.776C12.7384 14.8173 13.4355 14.4952 13.9382 14.0273C14.4048 13.5929 14.7326 13.0058 14.9513 12.384L13.4607 13.2302L13.0326 12.4761L15.4172 11.1225Z"
+        d="M4.97327 10C4.97327 6.80658 7.36805 4.28237 10.2454 4.28237C10.3165 4.28237 10.387 4.28406 10.4572 4.28741C10.3234 4.38231 10.1981 4.48718 10.0831 4.59971C9.66718 5.00672 9.35509 5.54523 9.28757 6.13142C9.25522 6.4123 9.28279 6.67823 9.36215 6.91776C8.7912 7.07426 8.34416 7.4985 8.05428 8.021C7.71049 8.64064 7.55775 9.44003 7.64354 10.2751C7.72936 11.1104 8.042 11.8668 8.50239 12.413C8.96051 12.9566 9.6047 13.3307 10.3298 13.2686C10.6312 13.2428 10.91 13.1468 11.1582 12.9971C11.3304 13.3048 11.6082 13.5576 11.9545 13.74C12.4863 14.0202 13.1232 14.1081 13.7186 14.0462C13.7798 14.0398 13.8412 14.0318 13.9024 14.0221C12.9641 15.0711 11.6798 15.7176 10.2454 15.7176C7.36805 15.7176 4.97327 13.1934 4.97327 10ZM10.2454 3.28237C11.2075 3.28237 12.0872 3.53636 12.8836 3.93906C12.9184 3.95564 12.9526 3.97334 12.9861 3.99218C13.5751 4.32277 13.8895 4.9548 13.8061 5.67865C13.7386 6.26484 13.4265 6.80335 13.0105 7.21036C12.5931 7.61883 12.04 7.92623 11.4392 8.0229C11.0197 8.0904 10.6153 8.04835 10.2653 7.89614L10.2521 7.89037C10.1541 7.84893 9.99432 7.83721 9.77368 7.85609C9.46998 7.88207 9.1612 8.08711 8.92871 8.50614C8.69698 8.92382 8.57054 9.51335 8.63831 10.1729C8.70605 10.8322 8.95064 11.3932 9.26703 11.7686C9.5857 12.1467 9.93784 12.2985 10.2445 12.2723C10.5632 12.245 10.8934 12.0327 11.1204 11.6221C11.1374 11.5865 11.1559 11.5513 11.1757 11.5164C11.2866 11.3214 11.438 11.1435 11.6225 10.9865C12.0767 10.6 12.6795 10.3834 13.2743 10.3216C13.8698 10.2596 14.5067 10.3475 15.0385 10.6277C15.8132 11.0358 16.2217 11.8039 15.935 12.5969C15.9205 12.6369 15.9045 12.6763 15.8868 12.7152C14.9186 15.0185 12.8217 16.7176 10.2454 16.7176C6.74706 16.7176 3.97327 13.6744 3.97327 10C3.97327 6.32561 6.74706 3.28237 10.2454 3.28237ZM12.5022 4.86738C12.4834 4.85752 12.4645 4.84778 12.4455 4.83814C12.2919 4.76722 12.0795 4.73165 11.8133 4.77448C11.4407 4.83443 11.0707 5.03242 10.7825 5.31444C10.4928 5.59793 10.3168 5.93501 10.281 6.24584C10.2381 6.61795 10.4 6.86003 10.6545 6.97486L10.6664 6.9801C10.8179 7.04538 11.0245 7.07676 11.2803 7.0356C11.653 6.97564 12.0229 6.77766 12.3111 6.49563C12.6008 6.21215 12.7768 5.87507 12.8127 5.56423C12.8526 5.21705 12.7138 4.98872 12.5022 4.86738ZM12.0511 12.0001C12.0391 12.0242 12.0267 12.0482 12.014 12.0719C11.9553 12.2043 11.9565 12.3248 11.9952 12.4311C12.0421 12.5603 12.1642 12.7202 12.4206 12.8553C12.7448 13.0261 13.1759 13.0972 13.6152 13.0515C14.055 13.0058 14.4537 12.8483 14.7224 12.6196C14.8489 12.512 14.927 12.4058 14.9718 12.3114C14.9803 12.2909 14.9888 12.2703 14.9971 12.2497C15.0698 12.0387 15.0148 11.7455 14.5723 11.5124C14.2481 11.3416 13.817 11.2705 13.3778 11.3162C12.9379 11.3619 12.5392 11.5195 12.2706 11.7481C12.1687 11.8348 12.098 11.9208 12.0511 12.0001Z"
         fill="currentColor"
       />
     </svg>
@@ -1148,7 +1148,7 @@ const CustomIconMap = {
       <path
         fillRule="evenodd"
         clipRule="evenodd"
-        d="M15.4743 3.19282L15.7063 2.49694L14.9738 2.53539L11.7806 2.703L11.833 3.70162L12.2189 3.68137L13.0309 3.47351L12.4065 3.79549C11.5985 4.23813 10.7423 4.7732 10.0381 5.41523C9.28624 6.1008 8.66584 6.94665 8.50598 7.97341C8.36948 8.8502 8.57961 9.78564 9.20597 10.7756C9.07507 10.9983 9 11.2577 9 11.5347C9 12.3631 9.67157 13.0347 10.5 13.0347C11.3284 13.0347 12 12.3631 12 11.5347C12 10.7063 11.3284 10.0347 10.5 10.0347C10.3174 10.0347 10.1425 10.0673 9.98067 10.127C9.51409 9.34655 9.40701 8.68651 9.49408 8.12725C9.60506 7.41442 10.0472 6.76028 10.7119 6.15418C11.3749 5.54964 12.218 5.03092 13.0491 4.58458C13.4267 4.38176 13.797 4.19644 14.1426 4.02567L13.5257 5.87659L14.4743 6.19282L15.4743 3.19282ZM10.4854 8.10284C10.4627 8.2645 10.4579 8.44276 10.4848 8.63934L15.0823 11.4489L10 14.5548L4.91773 11.4489L7.66526 9.76987C7.56422 9.41819 7.50187 9.06536 7.47765 8.71258L3.95886 10.8629L3 11.4489V13.5031H4V12.06L9.5 15.4211V17.5031H10.5V15.4211L16 12.06V13.5031H17L17 11.4489L16.0411 10.8629L10.6351 7.55929C10.5598 7.74567 10.5101 7.92698 10.4854 8.10284Z"
+        d="M13.2244 5.21542C12.7054 5.21541 12.2135 5.33116 11.8622 5.53399C11.5544 5.7117 11.4656 5.8865 11.4482 5.98748L11.4492 6.07746C11.469 6.18657 11.5595 6.35486 11.8622 6.5296C12.2135 6.73243 12.7054 6.84817 13.2244 6.84817C13.7434 6.84817 14.2354 6.73243 14.5867 6.5296C14.8973 6.35026 14.9846 6.17771 15.0011 6.06896V5.98963C14.9845 5.88898 14.8967 5.71296 14.5867 5.53399C14.2354 5.33116 13.7434 5.21542 13.2244 5.21542ZM16.0011 6.13177C16.0065 6.06023 16.0059 5.98711 15.9988 5.91256C15.9489 5.38456 15.5851 4.95575 15.0867 4.66796C14.5476 4.35671 13.8725 4.21542 13.2244 4.21542C12.5764 4.21541 11.9013 4.35671 11.3622 4.66796C10.8637 4.95575 10.4999 5.38455 10.45 5.91255C10.4421 5.99636 10.4424 6.07837 10.4501 6.15834L10.4658 7.50046L7.9749 6.14153L7.96667 6.13704L7.95828 6.13286C6.85997 5.58608 5.83833 5.76171 5.10363 6.3622C4.39705 6.9397 3.99599 7.87502 3.99599 8.80303V13.9334C3.97948 14.5257 4.3658 15.0159 4.91332 15.332C5.45242 15.6433 6.12752 15.7846 6.77554 15.7846C7.42356 15.7846 8.09866 15.6433 8.63776 15.332C9.18527 15.0159 9.57161 14.5257 9.55509 13.9334L9.5551 12.8862L11.8715 14.1386L11.8813 14.1439L11.8914 14.1488C13.0016 14.6864 14.036 14.6066 14.8049 14.1168C15.5567 13.6378 16.0011 12.7977 16.0011 11.9264L16.0011 6.13177ZM15.0011 7.44303C14.4771 7.72126 13.8386 7.84817 13.2244 7.84817C12.6171 7.84817 11.986 7.72406 11.4653 7.45225L11.4757 8.34239L11.4758 8.35085L11.4756 8.35932L11.4477 9.62112L10.4479 9.59897L10.4692 8.64142L7.50456 7.02407C6.75157 6.65229 6.15623 6.7934 5.73647 7.13648C5.28711 7.50376 4.99599 8.1415 4.99599 8.80303V13.9411V13.95L4.99568 13.9588C4.99232 14.0538 5.04963 14.256 5.41332 14.466C5.76463 14.6688 6.25654 14.7846 6.77554 14.7846C7.29453 14.7846 7.78644 14.6688 8.13776 14.466C8.50145 14.256 8.55877 14.0538 8.55541 13.9588L8.55509 13.95V13.9411L8.5551 12.3442L7.78422 11.9237L8.26314 11.0458L9.29291 11.6076L9.29456 11.6085L12.337 13.2535C13.1716 13.6544 13.8297 13.5524 14.2676 13.2734C14.7242 12.9825 15.0011 12.4644 15.0011 11.9264L15.0011 7.44303Z"
         fill="currentColor"
       />
     </svg>
diff --git a/src/lib/toolbar.ts b/src/lib/toolbar.ts
index 7bff968f1..b1cc024ab 100644
--- a/src/lib/toolbar.ts
+++ b/src/lib/toolbar.ts
@@ -101,27 +101,6 @@ export const toolbarConfig: Record<ToolbarModeName, ToolbarMode> = {
         description: 'Pull a sketch into 3D along its normal or perpendicular.',
         links: [{ label: 'KCL docs', url: 'https://zoo.dev/docs/kcl/extrude' }],
       },
-      {
-        id: 'revolve',
-        onClick: () =>
-          commandBarActor.send({
-            type: 'Find and select command',
-            data: { name: 'Revolve', groupId: 'modeling' },
-          }),
-        icon: 'revolve',
-        status: 'available',
-        title: 'Revolve',
-        hotkey: 'R',
-        description:
-          'Create a 3D body by rotating a sketch region about an axis.',
-        links: [
-          { label: 'KCL docs', url: 'https://zoo.dev/docs/kcl/revolve' },
-          {
-            label: 'KCL example',
-            url: 'https://zoo.dev/docs/kcl-samples/ball-bearing',
-          },
-        ],
-      },
       {
         id: 'sweep',
         onClick: () =>
@@ -162,6 +141,27 @@ export const toolbarConfig: Record<ToolbarModeName, ToolbarMode> = {
           },
         ],
       },
+      {
+        id: 'revolve',
+        onClick: () =>
+          commandBarActor.send({
+            type: 'Find and select command',
+            data: { name: 'Revolve', groupId: 'modeling' },
+          }),
+        icon: 'revolve',
+        status: 'available',
+        title: 'Revolve',
+        hotkey: 'R',
+        description:
+          'Create a 3D body by rotating a sketch region about an axis.',
+        links: [
+          { label: 'KCL docs', url: 'https://zoo.dev/docs/kcl/revolve' },
+          {
+            label: 'KCL example',
+            url: 'https://zoo.dev/docs/kcl-samples/ball-bearing',
+          },
+        ],
+      },
       'break',
       {
         id: 'fillet3d',