diff --git a/react-components/src/components/Architecture/CommandButtons.tsx b/react-components/src/components/Architecture/CommandButtons.tsx
index 8c887272dc3..abc2cc5f3bb 100644
--- a/react-components/src/components/Architecture/CommandButtons.tsx
+++ b/react-components/src/components/Architecture/CommandButtons.tsx
@@ -57,5 +57,5 @@ function CommandButtonWrapper({
     const direction = !isHorizontal ? 'horizontal' : 'vertical';
     return <Divider weight="2px" length="24px" direction={direction} />;
   }
-  return CreateButton(command);
+  return CreateButton(command, isHorizontal);
 }
diff --git a/react-components/src/components/Architecture/LabelWithShortcut.tsx b/react-components/src/components/Architecture/LabelWithShortcut.tsx
index 22049b0df04..0a7e8c5dde7 100644
--- a/react-components/src/components/Architecture/LabelWithShortcut.tsx
+++ b/react-components/src/components/Architecture/LabelWithShortcut.tsx
@@ -16,7 +16,7 @@ export const LabelWithShortcut: React.FC<LabelWithShortcutProps> = ({ label, sho
   return (
     <Container key={label}>
       <Label>{label}</Label>
-      {shortcut !== undefined && <Shortcut keys={[shortcut.toUpperCase()]} />}
+      {shortcut !== undefined && <Shortcut keys={[shortcut]} inverted />}
     </Container>
   );
 };