diff --git a/gui/kivy/main.kv b/gui/kivy/main.kv
index 571f8882..cbbd9cc8 100644
--- a/gui/kivy/main.kv
+++ b/gui/kivy/main.kv
@@ -18,29 +18,6 @@
     size_hint: 1, None
     height: self.minimum_height
 
-
-<IconButton@ButtonBehavior+Image>
-    allow_stretch: True
-    size_hint_x: None
-    width: self.height
-    canvas:
-        BorderImage:
-            border: (10, 10, 10, 10)
-            source:
-                'atlas://gui/kivy/theming/light/' + ('tab_btn'\
-                if root.state == 'normal' else 'icon_border')
-            size: root.size
-            pos: root.pos
-
-
-<ELTextInput>
-    padding: '10dp', '4dp'
-    background_color: (0.238, 0.589, .996, 1) if self.focus else self.foreground_color
-    foreground_color: 0.531, 0.531, 0.531, 1
-    background_active: 'atlas://gui/kivy/theming/light/textinput_active'
-    background_normal: 'atlas://gui/kivy/theming/light/textinput_active'
-
-
 ###########################
 #     Global Defaults
 ###########################
@@ -150,19 +127,6 @@
             pos: self.pos
 
 
-<TextInputBlue@TextInput>
-    padding: '5dp'
-    size_hint: 1, None
-    height: '27dp'
-    pos_hint: {'center_y':.5}
-    multiline: False
-    hint_text_color: self.foreground_color
-    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'
-
-
 <KButton@Button>:
     size_hint: 1, None
     height: '48dp'
diff --git a/gui/kivy/theming/loading.gif b/gui/kivy/theming/loading.gif
deleted file mode 100644
index 2c0247a1..00000000
Binary files a/gui/kivy/theming/loading.gif and /dev/null differ
diff --git a/gui/kivy/tools/buildozer.spec b/gui/kivy/tools/buildozer.spec
index cd643ddf..3a794f70 100644
--- a/gui/kivy/tools/buildozer.spec
+++ b/gui/kivy/tools/buildozer.spec
@@ -19,7 +19,7 @@ source.include_exts = py,png,jpg,kv,atlas,ttf,txt,gif,pem,mo,vs,fs
 source.exclude_exts = spec
 
 # (list) List of directory to exclude (let empty to not exclude anything)
-source.exclude_dirs = bin, build, dist, contrib, gui/android, gui/qt, gui/kivy/tools
+source.exclude_dirs = bin, build, dist, contrib, gui/android, gui/qt, gui/kivy/tools, gui/kivy/theming/light
 # (list) List of exclusions using pattern matching
 source.exclude_patterns = Makefile,setup*
 
diff --git a/gui/kivy/uix/screens.py b/gui/kivy/uix/screens.py
index 4a7154fa..cf54b370 100644
--- a/gui/kivy/uix/screens.py
+++ b/gui/kivy/uix/screens.py
@@ -87,9 +87,6 @@ class CScreen(Factory.Screen):
         self.add_widget(self.context_menu)
 
 
-
-
-
 class HistoryScreen(CScreen):
 
     tab = ObjectProperty(None)
@@ -172,10 +169,6 @@ class HistoryScreen(CScreen):
             history_card.add_widget(EmptyLabel(text=msg))
 
 
-
-
-
-
 class SendScreen(CScreen):
 
     kvname = 'send'
@@ -210,7 +203,7 @@ class SendScreen(CScreen):
         self.screen.message = pr.get_memo()
 
     def do_paste(self):
-        contents = unicode(self.app._clipboard.get())
+        contents = unicode(self.app._clipboard.paste())
         try:
             uri = parse_URI(contents)
         except:
@@ -300,7 +293,7 @@ class ReceiveScreen(CScreen):
 
     def do_copy(self):
         uri = self.get_URI()
-        self.app._clipboard.put(uri, 'text/plain')
+        self.app._clipboard.copy(uri)
 
     def do_save(self):
         addr = str(self.screen.address)
@@ -528,18 +521,3 @@ class TabbedCarousel(Factory.TabbedPanel):
             self.carousel.add_widget(widget)
             return
         super(TabbedCarousel, self).add_widget(widget, index=index)
-
-
-class ELTextInput(Factory.TextInput):
-    '''Custom TextInput used in main screens for numeric entry
-    '''
-
-    def insert_text(self, substring, from_undo=False):
-        if not from_undo:
-            if self.input_type == 'numbers':
-                numeric_list = map(str, range(10))
-                if '.' not in self.text:
-                    numeric_list.append('.')
-                if substring not in numeric_list:
-                    return
-        super(ELTextInput, self).insert_text(substring, from_undo=from_undo)