diff --git a/contrib/make_download b/contrib/make_download
index c446aa750..7c6ca4444 100755
--- a/contrib/make_download
+++ b/contrib/make_download
@@ -4,7 +4,7 @@ import re
 import hashlib
 import os
 
-from versions import version, version_win, version_mac
+from versions import version, version_win, version_mac, version_apk
 from versions import download_template, download_page
 
 with open(download_template) as f:
@@ -13,6 +13,7 @@ with open(download_template) as f:
 string = string.replace("##VERSION##", version)
 string = string.replace("##VERSION_WIN##", version_win)
 string = string.replace("##VERSION_MAC##", version_mac)
+string = string.replace("##VERSION_APK##", version_apk)
 
 files = {
     'tgz': "Electrum-%s.tar.gz" % version,
diff --git a/gui/kivy/uix/dialogs/settings.py b/gui/kivy/uix/dialogs/settings.py
index 81d723ee9..07e4e478b 100644
--- a/gui/kivy/uix/dialogs/settings.py
+++ b/gui/kivy/uix/dialogs/settings.py
@@ -151,7 +151,7 @@ class SettingsDialog(Factory.Popup):
     def unit_dialog(self, item, dt):
         if self._unit_dialog is None:
             def cb(text):
-                self._set_bu(text)
+                self.app._set_bu(text)
                 item.bu = self.app.base_unit
             self._unit_dialog = ChoiceDialog(_('Denomination'), base_units.keys(), self.app.base_unit, cb)
         self._unit_dialog.open()
diff --git a/gui/kivy/uix/dialogs/wallets.py b/gui/kivy/uix/dialogs/wallets.py
index 55d4fd273..96dc735ec 100644
--- a/gui/kivy/uix/dialogs/wallets.py
+++ b/gui/kivy/uix/dialogs/wallets.py
@@ -17,6 +17,7 @@ Builder.load_string('''
     path: ''
     BoxLayout:
         orientation: 'vertical'
+        padding: '10dp'
         FileChooserListView:
             id: wallet_selector
             dirselect: False