diff --git a/invokeai/frontend/web/src/features/controlLayers/components/CanvasEntityList/EntityListSelectedEntityActionBar.tsx b/invokeai/frontend/web/src/features/controlLayers/components/CanvasEntityList/EntityListSelectedEntityActionBar.tsx
index d5d2c3042d3..e3578711366 100644
--- a/invokeai/frontend/web/src/features/controlLayers/components/CanvasEntityList/EntityListSelectedEntityActionBar.tsx
+++ b/invokeai/frontend/web/src/features/controlLayers/components/CanvasEntityList/EntityListSelectedEntityActionBar.tsx
@@ -13,14 +13,14 @@ export const EntityListSelectedEntityActionBar = memo(() => {
   return (
     <Flex w="full" gap={2} alignItems="center" ps={1}>
       <EntityListSelectedEntityActionBarOpacity />
-      <Spacer />
       <EntityListSelectedEntityActionBarFill />
+      <Spacer />
       <Flex h="full">
-        <EntityListSelectedEntityActionBarFilterButton />
+        <EntityListGlobalActionBarAddLayerMenu />
+        <EntityListSelectedEntityActionBarDuplicateButton />
         <EntityListSelectedEntityActionBarTransformButton />
+        <EntityListSelectedEntityActionBarFilterButton />
         <EntityListSelectedEntityActionBarSaveToAssetsButton />
-        <EntityListSelectedEntityActionBarDuplicateButton />
-        <EntityListGlobalActionBarAddLayerMenu />
       </Flex>
     </Flex>
   );
diff --git a/invokeai/frontend/web/src/features/controlLayers/components/CanvasEntityList/EntityListSelectedEntityActionBarFill.tsx b/invokeai/frontend/web/src/features/controlLayers/components/CanvasEntityList/EntityListSelectedEntityActionBarFill.tsx
index 21383b93c4f..aaac4d1b42c 100644
--- a/invokeai/frontend/web/src/features/controlLayers/components/CanvasEntityList/EntityListSelectedEntityActionBarFill.tsx
+++ b/invokeai/frontend/web/src/features/controlLayers/components/CanvasEntityList/EntityListSelectedEntityActionBarFill.tsx
@@ -52,10 +52,10 @@ export const EntityListSelectedEntityActionBarFill = memo(() => {
             <Flex w="full" h="full" alignItems="center" justifyContent="center">
               <Box
                 borderRadius="full"
-                borderColor="base.300"
+                borderColor="base.600"
                 w={6}
                 h={6}
-                borderWidth={1}
+                borderWidth={2}
                 bg={rgbColorToString(fill.color)}
               />
             </Flex>
diff --git a/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolBboxButton.tsx b/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolBboxButton.tsx
index a721dc326b0..127e5a78bc0 100644
--- a/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolBboxButton.tsx
+++ b/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolBboxButton.tsx
@@ -28,7 +28,6 @@ export const ToolBboxButton = memo(() => {
       colorScheme={isSelected ? 'invokeBlue' : 'base'}
       variant="solid"
       onClick={selectBbox}
-      isDisabled={isSelected}
     />
   );
 });
diff --git a/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolBrushButton.tsx b/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolBrushButton.tsx
index 43d175baa78..2e089af4578 100644
--- a/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolBrushButton.tsx
+++ b/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolBrushButton.tsx
@@ -28,7 +28,6 @@ export const ToolBrushButton = memo(() => {
       colorScheme={isSelected ? 'invokeBlue' : 'base'}
       variant="solid"
       onClick={selectBrush}
-      isDisabled={isSelected}
     />
   );
 });
diff --git a/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolColorPickerButton.tsx b/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolColorPickerButton.tsx
index 4f82b977e41..38bdd5b03a1 100644
--- a/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolColorPickerButton.tsx
+++ b/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolColorPickerButton.tsx
@@ -28,7 +28,6 @@ export const ToolColorPickerButton = memo(() => {
       colorScheme={isSelected ? 'invokeBlue' : 'base'}
       variant="solid"
       onClick={selectColorPicker}
-      isDisabled={isSelected}
     />
   );
 });
diff --git a/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolEraserButton.tsx b/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolEraserButton.tsx
index 52ceb7bdd0a..2d7a2ea8306 100644
--- a/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolEraserButton.tsx
+++ b/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolEraserButton.tsx
@@ -28,7 +28,6 @@ export const ToolEraserButton = memo(() => {
       colorScheme={isSelected ? 'invokeBlue' : 'base'}
       variant="solid"
       onClick={selectEraser}
-      isDisabled={isSelected}
     />
   );
 });
diff --git a/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolFillColorPicker.tsx b/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolFillColorPicker.tsx
index 64c1fb88c2b..e9ca638b106 100644
--- a/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolFillColorPicker.tsx
+++ b/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolFillColorPicker.tsx
@@ -54,10 +54,10 @@ export const ToolColorPicker = memo(() => {
             <Flex w="full" h="full" alignItems="center" justifyContent="center">
               <Box
                 borderRadius="full"
-                borderColor="base.300"
+                borderColor="base.600"
                 w={6}
                 h={6}
-                borderWidth={1}
+                borderWidth={2}
                 bg={rgbaColorToString(fill)}
               />
             </Flex>
diff --git a/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolMoveButton.tsx b/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolMoveButton.tsx
index 75a61041107..35509c277df 100644
--- a/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolMoveButton.tsx
+++ b/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolMoveButton.tsx
@@ -28,7 +28,6 @@ export const ToolMoveButton = memo(() => {
       colorScheme={isSelected ? 'invokeBlue' : 'base'}
       variant="solid"
       onClick={selectMove}
-      isDisabled={isSelected}
     />
   );
 });
diff --git a/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolRectButton.tsx b/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolRectButton.tsx
index f744524072c..0bbc468342c 100644
--- a/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolRectButton.tsx
+++ b/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolRectButton.tsx
@@ -28,7 +28,6 @@ export const ToolRectButton = memo(() => {
       colorScheme={isSelected ? 'invokeBlue' : 'base'}
       variant="solid"
       onClick={selectRect}
-      isDisabled={isSelected}
     />
   );
 });
diff --git a/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolViewButton.tsx b/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolViewButton.tsx
index 4c0d4897311..dbe79023231 100644
--- a/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolViewButton.tsx
+++ b/invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolViewButton.tsx
@@ -28,7 +28,6 @@ export const ToolViewButton = memo(() => {
       colorScheme={isSelected ? 'invokeBlue' : 'base'}
       variant="solid"
       onClick={selectView}
-      isDisabled={isSelected}
     />
   );
 });
diff --git a/invokeai/frontend/web/src/features/system/components/HotkeysModal/useHotkeyData.ts b/invokeai/frontend/web/src/features/system/components/HotkeysModal/useHotkeyData.ts
index 58f8873ed2c..33be898a9f6 100644
--- a/invokeai/frontend/web/src/features/system/components/HotkeysModal/useHotkeyData.ts
+++ b/invokeai/frontend/web/src/features/system/components/HotkeysModal/useHotkeyData.ts
@@ -96,7 +96,7 @@ export const useHotkeyData = (): HotkeysData => {
     addHotkey('canvas', 'incrementToolWidth', [']']);
     addHotkey('canvas', 'selectEraserTool', ['e']);
     addHotkey('canvas', 'selectMoveTool', ['v']);
-    addHotkey('canvas', 'selectRectTool', ['r']);
+    addHotkey('canvas', 'selectRectTool', ['u']);
     addHotkey('canvas', 'selectViewTool', ['h']);
     addHotkey('canvas', 'selectColorPickerTool', ['i']);
     addHotkey('canvas', 'setFillToWhite', ['d']);