diff --git a/package.json b/package.json
index aacb77e06..80740e900 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "postinstall": "electron-builder install-app-deps && node build/downloadDaemon.js"
   },
   "dependencies": {
-    "@lbry/components": "^2.2.3",
+    "@lbry/components": "^2.2.4",
     "@types/three": "^0.93.1",
     "bluebird": "^3.5.1",
     "breakdance": "^3.0.1",
diff --git a/src/renderer/component/common/form-components/form-field.jsx b/src/renderer/component/common/form-components/form-field.jsx
index c09449e40..fe88998f3 100644
--- a/src/renderer/component/common/form-components/form-field.jsx
+++ b/src/renderer/component/common/form-components/form-field.jsx
@@ -168,11 +168,9 @@ export class FormField extends React.PureComponent<Props> {
         input = (
           <React.Fragment>
             <fieldset-section>
-              {(label || errorMessage) && (
-                <label htmlFor={name}>
-                  {errorMessage ? <span className="error-text">{errorMessage}</span> : label}
-                </label>
-              )}
+              <label htmlFor={name}>
+                {errorMessage ? <span className="error-text">{errorMessage}</span> : label}
+              </label>
               {prefix && (
                 <label className="form-field--inline-prefix" htmlFor={name}>
                   {prefix}
diff --git a/src/renderer/scss/component/_button.scss b/src/renderer/scss/component/_button.scss
index e85ae97ac..82c7a0697 100644
--- a/src/renderer/scss/component/_button.scss
+++ b/src/renderer/scss/component/_button.scss
@@ -53,35 +53,45 @@
   }
 }
 
-.button--inverse {
+// This is a hack and the extra styles are just so this is more specific than the @lbry/components styling
+// Will make a PR there, but just doing it now for the release - Sean
+[type='button'].button--inverse {
   font-size: 1rem;
   transition: background-color 0.2s;
+  border-radius: 0;
 
   html[data-mode='dark'] & {
-    border-color: rgba($lbry-white, 0.1);
-    background-color: rgba($lbry-black, 0.3);
-  }
+    &:not(:hover) {
+      border-color: rgba($lbry-white, 0.1);
+      background-color: rgba($lbry-black, 0.3);
+    }
 
-  &:not(:hover) {
-    background-color: $lbry-white;
-  }
-
-  &:hover {
-    background-color: $lbry-gray-1;
-    color: $lbry-black;
-
-    html[data-mode='dark'] & {
+    &:hover {
+      border-color: rgba($lbry-white, 0.1);
       background-color: rgba($lbry-white, 0.1);
       color: $lbry-white;
     }
   }
 
+  html[data-mode='light'] & {
+    &:not(:hover) {
+      background-color: $lbry-white;
+      color: $lbry-black;
+    }
+
+    &:hover {
+      background-color: $lbry-gray-1;
+      color: $lbry-black;
+    }
+  }
+
   .button__content {
     svg {
       color: $lbry-gray-4;
     }
   }
 }
+
 .button--link:not(:disabled) {
   html[data-mode='dark'] & {
     &:not(:hover) {
diff --git a/src/renderer/scss/component/_form-field.scss b/src/renderer/scss/component/_form-field.scss
index 39eb25ba7..0158f9cb3 100644
--- a/src/renderer/scss/component/_form-field.scss
+++ b/src/renderer/scss/component/_form-field.scss
@@ -142,14 +142,21 @@ fieldset-group {
 
 // form buttons are black by default
 form {
-  // [data-mode='dark'] & {
-  .button--primary:not(:hover) {
-    background-color: $lbry-teal-5;
-    border-color: $lbry-teal-5;
+  [type='button'] {
+    &.button--primary {
+      &:not(:hover) {
+        background-color: $lbry-teal-5;
+        border-color: $lbry-teal-5;
+      }
 
-    &:hover {
-      background-color: $lbry-teal-3;
-      border-color: $lbry-teal-3;
+      &:hover {
+        background-color: $lbry-teal-3;
+        border-color: $lbry-teal-3;
+      }
+    }
+
+    &.button--inverse {
+      @extend .button--inverse;
     }
   }
 }
diff --git a/yarn.lock b/yarn.lock
index e4492c10c..084b86b72 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -111,10 +111,10 @@
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.1.tgz#e93c13942592cf5ef01aa8297444dc192beee52f"
 
-"@lbry/components@^2.2.3":
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/@lbry/components/-/components-2.2.3.tgz#8823855bb4e011d2fc7497de03e6435e07757d6f"
-  integrity sha512-HONPvhjtvOBEaBTeHTIs0WFD1u3j9tprNTFTKa9zoI7ZLtbHnGqHM+Vi3Oq5xl8OQxEkgJNsHGUDtV4FLhcsHg==
+"@lbry/components@^2.2.4":
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/@lbry/components/-/components-2.2.4.tgz#ee2c91788de447ed33185daa7a747ba684e5143f"
+  integrity sha512-SF0g4JROwYsvJc9fEFmAYAj9cITJ9L2MTkWCs9vfPhDS4iXE6ZW5VNtcxI5JOVAvsZMRHq5oX9EtjxHs1pIIdg==
 
 "@mapbox/hast-util-table-cell-style@^0.1.3":
   version "0.1.3"