diff --git a/src/components/Button/Button.styles.ts b/src/components/Button/Button.styles.ts
index 080e3de5..82a61cfe 100644
--- a/src/components/Button/Button.styles.ts
+++ b/src/components/Button/Button.styles.ts
@@ -328,6 +328,8 @@ export const buttonCSS = (
     borderStyle: "solid",
     color: btnStyles.enabled.text,
     boxShadow: btnStyles.enabled.shadow,
+    boxSizing: "border-box",
+    gap: 4,
     "& .buttonIcon": {
       display: "flex",
       height: 16,
diff --git a/src/components/Button/index.tsx b/src/components/Button/index.tsx
index 6c3340c8..59168cd5 100644
--- a/src/components/Button/index.tsx
+++ b/src/components/Button/index.tsx
@@ -93,18 +93,6 @@ const Button: FC<
     padding: paddingValue,
     "& .button-label": {
       whiteSpace: fullWidth ? "normal" : "nowrap",
-      marginRight:
-        !hasLabel || !icon
-          ? 0
-          : label !== "" && iconLocation === "end"
-            ? "4px"
-            : 0,
-      marginLeft:
-        !hasLabel || !icon
-          ? 0
-          : label !== "" && iconLocation === "start"
-            ? "4px"
-            : 0,
     },
   });
 
@@ -138,7 +126,7 @@ const Button: FC<
     >
       <Fragment>
         {icon && iconLocation === "start" && iconToPlace}
-        {(children || label?.trim() !== "") && (
+        {hasLabel && (
           <span className={"button-label"}>
             {children}
             {children && label ? " " : ""}
diff --git a/src/components/ExpandMenu/ExpandMenu.stories.tsx b/src/components/ExpandMenu/ExpandMenu.stories.tsx
index 0477d8b5..4678db43 100644
--- a/src/components/ExpandMenu/ExpandMenu.stories.tsx
+++ b/src/components/ExpandMenu/ExpandMenu.stories.tsx
@@ -449,6 +449,373 @@ LongOptionsList.args = {
   ),
 };
 
+export const ExpandMenuWithLabel = Template.bind({});
+ExpandMenuWithLabel.args = {
+  id: "expand-button",
+  icon: <TestIcon />,
+  label: "Options",
+  children: (
+    <Fragment>
+      <ExpandMenuOption
+        id={"opt-1"}
+        onClick={() => {
+          console.log("click1");
+        }}
+        icon={<PencilLineIcon />}
+      >
+        Option 1
+      </ExpandMenuOption>
+      <ExpandMenuOption
+        id={"opt-2"}
+        onClick={() => {
+          console.log("click2");
+        }}
+        icon={<Fragment />}
+      >
+        Option 2
+      </ExpandMenuOption>
+      <ExpandMenuOption
+        id={"opt-3"}
+        onClick={() => {
+          console.log("click3");
+        }}
+        icon={<PencilLineIcon />}
+      >
+        Display Object Versions
+      </ExpandMenuOption>
+      <ExpandMenuOption
+        id={"opt-4 "}
+        onClick={() => {
+          console.log("click4");
+        }}
+        className={"danger"}
+        icon={<DeleteIcon />}
+      >
+        Option 4
+      </ExpandMenuOption>
+      <Button
+        id={"test-button"}
+        onClick={() => {
+          console.log("Mixed");
+        }}
+        icon={<TestIcon />}
+        iconLocation={"start"}
+      >
+        Mixed Button
+      </Button>
+      <ExpandMenuOption
+        id={"opt-4 "}
+        onClick={() => {
+          console.log("click5");
+        }}
+        icon={<DeleteIcon />}
+        disabled
+      >
+        Disabled Option
+      </ExpandMenuOption>
+
+      <ExpandMenuOption
+        id={"opt-5"}
+        onClick={() => {
+          console.log("click1");
+        }}
+        icon={<PencilLineIcon />}
+      >
+        Option 5
+      </ExpandMenuOption>
+      <ExpandMenuOption
+        id={"opt-6"}
+        onClick={() => {
+          console.log("click2");
+        }}
+        icon={<Fragment />}
+      >
+        Option 6
+      </ExpandMenuOption>
+      <ExpandMenuOption
+        id={"opt-7"}
+        onClick={() => {
+          console.log("click3");
+        }}
+        icon={<IceCreamConeIcon />}
+      >
+        Display Object Versions
+      </ExpandMenuOption>
+      <ExpandMenuOption
+        id={"opt-8"}
+        onClick={() => {
+          console.log("click4");
+        }}
+        className={"danger"}
+        icon={<DeleteIcon />}
+      >
+        Option 8
+      </ExpandMenuOption>
+      <Button
+        id={"test-button"}
+        onClick={() => {
+          console.log("Mixed");
+        }}
+        icon={<TestIcon />}
+        iconLocation={"start"}
+      >
+        Mixed Button
+      </Button>
+      <ExpandMenuOption
+        id={"opt-9"}
+        onClick={() => {
+          console.log("click5");
+        }}
+        icon={<DeleteIcon />}
+        disabled
+      >
+        Disabled Option
+      </ExpandMenuOption>
+      <ExpandMenuOption
+        id={"opt-5"}
+        onClick={() => {
+          console.log("click1");
+        }}
+        icon={<PencilIcon />}
+      >
+        Option 5
+      </ExpandMenuOption>
+      <ExpandMenuOption
+        id={"opt-6"}
+        onClick={() => {
+          console.log("click2");
+        }}
+        icon={<Fragment />}
+      >
+        Option 6
+      </ExpandMenuOption>
+      <ExpandMenuOption
+        id={"opt-7"}
+        onClick={() => {
+          console.log("click3");
+        }}
+        icon={<IceCreamConeIcon />}
+      >
+        Display Object Versions
+      </ExpandMenuOption>
+      <ExpandMenuOption
+        id={"opt-8"}
+        onClick={() => {
+          console.log("click4");
+        }}
+        className={"danger"}
+        icon={<DeleteIcon />}
+      >
+        Option 8
+      </ExpandMenuOption>
+      <Button
+        id={"test-button"}
+        onClick={() => {
+          console.log("Mixed");
+        }}
+        icon={<TestIcon />}
+        iconLocation={"start"}
+      >
+        Mixed Button
+      </Button>
+      <ExpandMenuOption
+        id={"opt-9"}
+        onClick={() => {
+          console.log("click5");
+        }}
+        icon={<DeleteIcon />}
+        disabled
+      >
+        Disabled Option
+      </ExpandMenuOption>
+    </Fragment>
+  ),
+};
+
+export const CompactButton = Template.bind({});
+CompactButton.args = {
+  id: "expand-button",
+  icon: <TestIcon />,
+  label: "Options",
+  compact: true,
+  children: (
+    <Fragment>
+      <ExpandMenuOption
+        id={"opt-1"}
+        onClick={() => {
+          console.log("click1");
+        }}
+        icon={<PencilLineIcon />}
+      >
+        Option 1
+      </ExpandMenuOption>
+      <ExpandMenuOption
+        id={"opt-2"}
+        onClick={() => {
+          console.log("click2");
+        }}
+        icon={<Fragment />}
+      >
+        Option 2
+      </ExpandMenuOption>
+      <ExpandMenuOption
+        id={"opt-3"}
+        onClick={() => {
+          console.log("click3");
+        }}
+        icon={<PencilLineIcon />}
+      >
+        Display Object Versions
+      </ExpandMenuOption>
+      <ExpandMenuOption
+        id={"opt-4 "}
+        onClick={() => {
+          console.log("click4");
+        }}
+        className={"danger"}
+        icon={<DeleteIcon />}
+      >
+        Option 4
+      </ExpandMenuOption>
+      <Button
+        id={"test-button"}
+        onClick={() => {
+          console.log("Mixed");
+        }}
+        icon={<TestIcon />}
+        iconLocation={"start"}
+      >
+        Mixed Button
+      </Button>
+      <ExpandMenuOption
+        id={"opt-4 "}
+        onClick={() => {
+          console.log("click5");
+        }}
+        icon={<DeleteIcon />}
+        disabled
+      >
+        Disabled Option
+      </ExpandMenuOption>
+
+      <ExpandMenuOption
+        id={"opt-5"}
+        onClick={() => {
+          console.log("click1");
+        }}
+        icon={<PencilLineIcon />}
+      >
+        Option 5
+      </ExpandMenuOption>
+      <ExpandMenuOption
+        id={"opt-6"}
+        onClick={() => {
+          console.log("click2");
+        }}
+        icon={<Fragment />}
+      >
+        Option 6
+      </ExpandMenuOption>
+      <ExpandMenuOption
+        id={"opt-7"}
+        onClick={() => {
+          console.log("click3");
+        }}
+        icon={<IceCreamConeIcon />}
+      >
+        Display Object Versions
+      </ExpandMenuOption>
+      <ExpandMenuOption
+        id={"opt-8"}
+        onClick={() => {
+          console.log("click4");
+        }}
+        className={"danger"}
+        icon={<DeleteIcon />}
+      >
+        Option 8
+      </ExpandMenuOption>
+      <Button
+        id={"test-button"}
+        onClick={() => {
+          console.log("Mixed");
+        }}
+        icon={<TestIcon />}
+        iconLocation={"start"}
+      >
+        Mixed Button
+      </Button>
+      <ExpandMenuOption
+        id={"opt-9"}
+        onClick={() => {
+          console.log("click5");
+        }}
+        icon={<DeleteIcon />}
+        disabled
+      >
+        Disabled Option
+      </ExpandMenuOption>
+      <ExpandMenuOption
+        id={"opt-5"}
+        onClick={() => {
+          console.log("click1");
+        }}
+        icon={<PencilIcon />}
+      >
+        Option 5
+      </ExpandMenuOption>
+      <ExpandMenuOption
+        id={"opt-6"}
+        onClick={() => {
+          console.log("click2");
+        }}
+        icon={<Fragment />}
+      >
+        Option 6
+      </ExpandMenuOption>
+      <ExpandMenuOption
+        id={"opt-7"}
+        onClick={() => {
+          console.log("click3");
+        }}
+        icon={<IceCreamConeIcon />}
+      >
+        Display Object Versions
+      </ExpandMenuOption>
+      <ExpandMenuOption
+        id={"opt-8"}
+        onClick={() => {
+          console.log("click4");
+        }}
+        className={"danger"}
+        icon={<DeleteIcon />}
+      >
+        Option 8
+      </ExpandMenuOption>
+      <Button
+        id={"test-button"}
+        onClick={() => {
+          console.log("Mixed");
+        }}
+        icon={<TestIcon />}
+        iconLocation={"start"}
+      >
+        Mixed Button
+      </Button>
+      <ExpandMenuOption
+        id={"opt-9"}
+        onClick={() => {
+          console.log("click5");
+        }}
+        icon={<DeleteIcon />}
+        disabled
+      >
+        Disabled Option
+      </ExpandMenuOption>
+    </Fragment>
+  ),
+};
+
 export const ListDividersWithInputOptions = Template.bind({});
 ListDividersWithInputOptions.args = {
   id: "expand-button",
diff --git a/src/components/ExpandMenu/index.tsx b/src/components/ExpandMenu/index.tsx
index f52a871d..6abf07ae 100644
--- a/src/components/ExpandMenu/index.tsx
+++ b/src/components/ExpandMenu/index.tsx
@@ -50,19 +50,14 @@ const ExpandMenu: FC<
 
   if (dropArrow) {
     secondary = expandedMenu ? (
-      <CaretFilledIcon
-        style={{ fill: "none", width: 8, height: 8, marginLeft: 4 }}
-      />
-    ) : (
       <CaretFilledIcon
         style={{
           fill: "none",
           transform: "rotateZ(180deg)",
-          width: 8,
-          height: 8,
-          marginLeft: 4,
         }}
       />
+    ) : (
+      <CaretFilledIcon style={{ fill: "none" }} />
     );
   }