diff --git a/src/components/close-button/close-button.jsx b/src/components/close-button/close-button.jsx
index 2bc75ed244f4eb471e15a2220ef2a68e51a335b9..e90bd1d64b892306ecb613d15e6c2d891fc9d576 100644
--- a/src/components/close-button/close-button.jsx
+++ b/src/components/close-button/close-button.jsx
@@ -7,6 +7,7 @@ import closeIcon from './icon--close.svg';
 
 const CloseButton = props => (
     <div
+        aria-label="Close"
         className={classNames(
             styles.closeButton,
             props.className,
@@ -15,10 +16,10 @@ const CloseButton = props => (
                 [styles.large]: props.size === CloseButton.SIZE_LARGE
             }
         )}
+        role="button"
         onClick={props.onClick}
     >
         <img
-            aria-hidden="true"
             className={styles.closeIcon}
             src={closeIcon}
         />
diff --git a/src/components/icon-button/icon-button.jsx b/src/components/icon-button/icon-button.jsx
index 799ab991f0e22f37c77f7187a1295aec8264afe7..c6f9ae3d03ccf48df55b83c7c58295354d3427dd 100644
--- a/src/components/icon-button/icon-button.jsx
+++ b/src/components/icon-button/icon-button.jsx
@@ -11,10 +11,10 @@ const IconButton = ({
 }) => (
     <div
         className={classNames(styles.container, className)}
+        role="button"
         onClick={onClick}
     >
         <img
-            aria-hidden="true"
             className={styles.icon}
             src={img}
         />