diff --git a/src/bitmessagekivy/baseclass/maildetail.py b/src/bitmessagekivy/baseclass/maildetail.py
index f82c8858..4a724e21 100644
--- a/src/bitmessagekivy/baseclass/maildetail.py
+++ b/src/bitmessagekivy/baseclass/maildetail.py
@@ -135,7 +135,7 @@ class MailDetail(Screen):  # pylint: disable=too-many-instance-attributes
             self.status = data[0][4]
         self.time_tag = ShowTimeHistoy(data[0][4]) if self.kivy_state.detailPageType == 'inbox' \
             else ShowTimeHistoy(data[0][6])
-        self.avatarImg = os.path.join(self.kivy_state.imageDir, 'avatar.png') \
+        self.avatarImg = os.path.join(self.kivy_state.imageDir, 'draft-icon.png') \
             if self.kivy_state.detailPageType == 'draft' \
             else (os.path.join(self.kivy_state.imageDir, 'text_images', '{0}.png'.format(avatarImageFirstLetter(
                 self.subject.strip()))))
diff --git a/src/bitmessagekivy/kv/login.kv b/src/bitmessagekivy/kv/login.kv
index 992938dc..fd2ffed4 100644
--- a/src/bitmessagekivy/kv/login.kv
+++ b/src/bitmessagekivy/kv/login.kv
@@ -82,7 +82,7 @@
                                 on_release:
                                     app.set_screen('random')
                                 on_press:
-                                    app.root.ids.sc7.reset_address_label()
+                                    app.root.ids.id_newidentity.reset_address_label()
 
         #info-area-outer
         BoxLayout:
@@ -177,7 +177,7 @@
                 width: dp(190)
                 helper_text_mode: "on_error"
                 # helper_text: "Please enter your label name"
-                on_text: app.root.ids.sc7.add_validation(self)
+                on_text: app.root.ids.id_newidentity.add_validation(self)
                 canvas.before:
                     Color:
                         rgba: (0,0,0,1)
@@ -186,7 +186,7 @@
             MDFillRoundFlatIconButton:
                 icon: "chevron-double-right"
                 text: app.tr._("Proceed Next")
-                on_release: app.root.ids.sc7.generateaddress()
+                on_release: app.root.ids.id_newidentity.generateaddress()
 
         Widget:
 
diff --git a/src/bitmessagekivy/main.kv b/src/bitmessagekivy/main.kv
index 9599fa58..18bdf48a 100644
--- a/src/bitmessagekivy/main.kv
+++ b/src/bitmessagekivy/main.kv
@@ -109,7 +109,7 @@
                 NavigationItem:
                     height: dp(48)
                     CustomSpinner:
-                        id: btn
+                        id: identity_dropdown
                         pos_hint:{"x":0,"y":0}
                         option_cls: Factory.get("MySpinnerOption")
                         font_size: '12.5sp'
@@ -227,7 +227,7 @@ MDNavigationLayout:
         Login:
             id:sc6
         Random:
-            id:sc7
+            id:id_newidentity
         Setting:
             id:sc9
         MyAddress: