diff --git a/client/coral-admin/src/containers/Configure/Configure.js b/client/coral-admin/src/containers/Configure/Configure.js
index ef78679a9..92756c4a8 100644
--- a/client/coral-admin/src/containers/Configure/Configure.js
+++ b/client/coral-admin/src/containers/Configure/Configure.js
@@ -7,7 +7,7 @@ import {
   updateWordlist,
 } from '../../actions/settings';
 
-import {Button, Icon, List, Item} from 'coral-ui';
+import {Button, List, Item} from 'coral-ui';
 import styles from './Configure.css';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../../translations.json';
@@ -118,17 +118,22 @@ class Configure extends Component {
             </List>
             {
               showSave ?
-              <Button
-                raised
-                onClick={this.saveSettings}
-                className={styles.changedSave}>
-                <Icon name='check' /> {lang.t('configure.save-changes')}
-              </Button>
-              : <Button
-              raised
-              disabled>
-              {lang.t('configure.save-changes')}
-            </Button>
+                <Button
+                  raised
+                  onClick={this.saveSettings}
+                  className={styles.changedSave}
+                  icon='check'
+                >
+                  {lang.t('configure.save-changes')}
+                </Button>
+              :
+                <Button
+                  raised
+                  disabled
+                  icon='check'
+                >
+                {lang.t('configure.save-changes')}
+               </Button>
             }
 
           </div>
diff --git a/client/coral-ui/components/Button.js b/client/coral-ui/components/Button.js
index 7e908d525..52d806adb 100644
--- a/client/coral-ui/components/Button.js
+++ b/client/coral-ui/components/Button.js
@@ -1,7 +1,8 @@
 import React from 'react';
 import styles from './Button.css';
+import Icon from './Icon';
 
-const Button = ({cStyle = 'local', children, className, raised = false, full = false, ...props}) => (
+const Button = ({cStyle = 'local', children, className, raised = false, full = false, icon = '', ...props}) => (
   <button
     className={`
       ${styles.button}
@@ -12,6 +13,7 @@ const Button = ({cStyle = 'local', children, className, raised = false, full = f
     `}
     {...props}
   >
+    {icon && <Icon name={icon} />}
     {children}
   </button>
 );