diff --git a/src/bitmessagekivy/baseclass/addressbook.py b/src/bitmessagekivy/baseclass/addressbook.py
index 8e97d8a8..a31b1e36 100644
--- a/src/bitmessagekivy/baseclass/addressbook.py
+++ b/src/bitmessagekivy/baseclass/addressbook.py
@@ -76,9 +76,12 @@ class AddressBook(Screen):
             listItem.secondary_text = item[1]
             listItem.theme_text_color = "Custom"
             listItem.text_color = ThemeClsColor
-            listItem.add_widget(AvatarSampleWidget(
-                source=state.imageDir + '/text_images/{}.png'.format(
-                    avatarImageFirstLetter(item[0].strip()))))
+            # listItem.add_widget(AvatarSampleWidget(
+            #     source=state.imageDir + '/text_images/{}.png'.format(
+            #         avatarImageFirstLetter(item[0].strip()))))
+            image = state.imageDir + "/text_images/{}.png".format(
+                avatarImageFirstLetter(item[0].strip()))
+            message_row.ids.avater_img.source = image
             listItem.bind(on_release=partial(
                 self.addBook_detail, item[1], item[0], message_row))
             message_row.ids.delete_msg.bind(on_press=partial(self.delete_address, item[1]))
diff --git a/src/bitmessagekivy/tests/sampleData/singleton.lock b/src/bitmessagekivy/tests/sampleData/singleton.lock
new file mode 100644
index 00000000..828d8429
--- /dev/null
+++ b/src/bitmessagekivy/tests/sampleData/singleton.lock
@@ -0,0 +1 @@
+18675
diff --git a/src/bitmessagekivy/tests/telenium_process.py b/src/bitmessagekivy/tests/telenium_process.py
index 236b4aac..b4f05905 100644
--- a/src/bitmessagekivy/tests/telenium_process.py
+++ b/src/bitmessagekivy/tests/telenium_process.py
@@ -3,8 +3,6 @@ import shutil
 import tempfile
 
 from telenium.tests import TeleniumTestCase
-# from threads import sqlThread
-
 
 _files = (
     'keys.dat', 'debug.log', 'messages.dat', 'knownnodes.dat',
@@ -53,11 +51,3 @@ class TeleniumTestProcess(TeleniumTestCase):
         cleanup()
         cls.cli.app_quit()
         cls.process.kill()
-
-    @classmethod
-    def setUp(self):
-        pass
-
-    @classmethod
-    def tearDown(self):
-        pass
diff --git a/src/bitmessagekivy/tests/test_addressbook.py b/src/bitmessagekivy/tests/test_addressbook.py
index 61c5a13c..169fb8c6 100644
--- a/src/bitmessagekivy/tests/test_addressbook.py
+++ b/src/bitmessagekivy/tests/test_addressbook.py
@@ -1,3 +1,4 @@
+
 from bitmessagekivy.tests.telenium_process import TeleniumTestProcess
 from .common import ordered
 
@@ -72,7 +73,8 @@ class AddressBook(TeleniumTestProcess):
         """Directly Send Message To The User"""
         print("=====================Test -Directly Send Message To The User=====================")
         self.cli.sleep(4)
-        self.cli.click_on('//AddressBook/BoxLayout[0]/BoxLayout[0]/ScrollView[0]/MDList[0]/Carousel[0]')
+        self.cli.click_on(
+            '//AddressBook/BoxLayout[0]/BoxLayout[0]/ScrollView[0]/MDList[0]/SwipeToDeleteItem[0]')
         self.cli.sleep(3)
         self.cli.click_on('//MDRaisedButton[0]')
         self.cli.sleep(3)
@@ -102,10 +104,9 @@ class AddressBook(TeleniumTestProcess):
         self.cli.click_on('//NavigationItem[6]')
         self.cli.sleep(3)
         self.cli.drag(
-            '''//AddressBook/BoxLayout[0]/BoxLayout[0]/ScrollView[0]/MDList[0]/Carousel[0]//'''
-            '''TwoLineAvatarIconListItem[0]/BoxLayout[0]''',
-            '''//AddressBook/BoxLayout[0]/BoxLayout[0]/ScrollView[0]/MDList[0]/Carousel[0]//'''
-            '''TwoLineAvatarIconListItem[0]/BoxLayout[2]''', 2)
+            '//MDList[0]/SwipeToDeleteItem[0]//TwoLineAvatarIconListItem[0]/BoxLayout[1]',
+            '//MDList[0]/SwipeToDeleteItem[0]//TwoLineAvatarIconListItem[0]/BoxLayout[2]', 1)
+        self.cli.click_on('//MDList[0]/SwipeToDeleteItem[0]')
         self.cli.sleep(2)
-        self.cli.click_on('//AddressBook/BoxLayout[0]/BoxLayout[0]/ScrollView[0]/MDList[0]/Carousel[0]//Button[0]')
+        self.cli.click_on('//MDList[0]/SwipeToDeleteItem[0]//MDIconButton[0]')
         self.cli.sleep(2)
diff --git a/src/bitmessagekivy/tests/test_allmail_message.py b/src/bitmessagekivy/tests/test_allmail_message.py
index 8f1b1996..dac9657a 100644
--- a/src/bitmessagekivy/tests/test_allmail_message.py
+++ b/src/bitmessagekivy/tests/test_allmail_message.py
@@ -20,7 +20,8 @@ class AllMailMessage(TeleniumTestProcess):
         """Delete Message From Message body of Mail Screen/Window"""
         print("=====================Test -Delete Messages Of Mail Screen=====================")
         self.cli.sleep(4)
-        self.cli.click_on('//Allmails[0]/BoxLayout[0]/BoxLayout[0]/ScrollView[0]/MDList[0]/Carousel[0]')
+        self.cli.click_on(
+            '//Allmails[0]/BoxLayout[0]/BoxLayout[0]/ScrollView[0]/MDList[0]/CutsomSwipeToDeleteItem[0]')
         self.cli.sleep(5)
         self.cli.click_on('//MDToolbar/BoxLayout[2]/MDActionTopAppBarButton[1]')
         self.cli.sleep(5)
diff --git a/src/bitmessagekivy/tests/test_create_random_address.py b/src/bitmessagekivy/tests/test_create_random_address.py
index ff8f56e1..df572afa 100644
--- a/src/bitmessagekivy/tests/test_create_random_address.py
+++ b/src/bitmessagekivy/tests/test_create_random_address.py
@@ -21,8 +21,7 @@ class CreateRandomAddress(TeleniumTestProcess):
         print("=====================Test - Login Screen=====================")
         self.cli.sleep(3)
         self.cli.wait_click(
-            '''//Login/BoxLayout[0]/BoxLayout[0]/ScreenManager[0]/Screen[0]/BoxLayout[0]/AnchorLayout[3]'''
-            '''/MDFillRoundFlatIconButton[0]''')
+            '//ScreenManager[0]/Screen[0]/BoxLayout[0]/AnchorLayout[3]/MDFillRoundFlatIconButton[0]')
         self.cli.sleep(3)
 
     @ordered
diff --git a/src/bitmessagekivy/tests/test_draft_message.py b/src/bitmessagekivy/tests/test_draft_message.py
index d1ea580b..462bdcf9 100644
--- a/src/bitmessagekivy/tests/test_draft_message.py
+++ b/src/bitmessagekivy/tests/test_draft_message.py
@@ -66,7 +66,8 @@ class DraftMessage(TeleniumTestProcess):
         self.cli.click_on('//NavigationItem[3]')
         self.cli.sleep(4)
         # SHOW DRAFT MESSAGE AND SELECT FIRST MESSAGE
-        self.cli.click_on('//Carousel[0]//TwoLineAvatarIconListItem[0]')
+        # self.cli.click_on('//Carousel[0]//TwoLineAvatarIconListItem[0]')
+        self.cli.click_on('//SwipeToDeleteItem[0]//TwoLineAvatarIconListItem[0]')
         self.cli.sleep(3)
         # CLICK EDIT BUTTON
         self.cli.click_on('//MDToolbar/BoxLayout[2]/MDActionTopAppBarButton[0]')
@@ -91,7 +92,8 @@ class DraftMessage(TeleniumTestProcess):
         self.cli.sleep(4)
         self.cli.click_on('//NavigationItem[3]')
         self.cli.sleep(5)
-        self.cli.click_on('//Carousel[0]//TwoLineAvatarIconListItem[0]')
+        self.cli.click_on('//SwipeToDeleteItem[0]//TwoLineAvatarIconListItem[0]')
+        # self.cli.click_on('//Carousel[0]//TwoLineAvatarIconListItem[0]')
         self.cli.sleep(5)
         self.cli.click_on('//MDToolbar/BoxLayout[2]/MDActionTopAppBarButton[1]')
         self.cli.sleep(5)
diff --git a/src/bitmessagekivy/tests/test_setting_screen.py b/src/bitmessagekivy/tests/test_setting_screen.py
index 51c107c0..4f8798db 100644
--- a/src/bitmessagekivy/tests/test_setting_screen.py
+++ b/src/bitmessagekivy/tests/test_setting_screen.py
@@ -13,4 +13,4 @@ class SettingScreen(TeleniumTestProcess):
         self.cli.drag("//NavigationItem[@text=\"Sent\"]", "//NavigationItem[@text=\"Inbox\"]", 1)
         self.cli.sleep(3)
         self.cli.click_on('//NavigationItem[7]')
-        self.cli.sleep(2)
+        self.cli.sleep(4)
diff --git a/src/bitmessagekivy/tests/test_trash_message.py b/src/bitmessagekivy/tests/test_trash_message.py
index c320abb0..0a70538e 100644
--- a/src/bitmessagekivy/tests/test_trash_message.py
+++ b/src/bitmessagekivy/tests/test_trash_message.py
@@ -13,13 +13,12 @@ class TrashMessage(TeleniumTestProcess):
         self.cli.click_on('//NavigationItem[4]')
         self.cli.sleep(4)
         self.cli.drag(
-            '''//Trash/BoxLayout[0]/BoxLayout[0]/ScrollView[0]/MDList[0]/Carousel[0]//'''
-            '''TwoLineAvatarIconListItem[0]/BoxLayout[0]''',
-            '''//Trash/BoxLayout[0]/BoxLayout[0]/ScrollView[0]/MDList[0]/Carousel[0]//'''
-            '''TwoLineAvatarIconListItem[0]/BoxLayout[2]''', 2)
+            '//MDList[0]/CutsomSwipeToDeleteItem[0]//TwoLineAvatarIconListItem[0]/BoxLayout[1]',
+            '//MDList[0]/CutsomSwipeToDeleteItem[0]//TwoLineAvatarIconListItem[0]/BoxLayout[2]', 1)
+        self.cli.click_on('//MDList[0]/CutsomSwipeToDeleteItem[0]')
         self.cli.sleep(4)
-        self.cli.click_on('//Trash/BoxLayout[0]/BoxLayout[0]/ScrollView[0]/MDList[0]/Carousel[0]//Button[0]')
+        self.cli.click_on('//MDList[0]/CutsomSwipeToDeleteItem[0]//MDIconButton[0]')
         self.cli.sleep(2)
         # self.cli.click_on('//MDDialog/MDCard[0]/AnchorLayout[0]/MDBoxLayout[0]/MDFlatButton[0]')
-        self.cli.click_on('//MDDialog/MDCard[0]/AnchorLayout[0]/MDBoxLayout[0]/MDFlatButton[0]')
+        self.cli.click_on('//MDDialog/DialogFakeCard[0]/AnchorLayout[0]/MDBoxLayout[0]/MDFlatButton[0]')
         self.cli.sleep(4)