diff --git a/src/addons/settings/settings.css b/src/addons/settings/settings.css
index 146b8c65f..c5719d996 100644
--- a/src/addons/settings/settings.css
+++ b/src/addons/settings/settings.css
@@ -210,7 +210,7 @@ a[href] {
     background-color: transparent;
 }
 .reset-button:hover {
-    background: rgba(255, 255, 255, 0.05);
+    background: rgba(0, 0, 0, 0.05);
 }
 .reset-button:focus-within {
     outline: none;
@@ -224,6 +224,9 @@ a[href] {
     .reset-button-image {
         filter: invert(100%);
     }
+    .reset-button:hover {
+        background: rgba(255, 255, 255, 0.05);
+    }
 }
 
 .switch {
@@ -266,6 +269,10 @@ a[href] {
     }
 }
 
+.tag-container {
+    display: flex;
+    align-items: center;
+}
 .tag {
     border-radius: 4px;
     padding: 2px 5px;
@@ -328,7 +335,7 @@ a[href] {
 
 .setting {
     margin: 10px;
-    margin-right: 10px;
+    margin-right: 20px;
     min-height: 35px;
     display: flex;
     align-items: center;
@@ -379,12 +386,17 @@ a[href] {
 .setting input[type="color"] {
     height: 30px;
     width: 100px;
+    box-sizing: border-box;
     padding: 0;
-    overflow: hidden;
+    margin: 0;
+    outline: none;
+    border: 1px solid transparent;
     border-radius: 4px 0px 0px 4px;
 }
 .reset-color-button {
     border-radius: 0 4px 4px 0px;
+    box-sizing: border-box;
+    height: 30px;
 }
 .select {
     display: flex;
@@ -433,7 +445,10 @@ a[href] {
 }
 
 .presets {
-
+    width: 100%;
+}
+.preset-button {
+    margin-right: 10px;
 }
 
 .footer-buttons {
diff --git a/src/addons/settings/settings.jsx b/src/addons/settings/settings.jsx
index c11418fa9..89d94c741 100644
--- a/src/addons/settings/settings.jsx
+++ b/src/addons/settings/settings.jsx
@@ -33,6 +33,7 @@ import undoImage from './undo.svg';
 import styles from './settings.css';
 
 /* eslint-disable no-alert */
+/* eslint-disable no-console */
 
 const locale = detectLocale(upstreamMeta.languages);
 const addonTranslations = getAddonTranslations(locale);
@@ -85,37 +86,33 @@ SwitchComponent.propTypes = {
 };
 
 const SelectComponent = ({
-    addonId,
+    onChange,
     value,
-    setting
+    values
 }) => (
     <div className={styles.select}>
-        {setting.potentialValues.map(potentialValue => {
+        {values.map(potentialValue => {
             const id = potentialValue.id;
             const selected = id === value;
-            const valueName = addonTranslations[`${addonId}/@settings-select-${setting.id}-${id}`] || potentialValue.name;
             return (
                 <button
                     key={id}
-                    onClick={() => SettingsStore.setAddonSetting(addonId, setting.id, id)}
+                    onClick={() => onChange(id)}
                     className={classNames(styles.selectOption, {[styles.selected]: selected})}
                 >
-                    {valueName}
+                    {potentialValue.name}
                 </button>
             );
         })}
     </div>
 );
 SelectComponent.propTypes = {
-    addonId: PropTypes.string,
+    onChange: PropTypes.func,
     value: PropTypes.string,
-    setting: PropTypes.shape({
+    values: PropTypes.arrayOf(PropTypes.shape({
         id: PropTypes.string,
-        potentialValues: PropTypes.arrayOf(PropTypes.shape({
-            id: PropTypes.string,
-            name: PropTypes.string
-        }))
-    })
+        name: PropTypes.string
+    }))
 };
 
 const TagComponent = ({tags}) => tags.length > 0 && (
@@ -153,7 +150,7 @@ const SettingComponent = ({
 }) => {
     const settingId = setting.id;
     const settingName = addonTranslations[`${addonId}/@settings-name-${settingId}`] || setting.name;
-    const uniqueId = `setting/${addonId}/${settingId}`
+    const uniqueId = `setting/${addonId}/${settingId}`;
     const label = (
         <label
             htmlFor={uniqueId}
@@ -212,8 +209,12 @@ const SettingComponent = ({
                 <>
                     {label}
                     <SelectComponent
-                        addonId={addonId}
                         value={value}
+                        values={setting.potentialValues.map(({id, name}) => ({
+                            id,
+                            name: addonTranslations[`${addonId}/@settings-select-${settingId}-${id}`] || name
+                        }))}
+                        onChange={v => SettingsStore.setAddonSetting(addonId, settingId, v)}
                         setting={setting}
                     />
                 </>
@@ -229,6 +230,7 @@ SettingComponent.propTypes = {
         name: PropTypes.string,
         min: PropTypes.number,
         max: PropTypes.number,
+        default: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.bool]),
         potentialValues: PropTypes.arrayOf(PropTypes.shape({
             id: PropTypes.string,
             name: PropTypes.string
@@ -266,32 +268,26 @@ const PresetComponent = ({
     addonId,
     presets
 }) => (
-    <select
-        className={styles.presets}
-        onChange={e => SettingsStore.applyAddonPreset(addonId, e.target.value)}
-        value="_presets"
-    >
-        <option
-            disabled
-            value="_presets"
-        >
+    <div className={classNames(styles.setting, styles.presets)}>
+        <div className={styles.settingLabel}>
             {settingsTranslations['tw.addons.settings.presets']}
-        </option>
+        </div>
         {presets.map(preset => {
             const presetId = preset.id;
             const name = addonTranslations[`${addonId}/@preset-name-${presetId}`] || preset.name;
             const description = addonTranslations[`${addonId}/@preset-description-${presetId}`] || preset.description;
             return (
-                <option
+                <button
                     key={presetId}
-                    value={presetId}
                     title={description}
+                    className={classNames(styles.button, styles.presetButton)}
+                    onClick={() => SettingsStore.applyAddonPreset(addonId, presetId)}
                 >
                     {name}
-                </option>
+                </button>
             );
         })}
-    </select>
+    </div>
 );
 PresetComponent.propTypes = {
     addonId: PropTypes.string,
@@ -344,7 +340,6 @@ const AddonComponent = ({
                     value={settings.enabled}
                     onChange={value => SettingsStore.setAddonEnabled(id, value)}
                 />
-                {/* TODO: Presets */}
             </div>
         </div>
         {settings.enabled && (
@@ -370,6 +365,12 @@ const AddonComponent = ({
                                 value={settings[setting.id]}
                             />
                         ))}
+                        {manifest.presets && (
+                            <PresetComponent
+                                addonId={id}
+                                presets={manifest.presets}
+                            />
+                        )}
                     </div>
                 )}
             </div>