diff --git a/src/addons/settings/brush.svg b/src/addons/settings/icons/brush.svg
similarity index 100%
rename from src/addons/settings/brush.svg
rename to src/addons/settings/icons/brush.svg
diff --git a/src/addons/settings/check.svg b/src/addons/settings/icons/check.svg
similarity index 100%
rename from src/addons/settings/check.svg
rename to src/addons/settings/icons/check.svg
diff --git a/src/addons/settings/clear.svg b/src/addons/settings/icons/clear.svg
similarity index 100%
rename from src/addons/settings/clear.svg
rename to src/addons/settings/icons/clear.svg
diff --git a/src/addons/settings/expand.svg b/src/addons/settings/icons/expand.svg
similarity index 100%
rename from src/addons/settings/expand.svg
rename to src/addons/settings/icons/expand.svg
diff --git a/src/addons/settings/extension.svg b/src/addons/settings/icons/extension.svg
similarity index 100%
rename from src/addons/settings/extension.svg
rename to src/addons/settings/icons/extension.svg
diff --git a/src/addons/settings/info.svg b/src/addons/settings/icons/info.svg
similarity index 100%
rename from src/addons/settings/info.svg
rename to src/addons/settings/icons/info.svg
diff --git a/src/addons/settings/search.svg b/src/addons/settings/icons/search.svg
similarity index 100%
rename from src/addons/settings/search.svg
rename to src/addons/settings/icons/search.svg
diff --git a/src/addons/settings/undo.svg b/src/addons/settings/icons/undo.svg
similarity index 100%
rename from src/addons/settings/undo.svg
rename to src/addons/settings/icons/undo.svg
diff --git a/src/addons/settings/settings.css b/src/addons/settings/settings.css
index 2f914559c..4b9c9d7c9 100644
--- a/src/addons/settings/settings.css
+++ b/src/addons/settings/settings.css
@@ -138,7 +138,7 @@ a:active, a:focus {
     outline: none;
     cursor: pointer;
     background-color: transparent;
-    background-image: url("./search.svg");
+    background-image: url("./icons/search.svg");
     background-repeat: no-repeat;
     background-position: center;
 }
@@ -148,7 +148,7 @@ a:active, a:focus {
     border-color: #222222;
 }
 .search-input:not([value=""]) ~ .search-button {
-    background-image: url("./clear.svg") !important;
+    background-image: url("./icons/clear.svg") !important;
 }
 
 .feedback-button-outer {
@@ -503,7 +503,7 @@ a:active, a:focus {
 .setting input[type="checkbox"]:checked {
     border-color: $motion-primary;
     background-color: $motion-primary;
-    background-image: url("./check.svg");
+    background-image: url("./icons/check.svg");
 }
 .setting input[type="checkbox"]:hover:not(:focus) {
     border-color: $motion-tertiary;
diff --git a/src/addons/settings/settings.jsx b/src/addons/settings/settings.jsx
index 04d4f465b..347867139 100644
--- a/src/addons/settings/settings.jsx
+++ b/src/addons/settings/settings.jsx
@@ -28,11 +28,11 @@ import {detectLocale} from '../../lib/detect-locale';
 import {getInitialDarkMode} from '../../lib/tw-theme-hoc.jsx';
 import SettingsStore from '../settings-store-singleton';
 import Channels from '../channels';
-import extensionImage from './extension.svg';
-import brushImage from './brush.svg';
-import undoImage from './undo.svg';
-import expandImageBlack from './expand.svg';
-import infoImage from './info.svg';
+import extensionImage from './icons/extension.svg';
+import brushImage from './icons/brush.svg';
+import undoImage from './icons/undo.svg';
+import expandImageBlack from './icons/expand.svg';
+import infoImage from './icons/info.svg';
 import styles from './settings.css';
 import '../polyfill';
 import '../../lib/normalize.css';
@@ -309,6 +309,20 @@ TextInput.propTypes = {
     value: PropTypes.oneOfType([PropTypes.string, PropTypes.number])
 };
 
+const ColorInput = props => (
+    <input
+        type="color"
+        id={props.id}
+        value={props.value}
+        onChange={props.onChange}
+    />
+);
+ColorInput.propTypes = {
+    id: PropTypes.string.isRequired,
+    onChange: PropTypes.func.isRequired,
+    value: PropTypes.string.isRequired
+};
+
 const ResetButton = ({
     addonId,
     settingId,
@@ -388,9 +402,8 @@ const Setting = ({
             {setting.type === 'color' && (
                 <React.Fragment>
                     {label}
-                    <input
+                    <ColorInput
                         id={uniqueId}
-                        type="color"
                         value={value}
                         onChange={e => SettingsStore.setAddonSetting(addonId, settingId, e.target.value)}
                     />