diff --git a/resources/less/metager/bs-variables.less b/resources/less/metager/bs-variables.less
index 140426856f3387f4f97bbd694a65b6b400e3499f..96cbaff829b54e8103d7d04521b34ab29c65d2bc 100644
--- a/resources/less/metager/bs-variables.less
+++ b/resources/less/metager/bs-variables.less
@@ -169,12 +169,12 @@
 //##
 
 //** `<input>` background color
-@input-bg:                       #fff;
+@input-bg:                       @input-background;
 //** `<input disabled>` background color
 @input-bg-disabled:              @gray-lighter;
 
 //** Text color for `<input>`s
-@input-color:                    @gray;
+@input-color:                    @input-text;
 //** `<input>` border color
 @input-border:                   #ccc;
 
diff --git a/resources/less/metager/general/forms.less b/resources/less/metager/general/forms.less
index 358e74a0fe3078cf90682e42fda85283e438dfa8..ca63b1d74f96b03bc86166f869e3137efe515cd6 100644
--- a/resources/less/metager/general/forms.less
+++ b/resources/less/metager/general/forms.less
@@ -105,6 +105,11 @@ output {
   color: @input-color;
 }
 
+#pubkey{
+  background-color: @input-bg;
+  color: @input-text;
+}
+
 
 // Common form controls
 //
diff --git a/resources/less/metager/parts/bitpay.less b/resources/less/metager/parts/bitpay.less
index e1ce9a01f2a45a768e22418951ca66ccb476c555..69baae7fb1456657f383081d7f6278ea3a0c5ae2 100644
--- a/resources/less/metager/parts/bitpay.less
+++ b/resources/less/metager/parts/bitpay.less
@@ -4,8 +4,8 @@
         border: 0;
     }
     .field-input {
-        color: #666;
-        background: #fff;
+        color: @input-text;
+        background: @input-bg;
         border: 1px solid #eee;
         height: 30px;
         box-sizing: border-box;
diff --git a/resources/less/metager/parts/button.less b/resources/less/metager/parts/button.less
index d3fe30e001b5e14cdf85376f7051ee233bc0cba1..8755c09f9dec2b5e0a9c98bef82dc6a3aab33b08 100644
--- a/resources/less/metager/parts/button.less
+++ b/resources/less/metager/parts/button.less
@@ -22,8 +22,8 @@
 // Alternative buttons
 
 .btn-default {
-color: #333;
-background-color: #ffffff;
+color: @input-text;
+background-color: @input-bg;
 border-color: #ccc;
 }
 
diff --git a/resources/less/metager/variables-dark.less b/resources/less/metager/variables-dark.less
index ea43ab34d7e63c0e1da4ad3226d054a1cb72d9b1..3db77f7a009061a4b4e63050e5c36c6899c17689 100644
--- a/resources/less/metager/variables-dark.less
+++ b/resources/less/metager/variables-dark.less
@@ -28,4 +28,7 @@
 @story-font-color: @color-almost-white;
 @icon-color:1;
 
-@searchbar-background-color: @color-almost-black;
\ No newline at end of file
+@searchbar-background-color: @color-almost-black;
+
+@input-background: @color-almost-black;
+@input-text: @color-almost-white;
\ No newline at end of file
diff --git a/resources/less/metager/variables.less b/resources/less/metager/variables.less
index 90be249ac52617c1b5d37d612e9dc39fdf510372..91eaf06ca77fe24f9a90052eaa3920e4102fca14 100644
--- a/resources/less/metager/variables.less
+++ b/resources/less/metager/variables.less
@@ -75,4 +75,7 @@ sans-serif;
 @story-font-color:#474747;
 @icon-color:0;
 
-@searchbar-background-color: white;
\ No newline at end of file
+@searchbar-background-color: white;
+
+@input-background:#fff;
+@input-text:#000;
\ No newline at end of file