diff --git a/electrum/gui/kivy/main.kv b/electrum/gui/kivy/main.kv
index 177b69852..d61b4fcf4 100644
--- a/electrum/gui/kivy/main.kv
+++ b/electrum/gui/kivy/main.kv
@@ -58,6 +58,7 @@
 
 <IconButton@Button>:
     icon: ''
+    icon_size: '30dp'
     AnchorLayout:
         pos: self.parent.pos
         size: self.parent.size
@@ -65,7 +66,7 @@
         Image:
             source: self.parent.parent.icon
             size_hint_x: None
-            size: '30dp', '30dp'
+            size: root.icon_size, root.icon_size
 
             
 <BackgroundColor@Widget>
diff --git a/electrum/gui/kivy/uix/dialogs/password_dialog.py b/electrum/gui/kivy/uix/dialogs/password_dialog.py
index c9f6fa171..06dccf125 100644
--- a/electrum/gui/kivy/uix/dialogs/password_dialog.py
+++ b/electrum/gui/kivy/uix/dialogs/password_dialog.py
@@ -58,24 +58,23 @@ Builder.load_string('''
             orientation: 'horizontal'
             id: box_generic_password
             size_hint_y: 0.05
-            WizardTextInput:
+            height: '40dp'
+            TextInput:
+                height: '40dp'
                 id: textinput_generic_password
                 valign: 'center'
                 multiline: False
                 on_text_validate:
                     popup.on_password(self.text)
                 password: True
-                size_hint: 0.9, None
+                size_hint: 0.85, None
                 unfocus_on_touch: False
                 focus: True
-            Button:
-                size_hint: 0.1, None
-                valign: 'center'
-                background_normal: 'atlas://electrum/gui/kivy/theming/light/eye1'
-                background_down: self.background_normal
-                height: '50dp'
-                width: '50dp'
-                padding: '5dp', '5dp'
+            IconButton:
+                height: '40dp'
+                size_hint: 0.15, None
+                icon: 'atlas://electrum/gui/kivy/theming/light/eye1'
+                icon_size: '40dp'
                 on_release:
                     textinput_generic_password.password = False if textinput_generic_password.password else True
         Widget: