diff --git a/app/styles/components/_code.scss b/app/styles/components/_code.scss
index ce6ae7741..3c86b15ea 100644
--- a/app/styles/components/_code.scss
+++ b/app/styles/components/_code.scss
@@ -1,6 +1,6 @@
 // Code
 $code-color                          : mix($warning, $error, 20%) !default;
-$code-bg                             : #fcf2e9 !default;
+$code-bg                             : $text-color !default;
 
 $pre-bg                              : #f5f5f5 !default;
 $pre-color                           : $dark-grey !default;
diff --git a/app/styles/components/_dropdown.scss b/app/styles/components/_dropdown.scss
index cddf99dd2..dac641097 100644
--- a/app/styles/components/_dropdown.scss
+++ b/app/styles/components/_dropdown.scss
@@ -2,7 +2,7 @@ $dropdown-bg                         : $body-bg !default;
 
 $dropdown-border                     : $light-grey !default;
 $dropdown-fallback-border            : transparent !default;
-$dropdown-divider-bg                 : $light-grey !default;
+$dropdown-divider-bg                 : $border !default;
 
 $dropdown-link-color                 : $link-color !default;
 $dropdown-link-hover-color           : $body-bg !default;
diff --git a/app/styles/components/_forms.scss b/app/styles/components/_forms.scss
index 0a8cab1fa..5ff46afeb 100644
--- a/app/styles/components/_forms.scss
+++ b/app/styles/components/_forms.scss
@@ -208,6 +208,10 @@ textarea {
     font-weight: normal;
     line-height: 1;
     text-align: center;
+
+    .copy-button-container button{
+      color: $body-bg;
+    }
 }
 
 .input-group-addon input[type="radio"],
diff --git a/app/styles/components/_searchable-select.scss b/app/styles/components/_searchable-select.scss
index fce81f9db..4be9ca278 100644
--- a/app/styles/components/_searchable-select.scss
+++ b/app/styles/components/_searchable-select.scss
@@ -44,7 +44,7 @@
 
   .searchable-options {
     overflow-y: scroll;
-    background: $input-bg;
+    background: $dropdown-bg;
     position: absolute;
     box-sizing: border-box;
     width: 100%;
diff --git a/app/styles/themes/_dark.scss b/app/styles/themes/_dark.scss
index c1bc1c333..c02b4fde4 100644
--- a/app/styles/themes/_dark.scss
+++ b/app/styles/themes/_dark.scss
@@ -119,7 +119,7 @@ $dropdown-border                     : transparent;
 //** Dropdown menu `border-color` **for IE8**.
 $dropdown-fallback-border            : transparent;
 //** Divider color for between dropdown items.
-$dropdown-divider-bg                 : rgba($black,.55);
+$dropdown-divider-bg                 : darken($border, 10);
 
 //** Dropdown link text color.
 $dropdown-link-color                 : white;
diff --git a/lib/global-admin/addon/clusters/new/rke/template.hbs b/lib/global-admin/addon/clusters/new/rke/template.hbs
index c70fbf88c..4030b30e3 100644
--- a/lib/global-admin/addon/clusters/new/rke/template.hbs
+++ b/lib/global-admin/addon/clusters/new/rke/template.hbs
@@ -16,13 +16,13 @@
     <div class="col span-6">
       <div class="box">
         <label>{{radio-button selection=scope value="embedded" disabled=true}} {{t 'clustersPage.addPage.rke.new.radio.embedded.label'}}</label>
-        <p class="text-info mb-0">{{t 'clustersPage.addPage.rke.new.radio.embedded.detail' appName=settings.appName}} &mdash; Coming Soon</p>
+        <p class="text-info text-small mb-0">{{t 'clustersPage.addPage.rke.new.radio.embedded.detail' appName=settings.appName}} &mdash; Coming Soon</p>
       </div>
     </div>
     <div class="col span-6">
       <div class="box">
         <label>{{radio-button selection=scope value="dedicated"}} {{t 'clustersPage.addPage.rke.new.radio.dedicated.label'}}</label>
-        <p class="text-info mb-0">{{t 'clustersPage.addPage.rke.new.radio.dedicated.detail' appName=settings.appName}}</p>
+        <p class="text-info text-small mb-0">{{t 'clustersPage.addPage.rke.new.radio.dedicated.detail' appName=settings.appName}}</p>
       </div>
     </div>
   </div>
diff --git a/lib/shared/addon/components/form-members/template.hbs b/lib/shared/addon/components/form-members/template.hbs
index 47d3df913..3d5b4b77d 100644
--- a/lib/shared/addon/components/form-members/template.hbs
+++ b/lib/shared/addon/components/form-members/template.hbs
@@ -1,5 +1,5 @@
 <div>
-  <table class="table fixed no-lines">
+  <table class="table fixed">
     <thead>
       <tr>
         <th width="150">{{t 'projectsPage.new.form.members.kind.label'}}</th>
diff --git a/lib/shared/addon/components/form-scoped-roles/template.hbs b/lib/shared/addon/components/form-scoped-roles/template.hbs
index a6c0013f3..da1005fae 100644
--- a/lib/shared/addon/components/form-scoped-roles/template.hbs
+++ b/lib/shared/addon/components/form-scoped-roles/template.hbs
@@ -35,11 +35,14 @@
   {{#if (eq mode 'custom')}}
     <div class="pl-20">
       {{#each custom as |row|}}
-        <div class="box p-10 mt-5 mb-5">
-          <label>
-            {{input type="checkbox" checked=row.active}} {{row.role.displayName}}
-            <p class="help-block">{{row.role.detail}}</p>
+        <div class="input-group mb-10 border">
+          <label class="input-group-addon bg-default p-10 vertical-middle">
+            {{input type="checkbox" checked=row.active}}
           </label>
+          <div class="form-control p-10 vertical-middle">
+            {{row.role.displayName}}
+            <p class="help-block">{{row.role.detail}}</p>
+          </div>
         </div>
       {{/each}}
     </div>
@@ -49,3 +52,12 @@
 
 {{top-errors errors=errors}}
 {{save-cancel save="save" cancel="cancel"}}
+
+        <div class="input-group">
+          <label class="input-group-addon bg-default">
+            <div class="bg-body form-control">
+              {{input type="checkbox" checked=row.active}} {{row.role.displayName}}
+              <p class="help-block">{{row.role.detail}}</p>
+            </div>
+          </label>
+        </div>
diff --git a/lib/shared/addon/components/modal-add-node/template.hbs b/lib/shared/addon/components/modal-add-node/template.hbs
index 07b340600..58a3e2385 100644
--- a/lib/shared/addon/components/modal-add-node/template.hbs
+++ b/lib/shared/addon/components/modal-add-node/template.hbs
@@ -1,3 +1,7 @@
+<section class="header">
+  <h1>{{t 'nodesPage.addNode'}}</h1>
+</section>
+
 {{#if (eq mode 'machineTemplate')}}
   {{host-template-list
       model=templates
diff --git a/lib/shared/addon/components/modal-edit-apikey/template.hbs b/lib/shared/addon/components/modal-edit-apikey/template.hbs
index 17a19d3b2..398026c48 100644
--- a/lib/shared/addon/components/modal-edit-apikey/template.hbs
+++ b/lib/shared/addon/components/modal-edit-apikey/template.hbs
@@ -5,14 +5,14 @@
 
     <div class="input-group">
       <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-default">{{copy-to-clipboard clipboardText=linkEndpoint}}</span>
+      <div class="bg-body form-control"><code class="ml-20"><a href="{{linkEndpoint}}" target="_blank" rel="nofollow noreferer">{{displayEndpoint}}</a></code></div>
+      <span class="input-group-addon bg-link text-white">{{copy-to-clipboard clipboardText=linkEndpoint}}</span>
     </div>
 
     <div class="input-group mt-10">
       <span class="input-group-addon bg-default">{{t 'editApiKey.token.label'}}</span>
-      <code class="form-control">{{clone.token}}</code>
-      <span class="input-group-addon bg-default">{{copy-to-clipboard clipboardText=clone.token}}</span>
+      <div class="bg-body form-control"><code class="ml-20">{{clone.token}}</code></div>
+      <span class="input-group-addon bg-link text-white">{{copy-to-clipboard clipboardText=clone.token}}</span>
     </div>
 
     <div class="banner bg-warning">