diff --git a/app/components/modal-edit-apikey/template.hbs b/app/components/modal-edit-apikey/template.hbs
index 833a46871..6b421d682 100644
--- a/app/components/modal-edit-apikey/template.hbs
+++ b/app/components/modal-edit-apikey/template.hbs
@@ -4,25 +4,21 @@
     <hr/>
 
     <div class="input-group">
-      <span class="input-group-addon bg-code-dark">{{t 'apiPage.currentEndpoint'}}</span>
+      <span class="input-group-addon bg-default">{{t 'apiPage.currentEndpoint'}}</span>
         <code class="form-control"><a href="{{linkEndpoint}}" target="_blank" rel="nofollow noreferer">{{displayEndpoint}}</a></code>
-      <span class="input-group-addon bg-code-dark">{{copy-to-clipboard clipboardText=linkEndpoint}}</span>
+      <span class="input-group-addon bg-default">{{copy-to-clipboard clipboardText=linkEndpoint}}</span>
     </div>
 
     <div class="input-group mt-10">
-      <span class="input-group-addon bg-code-dark">{{t 'editApiKey.publicValue.label'}}</span>
-        <code class="form-control">{{#copy-to-clipboard clipboardText=clone.publicValue}}
-          <code>{{clone.publicValue}}</code>
-        {{/copy-to-clipboard}}</code>
-      <span class="input-group-addon bg-code-dark">{{copy-to-clipboard clipboardText=linkEndpoint}}</span>
+      <span class="input-group-addon bg-default">{{t 'editApiKey.publicValue.label'}}</span>
+        <code class="form-control">{{clone.publicValue}}</code>
+      <span class="input-group-addon bg-default">{{copy-to-clipboard clipboardText=clone.publicValue}}</span>
     </div>
 
     <div class="input-group mt-10">
-      <span class="input-group-addon bg-code-dark">{{t 'editApiKey.secretValue.label'}}</span>
-        <code class="form-control">{{#copy-to-clipboard clipboardText=clone.secretValue}}
-          <code>{{clone.secretValue}}</code>
-        {{/copy-to-clipboard}}</code>
-      <span class="input-group-addon bg-code-dark">{{copy-to-clipboard clipboardText=linkEndpoint}}</span>
+      <span class="input-group-addon bg-default">{{t 'editApiKey.secretValue.label'}}</span>
+        <code class="form-control">{{clone.secretValue}}</code>
+      <span class="input-group-addon bg-default">{{copy-to-clipboard clipboardText=clone.secretValue}}</span>
     </div>
 
 {{!--     <div class="row">
diff --git a/app/mixins/modal-base.js b/app/mixins/modal-base.js
index a0a8011c5..9981dcc02 100644
--- a/app/mixins/modal-base.js
+++ b/app/mixins/modal-base.js
@@ -2,7 +2,7 @@ import Ember from 'ember';
 import C from 'ui/utils/constants';
 
 export default Ember.Mixin.create({
-  classNames: ['modal-container', 'box', 'alert'],
+  classNames: ['modal-container', 'alert'],
 
   modalService: Ember.inject.service('modal'),
   modalOpts: Ember.computed.alias('modalService.modalOpts'),