diff --git a/test/appium/tests/atomic/account_management/test_profile.py b/test/appium/tests/atomic/account_management/test_profile.py
index f76336b5895..a3d52996e84 100644
--- a/test/appium/tests/atomic/account_management/test_profile.py
+++ b/test/appium/tests/atomic/account_management/test_profile.py
@@ -15,6 +15,7 @@ class TestProfileSingleDevice(SingleDeviceTestCase):
 
     @marks.testrail_id(5302)
     @marks.high
+    @marks.skip
     def test_set_profile_picture(self):
         sign_in_view = SignInView(self.driver)
         sign_in_view.create_user()
@@ -113,6 +114,7 @@ def test_mobile_data_usage_settings(self):
 
     @marks.testrail_id(5454)
     @marks.critical
+    @marks.skip
     def test_user_can_remove_profile_picture(self):
         signin_view = SignInView(self.driver)
         home_view = signin_view.create_user()
@@ -829,6 +831,8 @@ def test_pair_devices_sync_one_to_one_contacts(self):
 
     @marks.testrail_id(5680)
     @marks.high
+    @marks.skip
+    # skip until edit userpic is enabled back
     def test_pair_devices_sync_name_photo_public_group_chats(self):
         self.create_drivers(2)
         device_1, device_2 = SignInView(self.drivers[0]), SignInView(self.drivers[1])
diff --git a/test/appium/tests/atomic/chats/test_one_to_one.py b/test/appium/tests/atomic/chats/test_one_to_one.py
index b1cc0d224d4..88e97b72857 100644
--- a/test/appium/tests/atomic/chats/test_one_to_one.py
+++ b/test/appium/tests/atomic/chats/test_one_to_one.py
@@ -119,9 +119,11 @@ def test_send_message_to_newly_added_contact(self):
         default_username_1 = profile_1.default_username_text.text
         device_1_home = profile_1.get_back_to_home_view()
 
-        profile_1 = device_1_home.profile_button.click()
-        profile_1.edit_profile_picture('sauce_logo.png')
-        profile_1.home_button.click()
+        # Skip until edit-profile feature returned
+
+        # profile_1 = device_1_home.profile_button.click()
+        # profile_1.edit_profile_picture('sauce_logo.png')
+        # profile_1.home_button.click()
 
         device_2_public_key = device_2_home.get_public_key()
         device_2_home.home_button.click()
@@ -142,8 +144,11 @@ def test_send_message_to_newly_added_contact(self):
             self.errors.append("Default username '%s' is not shown in one-to-one chat" % default_username_1)
         device_2_chat.chat_options.click()
         device_2_chat.view_profile_button.click()
-        if not device_2_chat.contact_profile_picture.is_element_image_equals_template('sauce_logo.png'):
-            self.errors.append("Updated profile picture is not shown in one-to-one chat")
+
+        # Skip until edit-profile feature returned
+
+        # if not device_2_chat.contact_profile_picture.is_element_image_equals_template('sauce_logo.png'):
+        #     self.errors.append("Updated profile picture is not shown in one-to-one chat")
         self.errors.verify_no_errors()
 
     @marks.testrail_id(5316)
@@ -159,8 +164,9 @@ def test_add_to_contacts(self):
 
         device_2_public_key = device_2_home.get_public_key()
         profile_2 = device_2_home.get_profile_view()
-        file_name = 'sauce_logo.png'
-        profile_2.edit_profile_picture(file_name)
+        # TODO: skip until edit image profile is enabled
+        # file_name = 'sauce_logo.png'
+        # profile_2.edit_profile_picture(file_name)
         default_username_2 = profile_2.default_username_text.text
         profile_2.home_button.click()
 
@@ -187,8 +193,9 @@ def test_add_to_contacts(self):
             self.errors.append("Default username '%s' is not shown in one-to-one chat" % default_username_2)
         device_1_chat.chat_options.click()
         device_1_chat.view_profile_button.click()
-        if not device_1_chat.contact_profile_picture.is_element_image_equals_template(file_name):
-            self.errors.append("Updated profile picture is not shown in one-to-one chat")
+        # TODO: skip until edit image profile is enabled
+        # if not device_1_chat.contact_profile_picture.is_element_image_equals_template(file_name):
+        #     self.errors.append("Updated profile picture is not shown in one-to-one chat")
         self.errors.verify_no_errors()
 
     @marks.testrail_id(5373)
diff --git a/test/appium/views/base_view.py b/test/appium/views/base_view.py
index a4ff557df21..3a975207647 100644
--- a/test/appium/views/base_view.py
+++ b/test/appium/views/base_view.py
@@ -149,8 +149,8 @@ def navigate(self):
         return ProfileView(self.driver)
 
     def click(self):
-        from views.profile_view import DefaultUserNameText
-        self.click_until_presence_of_element(DefaultUserNameText(self.driver))
+        from views.profile_view import PrivacyAndSecurityButton
+        self.click_until_presence_of_element(PrivacyAndSecurityButton(self.driver))
         return self.navigate()