diff --git a/packages/yoga/src/Button/web/Button.jsx b/packages/yoga/src/Button/web/Button.jsx
index 63b0b9b747..00ef1309fe 100644
--- a/packages/yoga/src/Button/web/Button.jsx
+++ b/packages/yoga/src/Button/web/Button.jsx
@@ -26,6 +26,7 @@ const Button = forwardRef(
       secondary = false,
       icon: Icon,
       isLoading = false,
+      'aria-label': ariaLabel,
       ...props
     },
     ref,
@@ -49,6 +50,7 @@ const Button = forwardRef(
         small={small}
         secondary={secondary}
         isLoading={isLoading}
+        aria-label={ariaLabel}
         {...finalProps}
       >
         {Icon && <Icon role="img" />}
@@ -65,7 +67,6 @@ const Button = forwardRef(
 );
 
 Button.propTypes = {
-  ariaLabel: string,
   children: node,
   disabled: bool,
   full: bool,
@@ -77,6 +78,7 @@ Button.propTypes = {
   /** an Icon from yoga-icons package */
   icon: oneOfType([node, func]),
   href: string,
+  'aria-label': string,
 };
 
 Button.displayName = 'Button';
diff --git a/packages/yoga/src/Heading/web/Heading.test.jsx b/packages/yoga/src/Heading/web/Heading.test.jsx
index d0f828daf5..99db4faf9c 100644
--- a/packages/yoga/src/Heading/web/Heading.test.jsx
+++ b/packages/yoga/src/Heading/web/Heading.test.jsx
@@ -75,6 +75,24 @@ describe('<Heading />', () => {
     expect(container).toMatchSnapshot();
   });
 
+  it('should have aria-label', () => {
+    const { getByLabelText } = render(
+      <ThemeProvider>
+        <Heading noPadding>
+          <Title>Gympass</Title>
+          <BackButton onClick={onClick} />
+          <RightButton
+            icon={Upload2}
+            onClick={onClick}
+            aria-label="labelAriaText"
+          />
+        </Heading>
+      </ThemeProvider>,
+    );
+
+    expect(getByLabelText('labelAriaText')).toBeTruthy();
+  });
+
   it('should override the background color', () => {
     const { container } = render(
       <ThemeProvider>
diff --git a/packages/yoga/src/Heading/web/RightButton.jsx b/packages/yoga/src/Heading/web/RightButton.jsx
index 213b6ef300..970053fd3a 100644
--- a/packages/yoga/src/Heading/web/RightButton.jsx
+++ b/packages/yoga/src/Heading/web/RightButton.jsx
@@ -58,8 +58,14 @@ const ButtonIcon = styled(Button)`
   }};
 `;
 
-const RightButton = ({ onClick, icon, ...props }) => (
-  <ButtonIcon onClick={onClick} secondary padding="xxxsmall" {...props}>
+const RightButton = ({ onClick, icon, 'aria-label': ariaLabel, ...props }) => (
+  <ButtonIcon
+    onClick={onClick}
+    secondary
+    padding="xxxsmall"
+    aria-label={ariaLabel}
+    {...props}
+  >
     <Box
       flex={1}
       display="flex"
@@ -77,6 +83,7 @@ const RightButton = ({ onClick, icon, ...props }) => (
 RightButton.propTypes = {
   onClick: PropTypes.func.isRequired,
   icon: PropTypes.elementType.isRequired,
+  'aria-label': PropTypes.string,
 };
 
 RightButton.displayName = 'Heading.RightButton';
diff --git a/packages/yoga/src/Menu/web/__snapshots__/Menu.test.jsx.snap b/packages/yoga/src/Menu/web/__snapshots__/Menu.test.jsx.snap
index 290a16d2dd..cd26b14b8c 100644
--- a/packages/yoga/src/Menu/web/__snapshots__/Menu.test.jsx.snap
+++ b/packages/yoga/src/Menu/web/__snapshots__/Menu.test.jsx.snap
@@ -80,7 +80,6 @@ exports[`<Menu /> should match snapshot Menu with a onMouseHover props false 1`]
 
 <div>
   <button
-    aria-disabled="false"
     aria-expanded="false"
     aria-haspopup="menu"
     class="c0"
@@ -180,7 +179,6 @@ exports[`<Menu /> should match snapshot Menu with an align props end 1`] = `
 <div>
   <div>
     <button
-      aria-disabled="false"
       aria-expanded="false"
       aria-haspopup="menu"
       class="c0"
@@ -281,7 +279,6 @@ exports[`<Menu /> should match snapshot Menu with an align props start 1`] = `
 <div>
   <div>
     <button
-      aria-disabled="false"
       aria-expanded="false"
       aria-haspopup="menu"
       class="c0"
@@ -382,7 +379,6 @@ exports[`<Menu /> should match snapshot Menu.Item with active 1`] = `
 <div>
   <div>
     <button
-      aria-disabled="false"
       aria-expanded="false"
       aria-haspopup="menu"
       class="c0"
@@ -483,7 +479,6 @@ exports[`<Menu /> should match snapshot Menu.Item with disabled 1`] = `
 <div>
   <div>
     <button
-      aria-disabled="false"
       aria-expanded="false"
       aria-haspopup="menu"
       class="c0"
@@ -584,7 +579,6 @@ exports[`<Menu /> should match snapshot Menu.Item with disabled and icon 1`] = `
 <div>
   <div>
     <button
-      aria-disabled="false"
       aria-expanded="false"
       aria-haspopup="menu"
       class="c0"
@@ -685,7 +679,6 @@ exports[`<Menu /> should match snapshot Menu.Item with icon 1`] = `
 <div>
   <div>
     <button
-      aria-disabled="false"
       aria-expanded="false"
       aria-haspopup="menu"
       class="c0"
@@ -786,7 +779,6 @@ exports[`<Menu /> should match snapshot Menu.Item with link 1`] = `
 <div>
   <div>
     <button
-      aria-disabled="false"
       aria-expanded="false"
       aria-haspopup="menu"
       class="c0"
@@ -887,7 +879,6 @@ exports[`<Menu /> should match snapshot in default Menu 1`] = `
 <div>
   <div>
     <button
-      aria-disabled="false"
       aria-expanded="false"
       aria-haspopup="menu"
       class="c0"