diff --git a/app/soapbox/features/forms/index.js b/app/soapbox/features/forms/index.js
index b56b6302f..a95b8d1be 100644
--- a/app/soapbox/features/forms/index.js
+++ b/app/soapbox/features/forms/index.js
@@ -272,7 +272,7 @@ export class ColorWithPicker extends ImmutablePureComponent {
     return (
       <div className='label_input__color'>
         <label>{label}</label>
-        <div id={buttonId} className='color-swatch' style={{ background: value }} value={value} onClick={this.onToggle} />
+        <div id={buttonId} className='color-swatch' role='presentation' style={{ background: value }} value={value} onClick={this.onToggle} />
         <Overlay show={active} placement={placement} target={this}>
           <ColorPicker value={value} onChange={onChange} onClose={this.onHidePicker} />
         </Overlay>
diff --git a/app/styles/components/buttons.scss b/app/styles/components/buttons.scss
index fd664d06d..49070ad6c 100644
--- a/app/styles/components/buttons.scss
+++ b/app/styles/components/buttons.scss
@@ -102,7 +102,7 @@ button {
     &:focus,
     &:hover {
       border-color: var(--brand-color);
-      color: var(--primary-text-color);
+      color: var(--background-color);
     }
 
     &:disabled {