diff --git a/src/renderer/js/component/shapeShift/internal/active-shift.jsx b/src/renderer/js/component/shapeShift/internal/active-shift.jsx
index cd8577261..baab82194 100644
--- a/src/renderer/js/component/shapeShift/internal/active-shift.jsx
+++ b/src/renderer/js/component/shapeShift/internal/active-shift.jsx
@@ -72,8 +72,7 @@ class ActiveShapeShift extends React.PureComponent<Props> {
             <p>
               Send up to{" "}
               <span className="credit-amount--bold">
-                {originCoinDepositMax}{" "}
-                <span className="credit-amount--colored">{shiftCoinType}</span>
+                {originCoinDepositMax} {shiftCoinType}
               </span>{" "}
               to the address below.
             </p>
@@ -109,9 +108,9 @@ class ActiveShapeShift extends React.PureComponent<Props> {
             </p>
           </div>
         )}
-        <div className="shapeshift__actions">
+        <div className="card__actions card__actions--only-vertical">
           <Link
-            button="primary"
+            button={shiftState === statuses.COMPLETE ? "primary" : "alt"}
             onClick={clearShapeShift}
             label={
               shiftState === statuses.COMPLETE ||
diff --git a/src/renderer/js/component/shapeShift/internal/form.jsx b/src/renderer/js/component/shapeShift/internal/form.jsx
index 58d17b10c..201bfb394 100644
--- a/src/renderer/js/component/shapeShift/internal/form.jsx
+++ b/src/renderer/js/component/shapeShift/internal/form.jsx
@@ -86,7 +86,7 @@ export default (props: Props) => {
         onBlur={handleBlur}
         value={values.returnAddress}
         errorMessage={errors.returnAddress}
-        hasError={touched.returnAddress && errors.returnAddress}
+        hasError={touched.returnAddress && !!errors.returnAddress}
       />
       <span className="help">
         <span>
@@ -95,7 +95,7 @@ export default (props: Props) => {
           {__("to this address if the transaction doesn't go through.")}
         </span>
       </span>
-      <div className="shapeshift__actions">
+      <div className="card__actions card__actions--only-vertical">
         <Submit
           label={__("Begin Conversion")}
           disabled={isSubmitting || !!Object.keys(errors).length}
diff --git a/src/renderer/scss/_gui.scss b/src/renderer/scss/_gui.scss
index 53f8399e8..4cdd66370 100644
--- a/src/renderer/scss/_gui.scss
+++ b/src/renderer/scss/_gui.scss
@@ -39,11 +39,6 @@ body
   font-weight: 700;
 }
 
-.credit-amount--colored
-{
-  color: var(--color-primary);
-}
-
 #main-content
 {
   margin: auto;
diff --git a/src/renderer/scss/component/_card.scss b/src/renderer/scss/component/_card.scss
index 61a23f71d..53d8c6d1e 100644
--- a/src/renderer/scss/component/_card.scss
+++ b/src/renderer/scss/component/_card.scss
@@ -51,7 +51,7 @@
 .card__actions {
   margin-top: var(--card-margin);
   margin-bottom: var(--card-margin);
-  user-select: none; 
+  user-select: none;
 
 }
 .card__actions--bottom {
@@ -74,6 +74,13 @@
   }
 }
 
+.card__actions--only-vertical {
+  margin-left: 0;
+  margin-right: 0;
+  padding-left: 0;
+  padding-right: 0;
+}
+
 .card__content--extra-vertical-space {
   margin: $spacing-vertical 0;
 }
diff --git a/src/renderer/scss/component/_shapeshift.scss b/src/renderer/scss/component/_shapeshift.scss
index 1683141f9..cb69676a7 100644
--- a/src/renderer/scss/component/_shapeshift.scss
+++ b/src/renderer/scss/component/_shapeshift.scss
@@ -34,15 +34,7 @@
   margin-left: 40px;
 }
 
-.shapeshift__actions {
-  padding-top: $spacing-vertical;
-}
-
-.shapeshift__submit,
-.shapeshift__actions-help {
-  padding-top: $spacing-vertical / 2;
-}
 
 .shapeshift__link {
   padding-left: 10px;
-}
\ No newline at end of file
+}