diff --git a/src/components/button/button.jsx b/src/components/button/button.jsx
index c5e59964..eebe06fa 100644
--- a/src/components/button/button.jsx
+++ b/src/components/button/button.jsx
@@ -14,12 +14,13 @@ export default class Button extends Component {
 			children,
 			onClick,
 			invert,
-			ariaLabel
+			ariaLabelledBy
 		} = props;
 
 		return (
 			<button
-				aria-label={ariaLabel}
+				aria-labelledby={ariaLabelledBy}
+				id={id}
 				class={[style.button, props.class, invert ? style.invert : ''].join(' ')}
 				onClick={onClick}>
 				{children}
diff --git a/src/components/label/label.jsx b/src/components/label/label.jsx
index c6b0fced..489944d5 100644
--- a/src/components/label/label.jsx
+++ b/src/components/label/label.jsx
@@ -9,13 +9,14 @@ export default class Label extends Component {
 	};
 
 	render(props, state) {
-		const { prefix, localizeKey, className, children } = props;
+		const { prefix, localizeKey, className, children, id } = props;
 		const key = prefix ? `${prefix}.${localizeKey}` : localizeKey;
 		const localizedContent = lookup(key);
 		const style = localizedContent ? "" : "display:none";
 
 		return (
 			<span
+				id={id}
 				style={style}
 				class={props.class || className}
 				dangerouslySetInnerHTML={localizedContent && {__html: localizedContent}}>
diff --git a/src/components/popup/details/details.jsx b/src/components/popup/details/details.jsx
index 00f804a3..60243f62 100644
--- a/src/components/popup/details/details.jsx
+++ b/src/components/popup/details/details.jsx
@@ -212,10 +212,14 @@ export default class Details extends Component {
 					</Panel>
 				</div>
 				<div class={style.footer}>
-					<a aria-label='back' class={style.cancel} onClick={this.handleBack}><LocalLabel prefix={'tabs.tab' + (selectedTab + 1)}
-																				  localizeKey='back'>Back</LocalLabel></a>
-					<Button ariaLabel='save settings and close' class={style.save} onClick={onSaveOrClose}><LocalLabel
-						prefix={'tabs.tab' + (selectedTab + 1)} localizeKey='save'>Save and Exit</LocalLabel></Button>
+					<a
+						class={style.cancel}
+						onClick={this.handleBack}>
+						<LocalLabel prefix={'tabs.tab' + (selectedTab + 1)} localizeKey='back'>Back</LocalLabel>
+					</a>
+					<Button ariaLabelledBy='save' class={style.save} onClick={onSaveOrClose}>
+						<LocalLabel prefix={'tabs.tab' + (selectedTab + 1)} id='save' localizeKey='save'>Save and Exit</LocalLabel>
+					</Button>
 				</div>
 			</div>
 		);
diff --git a/src/components/popup/intro/intro.jsx b/src/components/popup/intro/intro.jsx
index 5679667c..1777b0b5 100644
--- a/src/components/popup/intro/intro.jsx
+++ b/src/components/popup/intro/intro.jsx
@@ -35,19 +35,19 @@ export default class Intro extends Component {
 				</div>
 				<div class={style.options}>
 					<Button
-						ariaLabel='go to advanced settings'
 						class={style.rejectAll}
 						invert={true}
 						onClick={onShowPurposes}
+						ariaLabelledBy="showPurposes"
 					>
-						<LocalLabel localizeKey='showPurposes'>Manage your choices</LocalLabel>
+						<LocalLabel localizeKey='showPurposes' id="showPurposes">Manage your choices</LocalLabel>
 					</Button>
 					<Button
-						ariaLabel='accept and close'
+						ariaLabelledBy="acceptAll"
 						class={style.acceptAll}
 						onClick={onAcceptAll}
 					>
-						<LocalLabel localizeKey='acceptAll'>Got it, thanks!</LocalLabel>
+						<LocalLabel localizeKey='acceptAll' id="acceptAll">Got it, thanks!</LocalLabel>
 					</Button>
 				</div>
 			</div>