diff --git a/js/components/ascribe_accordion_list/accordion_list_item_edition_widget.js b/js/components/ascribe_accordion_list/accordion_list_item_edition_widget.js
index f5a37a2e..47c0fb77 100644
--- a/js/components/ascribe_accordion_list/accordion_list_item_edition_widget.js
+++ b/js/components/ascribe_accordion_list/accordion_list_item_edition_widget.js
@@ -116,12 +116,12 @@ let AccordionListItemEditionWidget = React.createClass({
             if(piece.first_edition === null) {
                 // user has deleted all his editions and only the piece is showing
                 return (
-                    <Button
+                    <button
                         disabled
                         title={getLangText('All editions for this have been deleted already.')}
-                        className={classNames('btn', 'btn-secondary', 'btn-sm', 'ascribe-accordion-list-item-edition-widget', this.props.className)}>
+                        className={classNames('btn', 'btn-default', 'btn-secondary', 'btn-sm', 'ascribe-accordion-list-item-edition-widget', this.props.className)}>
                         {'0 ' + getLangText('Editions')}
-                    </Button>
+                    </button>
                 );
             } else {
                 let editionMapping = piece && piece.first_edition ? piece.first_edition.num_editions_available + '/' + piece.num_editions : '';
diff --git a/js/components/ascribe_buttons/create_editions_button.js b/js/components/ascribe_buttons/create_editions_button.js
index 3cb6257c..08fb76ce 100644
--- a/js/components/ascribe_buttons/create_editions_button.js
+++ b/js/components/ascribe_buttons/create_editions_button.js
@@ -77,7 +77,7 @@ let CreateEditionsButton = React.createClass({
             return (
                 <button
                     disabled
-                    className={classNames('btn', 'btn-default', this.props.className)}>
+                    className={classNames('btn', this.props.className)}>
                     {getLangText('Creating editions')} <AscribeSpinner
                         size='sm'
                         color='white'
@@ -87,7 +87,7 @@ let CreateEditionsButton = React.createClass({
         } else {
             return (
                 <button
-                    className={classNames('btn', 'btn-default', this.props.className)}
+                    className={classNames('btn', this.props.className)}
                     onClick={this.props.toggleCreateEditionsDialog}>
                     {this.props.label}
                 </button>
diff --git a/js/components/ascribe_uploader/react_s3_fine_uploader.js b/js/components/ascribe_uploader/react_s3_fine_uploader.js
index 9ac181b1..e8cc8bfa 100644
--- a/js/components/ascribe_uploader/react_s3_fine_uploader.js
+++ b/js/components/ascribe_uploader/react_s3_fine_uploader.js
@@ -326,7 +326,7 @@ let ReactS3FineUploader = React.createClass({
             .then((res) => {
                 return res.json();
             })
-            .then((res) =>{
+            .then((res) => {
                 if(res.otherdata) {
                     file.s3Url = res.otherdata.url_safe;
                     file.s3UrlSafe = res.otherdata.url_safe;
diff --git a/sass/ascribe_custom_style.scss b/sass/ascribe_custom_style.scss
index 758bf0ef..51281d91 100644
--- a/sass/ascribe_custom_style.scss
+++ b/sass/ascribe_custom_style.scss
@@ -238,6 +238,10 @@ hr {
 // thought of the day:
 // "every great atrocity is the result of people just following orders"
 
+.btn {
+    font-weight: $ascribe--font-weight-light;
+}
+
 // disabled buttons
 .btn-default.disabled,
 .btn-default.disabled:hover,
@@ -264,7 +268,6 @@ fieldset[disabled] .btn-default.active {
 .btn-default {
     background-color: $ascribe--button-default-color;
     border-color: $ascribe--button-default-color;
-    font-weight: $ascribe--font-weight-light;
 
     &:hover,
     &:active,
diff --git a/sass/whitelabel/wallet/cc/cc_custom_style.scss b/sass/whitelabel/wallet/cc/cc_custom_style.scss
index 999af954..0c3fd0ba 100644
--- a/sass/whitelabel/wallet/cc/cc_custom_style.scss
+++ b/sass/whitelabel/wallet/cc/cc_custom_style.scss
@@ -70,6 +70,7 @@ $cc--button-color: $cc--nav-fg-prim-color;
 
 // disabled buttons
 .client--cc {
+    // disabled buttons
     .btn-default.disabled,
     .btn-default.disabled:hover,
     .btn-default.disabled:focus,
@@ -88,8 +89,30 @@ $cc--button-color: $cc--nav-fg-prim-color;
     fieldset[disabled] .btn-default.focus,
     fieldset[disabled] .btn-default:active,
     fieldset[disabled] .btn-default.active {
-        background-color: darken($cc--button-color, 20%);
-        border-color: darken($cc--button-color, 20%);
+        background-color: $cc--nav-bg-color;
+        color: $cc--nav-fg-prim-color;
+    }
+}
+
+.client--cc {
+    .btn-secondary {
+        background-color: $cc--nav-bg-color;
+        border-color: $cc--nav-fg-prim-color;
+        color: $cc--nav-fg-prim-color;
+
+        &:hover,
+        &:active,
+        &:focus,
+        &:active:hover,
+        &:active:focus,
+        &:active.focus,
+        &.active:hover,
+        &.active:focus,
+        &.active.focus {
+            background-color: $cc--nav-fg-prim-color;
+            border-color: $cc--nav-fg-prim-color;
+            color: $cc--nav-bg-color;
+        }
     }
 }