diff --git a/src/bitmessagekivy/kv/msg_composer.kv b/src/bitmessagekivy/kv/msg_composer.kv
index 2825b415..02c6cdd8 100644
--- a/src/bitmessagekivy/kv/msg_composer.kv
+++ b/src/bitmessagekivy/kv/msg_composer.kv
@@ -35,7 +35,7 @@
                 BoxLayout:
                     size_hint_y: None
                     height: dp(40)
-                    CustomSpinner:
+                    IdentitySpinner:
                         id: btn
                         background_color: app.theme_cls.primary_dark
                         values: app.variable_1
diff --git a/src/bitmessagekivy/main.kv b/src/bitmessagekivy/main.kv
index 1a27099b..f2fb4e09 100644
--- a/src/bitmessagekivy/main.kv
+++ b/src/bitmessagekivy/main.kv
@@ -108,7 +108,7 @@
                     height:"35dp"
                 NavigationItem:
                     height: dp(48)
-                    CustomSpinner:
+                    IdentitySpinner:
                         id: identity_dropdown
                         pos_hint:{"x":0,"y":0}
                         option_cls: Factory.get("MySpinnerOption")
@@ -223,7 +223,7 @@ MDNavigationLayout:
         Sent:
             id:sc4
         Trash:
-            id:sc5
+            id:id_trash
         Login:
             id:sc6
         Random:
@@ -247,7 +247,7 @@ MDNavigationLayout:
         Allmails:
             id:sc17
         ScanScreen:
-            id:is_scanscreen
+            id:id_scanscreen
 
     MDNavigationDrawer:
         id: nav_drawer