diff --git a/gui/kivy/main.kv b/gui/kivy/main.kv
index fa5d45c5..afee54a0 100644
--- a/gui/kivy/main.kv
+++ b/gui/kivy/main.kv
@@ -192,6 +192,19 @@
     values: [] #app.wallet.addresses() if app.wallet else []
     text: _("Select Your address")
 
+<AmountButton@Button>:
+    background_color: .238, .585, .878, 0
+    halign: 'left'
+    text_size: (self.width-15, None)
+    size_hint: 0.5, None
+    default_text: 'Amount'
+    text: self.default_text
+    padding: '5dp', '5db'
+    height: '40dp'
+    text_color: self.foreground_color
+    foreground_color: 1, 0, 0, 1
+
+
 <TextInputBlue@TextInput>
     padding: '5dp'
     size_hint: 1, None
@@ -199,8 +212,8 @@
     pos_hint: {'center_y':.5}
     multiline: False
     hint_text_color: self.foreground_color
-    foreground_color: .843, .914, .972, 1
-    background_color: 1, 1, 1, 1
+    foreground_color: 1, 1, 1, 1
+    font_size: '16dp'
     background_normal: 'atlas://gui/kivy/theming/light/tab_btn'
     background_active: 'atlas://gui/kivy/theming/light/textinput_active'
 
diff --git a/gui/kivy/theming/splash.png b/gui/kivy/theming/splash.png
deleted file mode 100644
index 8373a503..00000000
Binary files a/gui/kivy/theming/splash.png and /dev/null differ
diff --git a/gui/kivy/tools/buildozer.spec b/gui/kivy/tools/buildozer.spec
index 08e1daa9..dd7a29a6 100644
--- a/gui/kivy/tools/buildozer.spec
+++ b/gui/kivy/tools/buildozer.spec
@@ -36,10 +36,12 @@ version.filename = %(source.dir)s/lib/version.py
 requirements = openssl, pil, plyer==master, kivy==master
 
 # (str) Presplash of the application
-presplash.filename = %(source.dir)s/gui/kivy/theming/splash.png
+#presplash.filename = %(source.dir)s/gui/kivy/theming/splash.png
+presplash.filename = %(source.dir)s/icons/electrum.png
 
 # (str) Icon of the application
-icon.filename = %(source.dir)s/icons/electrum_android_launcher_icon.png
+#icon.filename = %(source.dir)s/icons/electrum_android_launcher_icon.png
+icon.filename = %(source.dir)s/icons/electrum_launcher.png
 
 # (str) Supported orientation (one of landscape, portrait or all)
 orientation = portrait
diff --git a/gui/kivy/uix/ui_screens/amount.kv b/gui/kivy/uix/ui_screens/amount.kv
index 9eca9930..457f088c 100644
--- a/gui/kivy/uix/ui_screens/amount.kv
+++ b/gui/kivy/uix/ui_screens/amount.kv
@@ -25,7 +25,7 @@ Popup:
                     id: button_fiat
                     size_hint: 1, None
                     height: '48dp'
-                    text: '<->'
+                    text: '/'
                     on_release: a.is_fiat = not a.is_fiat
 
             Widget:
@@ -78,14 +78,22 @@ Popup:
                     text: 'Max'
                     on_release: a.amount = app.get_max_amount()
 
+            Widget:
+                size_hint: 1, None
+
             BoxLayout:
                 size_hint: 1, None
                 height: '48dp'
+                Button:
+                    size_hint: 1, None
+                    height: '48dp'
+                    text: 'Clear'
+                    on_release: a.amount = ''
                 Widget:
-                    size_hint: 0.7, None
+                    size_hint: 1, None
                     height: '48dp'
                 Button:
-                    size_hint: 0.3, None
+                    size_hint: 1, None
                     height: '48dp'
                     text: _('OK')
                     on_release: popup.dismiss()
diff --git a/gui/kivy/uix/ui_screens/receive.kv b/gui/kivy/uix/ui_screens/receive.kv
index 03fe48d2..e4dd0d80 100644
--- a/gui/kivy/uix/ui_screens/receive.kv
+++ b/gui/kivy/uix/ui_screens/receive.kv
@@ -40,20 +40,13 @@ ReceiveScreen:
                 size_hint: 1, None
                 height: blue_bottom.item_height
                 Image:
-                    source: 'atlas://gui/kivy/theming/light/bit_logo'
+                    source: 'atlas://gui/kivy/theming/light/globe'
                     size_hint: None, None
                     size: '22dp', '22dp'
                     pos_hint: {'center_y': .5}
-                Button:
+                AmountButton:
                     id: amount
-                    default_text: 'Amount (optional)'
-                    text: self.default_text
-                    text_size: (amount.width-15, None)
-                    halign: 'left'
-                    size_hint: 0.5, None
-                    height: '48dp'
                     on_release: app.amount_dialog(amount, receive_screen.parent.update_qr, False)
-                    background_color: 0, 0, 0, 0
             CardSeparator:
                 opacity: message_selection.opacity
                 color: blue_bottom.foreground_color
@@ -70,7 +63,7 @@ ReceiveScreen:
                     pos_hint: {'center_y': .5}
                 TextInputBlue:
                     id: message
-                    hint_text: 'Description (optional)'
+                    hint_text: 'Description'
                     on_text_validate: receive_screen.parent.update_qr()
 
         BoxLayout:
diff --git a/gui/kivy/uix/ui_screens/send.kv b/gui/kivy/uix/ui_screens/send.kv
index ab882bf9..6c7faea8 100644
--- a/gui/kivy/uix/ui_screens/send.kv
+++ b/gui/kivy/uix/ui_screens/send.kv
@@ -64,20 +64,15 @@ SendScreen:
                 size_hint: 1, None
                 height: blue_bottom.item_height
                 Image:
-                    source: 'atlas://gui/kivy/theming/light/bit_logo'
+                    source: 'atlas://gui/kivy/theming/light/globe'
                     size_hint: None, None
                     size: '22dp', '22dp'
                     pos_hint: {'center_y': .5}
-                Button:
+                AmountButton:
                     id: amount_e
-                    default_text: 'Amount'
-                    text: self.default_text
-                    text_size: (self.width-15, None)
-                    halign: 'left'
-                    size_hint: 0.5, None
-                    height: '48dp'
                     on_release: app.amount_dialog(self, None, True)
-                    background_color: .238, .585, .878, 0
+
+
             CardSeparator:
                 opacity: message_selection.opacity
                 color: blue_bottom.foreground_color
@@ -94,7 +89,7 @@ SendScreen:
                     pos_hint: {'center_y': .5}
                 TextInputBlue:
                     id: message_e
-                    hint_text: 'Description (optional)'
+                    hint_text: 'Description'
         BoxLayout:
             size_hint: 1, None
             height: '48dp'
diff --git a/icons/electrum_launcher.png b/icons/electrum_launcher.png
new file mode 100644
index 00000000..37af81ca
Binary files /dev/null and b/icons/electrum_launcher.png differ