diff --git a/src/components/modals/settings/Section.jsx b/src/components/modals/settings/Section.jsx
index 3c474110..9a9b6b96 100644
--- a/src/components/modals/settings/Section.jsx
+++ b/src/components/modals/settings/Section.jsx
@@ -20,7 +20,7 @@ export default class Section extends React.PureComponent {
       transform: transform
     });
 
-    if(this.props.onToggle) {
+    if (this.props.onToggle) {
       this.props.onToggle(display);
     }
   }
diff --git a/src/components/modals/settings/sections/BackgroundSettings.jsx b/src/components/modals/settings/sections/BackgroundSettings.jsx
index 2bd3c9b1..36895696 100644
--- a/src/components/modals/settings/sections/BackgroundSettings.jsx
+++ b/src/components/modals/settings/sections/BackgroundSettings.jsx
@@ -4,9 +4,8 @@ import Checkbox from '../Checkbox';
 import Dropdown from '../Dropdown';
 import Section from '../Section';
 import { ColorPicker } from 'react-color-gradient-picker';
-import 'react-color-gradient-picker/dist/index.css';
-import hexToRgb from '../../../../helpers/hexToRgb'
-import rgbToHex from '../../../../helpers/rgbToHex'
+import hexToRgb from '../../../../helpers/hexToRgb';
+import rgbToHex from '../../../../helpers/rgbToHex';
 
 export default class BackgroundSettings extends React.PureComponent {
   DefaultGradientSettings = { "angle": "180", "gradient": [{ "colour": this.props.language.background.disabled, "stop": 0 }], "type": "linear" };
@@ -42,7 +41,7 @@ export default class BackgroundSettings extends React.PureComponent {
     toast(this.props.toastLanguage.reset);
   }
 
-  mapFromGradientSettingsToColorPickerInitalState(gradientSettings) {
+  InitializeColorPickerState(gradientSettings) {
     this.GradientPickerInitalState = {
       points: gradientSettings.gradient.map((g) => {
         const rgb = hexToRgb(g.colour);
@@ -137,7 +136,7 @@ export default class BackgroundSettings extends React.PureComponent {
   }
 
   onColorPickerChange = (attrs, name) => {
-    if(process.env.NODE_ENV == 'development'){
+    if (process.env.NODE_ENV == 'development'){
       console.log(attrs, name);
     }
     this.setState({
@@ -160,7 +159,7 @@ export default class BackgroundSettings extends React.PureComponent {
       let gradientInputs;
       if (gradientHasMoreThanOneColour) {
         if (this.GradientPickerInitalState === undefined) {
-          this.mapFromGradientSettingsToColorPickerInitalState(this.state.gradientSettings);
+          this.InitializeColorPickerState(this.state.gradientSettings);
         }
         gradientInputs = (<ColorPicker
           onStartChange={color => this.onColorPickerChange(color, 'start')}
diff --git a/src/components/widgets/Background.jsx b/src/components/widgets/Background.jsx
index de05c7a8..13524486 100644
--- a/src/components/widgets/Background.jsx
+++ b/src/components/widgets/Background.jsx
@@ -6,7 +6,7 @@ export default class Background extends React.PureComponent {
     const { type, angle, gradient } = gradientSettings;
     let style = `background: ${gradient[0].colour};`;
     if (gradient.length > 1) {
-      //Note: Append the gradient for additional browser support.
+      // Note: Append the gradient for additional browser support.
       const stepStyles = gradient.map(g => ` ${g.colour} ${g.stop}%`).join();
       style += ` background: ${type}-gradient(${(type === 'linear' ? (`${angle}deg,`) : '')}${stepStyles})`;
     }
@@ -20,7 +20,7 @@ export default class Background extends React.PureComponent {
     } catch (e) {
       const hexColorRegex = /#[0-9a-fA-F]{6}/s;
       if (hexColorRegex.exec(colour)) {
-        //colour use to be simply a hex colour or a NULL value before it was a JSON object. This automatically upgrades the hex colour value to the new standard. (NULL would not trigger an exception)
+        // Colour use to be simply a hex colour or a NULL value before it was a JSON object. This automatically upgrades the hex colour value to the new standard. (NULL would not trigger an exception)
         gradientSettings = { "type": "linear", "angle": "180", "gradient": [{ "colour": colour, "stop": 0 }] };
         localStorage.setItem('customBackgroundColour', JSON.stringify(gradientSettings));
       }
diff --git a/src/helpers/hexToRgb.js b/src/helpers/hexToRgb.js
index f9a2fa7c..4e458912 100644
--- a/src/helpers/hexToRgb.js
+++ b/src/helpers/hexToRgb.js
@@ -1,5 +1,5 @@
-import  rgbToHsv  from './rgbToHsv';
-import  setRgba  from './setRgba';
+import rgbToHsv from './rgbToHsv';
+import setRgba from './setRgba';
 
 const hexRegexp = /(^#{0,1}[0-9A-F]{6}$)|(^#{0,1}[0-9A-F]{3}$)|(^#{0,1}[0-9A-F]{8}$)/i;
 
diff --git a/src/index.js b/src/index.js
index db69523f..5a8a52ec 100644
--- a/src/index.js
+++ b/src/index.js
@@ -2,6 +2,8 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import App from './App';
 
+import 'react-color-gradient-picker/dist/index.css';
+import './scss/react-color-picker-gradient-picker-custom-styles.scss';
 import './scss/index.scss';
 import 'react-toastify/dist/ReactToastify.css'; // the toast css is based on default so we need to import it
 
diff --git a/src/scss/index.scss b/src/scss/index.scss
index ccbcfd29..3acd0e2d 100644
--- a/src/scss/index.scss
+++ b/src/scss/index.scss
@@ -91,10 +91,4 @@ body {
 
 ::selection {
     background-color: #c2c2c2;
-}
-
-div.picker-area > div.preview > div.color-hue-alpha > div.alpha,
-div.color-preview-area > div > div:nth-child(5)
-{
-    display: none;
 }
\ No newline at end of file
diff --git a/src/scss/react-color-picker-gradient-picker-custom-styles.scss b/src/scss/react-color-picker-gradient-picker-custom-styles.scss
new file mode 100644
index 00000000..59d2a45c
--- /dev/null
+++ b/src/scss/react-color-picker-gradient-picker-custom-styles.scss
@@ -0,0 +1,17 @@
+//The following CSS is to work around some assumptions made by the react-color-gradient-picker
+* {    
+    box-sizing: inherit; //Required to work around https://github.com/arthay/react-color-gradient-picker/issues/11
+}
+
+div.picker-area > div.preview > div.color-hue-alpha > div.alpha,
+div.color-preview-area > div > div:nth-child(5) {
+    display: none;
+}
+
+.ui-color-picker {
+    margin: 8px -12px;
+}
+
+.input-field .label {
+    color: inherit;
+}
\ No newline at end of file