diff --git a/e2e/browseMentorsTest.spec.ts b/e2e/browseMentorsTest.spec.ts
index d03e9c74..7f661cb9 100644
--- a/e2e/browseMentorsTest.spec.ts
+++ b/e2e/browseMentorsTest.spec.ts
@@ -57,7 +57,7 @@ describe('Browse mentors', () => {
       try {
         await expect(
           element(by.text(accountFixtures.mentors[i].displayName)),
-        ).toBeVisible();
+        ).toBeVisible(50);
         mentorsFound[accountFixtures.mentors[i].displayName] = true;
       } catch (error) {
         continue;
@@ -70,7 +70,7 @@ describe('Browse mentors', () => {
       try {
         await expect(
           element(by.text(accountFixtures.mentors[i].displayName)),
-        ).toBeVisible();
+        ).toBeVisible(50);
         mentorsFound[accountFixtures.mentors[i].displayName] = true;
       } catch (error) {
         continue;
@@ -83,7 +83,7 @@ describe('Browse mentors', () => {
       try {
         await expect(
           element(by.text(accountFixtures.mentors[i].displayName)),
-        ).toBeVisible();
+        ).toBeVisible(50);
         mentorsFound[accountFixtures.mentors[i].displayName] = true;
       } catch (error) {
         continue;
@@ -186,7 +186,7 @@ describe('Browse mentors', () => {
 
     await signIn(mentor);
 
-    await expect(element(by.text(mentor.displayName))).toBeVisible();
+    await expect(element(by.text(mentor.displayName))).toBeVisible(50);
     await element(by.text('Show mentor')).atIndex(0).tap();
 
     await element(by.text('Chat')).tap();
diff --git a/e2e/filterSkillTest.spec.ts b/e2e/filterSkillTest.spec.ts
index d682059a..746d170d 100644
--- a/e2e/filterSkillTest.spec.ts
+++ b/e2e/filterSkillTest.spec.ts
@@ -51,7 +51,7 @@ describe('Skill filter', () => {
       try {
         await expect(
           element(by.text(accountFixtures.mentors[i].displayName)),
-        ).toBeVisible();
+        ).toBeVisible(50);
         mentorsFound[accountFixtures.mentors[i].displayName] = true;
       } catch (error) {
         continue;
@@ -64,7 +64,7 @@ describe('Skill filter', () => {
       try {
         await expect(
           element(by.text(accountFixtures.mentors[i].displayName)),
-        ).toBeVisible();
+        ).toBeVisible(50);
         mentorsFound[accountFixtures.mentors[i].displayName] = true;
       } catch (error) {
         continue;
@@ -77,7 +77,7 @@ describe('Skill filter', () => {
       try {
         await expect(
           element(by.text(accountFixtures.mentors[i].displayName)),
-        ).toBeVisible();
+        ).toBeVisible(50);
         mentorsFound[accountFixtures.mentors[i].displayName] = true;
       } catch (error) {
         continue;
diff --git a/e2e/hideInactiveMentorsTest.spec.ts b/e2e/hideInactiveMentorsTest.spec.ts
index 25f21eec..07ee9495 100644
--- a/e2e/hideInactiveMentorsTest.spec.ts
+++ b/e2e/hideInactiveMentorsTest.spec.ts
@@ -22,7 +22,7 @@ const findMentor = async (mentorIndexes: any, mentorsFound: any) => {
     try {
       await expect(
         element(by.text(accountFixtures.mentors[Number(i)].displayName)),
-      ).toBeVisible();
+      ).toBeVisible(50);
       found[accountFixtures.mentors[Number(i)].displayName] = true;
     } catch (error) {
       continue;
diff --git a/e2e/signInTest.spec.ts b/e2e/signInTest.spec.ts
index 7f4c203a..3b2aeeb9 100644
--- a/e2e/signInTest.spec.ts
+++ b/e2e/signInTest.spec.ts
@@ -136,6 +136,7 @@ describe('SignIn', () => {
       0,
     );
 
+    await element(by.id('tabs.settings')).tap();
     await expect(
       element(by.id('main.settings.account.displayName')),
     ).toHaveText(mentee.displayName);
diff --git a/e2e/statusMessageTest.spec.ts b/e2e/statusMessageTest.spec.ts
index d6e35326..08a9a9d6 100644
--- a/e2e/statusMessageTest.spec.ts
+++ b/e2e/statusMessageTest.spec.ts
@@ -63,7 +63,7 @@ describe('Show status message', () => {
 
     for (const mentorName of Object.keys(statusMessages)) {
       try {
-        await expect(element(by.text(mentorName))).toBeVisible();
+        await expect(element(by.text(mentorName))).toBeVisible(50);
         await expect(
           element(by.text(statusMessages[mentorName])),
         ).toBeVisible();
diff --git a/src/Screens/Main/BuddyList/Button.tsx b/src/Screens/Main/BuddyList/Button.tsx
index cb117ec5..0783300c 100644
--- a/src/Screens/Main/BuddyList/Button.tsx
+++ b/src/Screens/Main/BuddyList/Button.tsx
@@ -45,7 +45,11 @@ const Button = ({ style, buddyId, name, onPress, ...viewProps }: Props) => {
           </RN.Text>
         </RN.View>
         <RN.View style={styles.blob}>
-          <UnseenDot hasUnseen={hasNewMessages} style={styles.dot} />
+          <UnseenDot
+            hasUnseen={hasNewMessages}
+            style={styles.dot}
+            testID="main.buddyList.button.unseenDot"
+          />
           {mentor?.is_vacationing ? (
             <RN.Image
               source={require('../../images/umbrella-beach.svg')}
diff --git a/src/Screens/Main/BuddyList/Title.tsx b/src/Screens/Main/BuddyList/Title.tsx
index c942db77..f992606e 100644
--- a/src/Screens/Main/BuddyList/Title.tsx
+++ b/src/Screens/Main/BuddyList/Title.tsx
@@ -34,7 +34,11 @@ export const Title: React.FC<Props> = ({
             source={require('../../images/three-dot-menu.svg')}
             style={styles.kebabIcon}
           />
-          <UnseenDot hasUnseen={hasUnseenArchivedMessages} style={styles.dot} />
+          <UnseenDot
+            hasUnseen={hasUnseenArchivedMessages}
+            style={styles.dot}
+            testID="main.chat.kebabicon.unseenDot"
+          />
         </>
       </RN.TouchableHighlight>
     </RN.SafeAreaView>
diff --git a/src/Screens/Onboarding/Email.tsx b/src/Screens/Onboarding/Email.tsx
index 492f7561..a1524e21 100644
--- a/src/Screens/Onboarding/Email.tsx
+++ b/src/Screens/Onboarding/Email.tsx
@@ -67,7 +67,7 @@ const Email = ({ navigation, route }: Props) => {
             onPress={goBack}
             noShadow={true}
             style={styles.backButton}
-            emphasis="low"
+            emphasis="medium"
           />
           <Button
             style={styles.nextButton}
diff --git a/src/Screens/components/Modal/index.tsx b/src/Screens/components/Modal/index.tsx
index 6daea58b..39a8e4d2 100644
--- a/src/Screens/components/Modal/index.tsx
+++ b/src/Screens/components/Modal/index.tsx
@@ -55,7 +55,7 @@ const Modal: React.FC<Props> = props => {
                   onPress={props.onSecondaryPress}
                   messageId={props.secondaryButtonMessage ?? 'meta.ok'}
                   style={[styles.button, styles.secondaryButton]}
-                  emphasis="low"
+                  emphasis="medium"
                 />
               )}
               {props.onPrimaryPress && (
diff --git a/src/Screens/components/Modal/modalProps.ts b/src/Screens/components/Modal/modalProps.ts
index d7940ede..ae6e837d 100644
--- a/src/Screens/components/Modal/modalProps.ts
+++ b/src/Screens/components/Modal/modalProps.ts
@@ -6,7 +6,7 @@ export const props = {
     icon: require('../../images/error_icon.svg'),
   },
   success: {
-    backgroundColor: colors.green,
+    backgroundColor: colors.greenLight,
     icon: require('../../images/success_icon.svg'),
   },
   info: {
diff --git a/src/Screens/components/colors.ts b/src/Screens/components/colors.ts
index bf8edbff..3177691d 100644
--- a/src/Screens/components/colors.ts
+++ b/src/Screens/components/colors.ts
@@ -30,6 +30,7 @@ const colors = {
 
   // greens
   green: '#75C550',
+  greenLight: '#81BC70',
 };
 
 export default colors;
diff --git a/src/api/mentors.ts b/src/api/mentors.ts
index c03b8da1..9c829409 100644
--- a/src/api/mentors.ts
+++ b/src/api/mentors.ts
@@ -1,7 +1,6 @@
 import * as t from 'io-ts';
 import * as TE from 'fp-ts/lib/TaskEither';
 
-import isFinnishPhone from '../lib/isFinnishPhone';
 import * as http from '../lib/http';
 
 import * as config from './config';
@@ -95,25 +94,6 @@ export const fetchMentors: () => TE.TaskEither<
     fromMentorList,
   );
 
-export function compareLang(a: Mentor, b: Mentor) {
-  if (isFinnishPhone) {
-    return 0;
-  }
-
-  const lang = 'Italian';
-  const hasLang = ({ languages }: Mentor) => languages.includes(lang);
-
-  if (hasLang(a) && !hasLang(b)) {
-    return -1;
-  }
-
-  if (!hasLang(a) && hasLang(b)) {
-    return 1;
-  }
-
-  return 0;
-}
-
 const compareIds = (userId: string | undefined, a: Mentor, b: Mentor) => {
   const x: number = userId ? userId.charCodeAt(0) : 0;
   const y = a.buddyId.charCodeAt(0);
@@ -122,11 +102,15 @@ const compareIds = (userId: string | undefined, a: Mentor, b: Mentor) => {
   return Math.abs(x - z) - Math.abs(x - y);
 };
 
-const sortMe = (myUserId: string | undefined, a: Mentor, _b: Mentor) => {
+const sortMe = (myUserId: string | undefined, a: Mentor, b: Mentor) => {
   if (a.buddyId === myUserId) {
     return -1;
   }
 
+  if (b.buddyId === myUserId) {
+    return 1;
+  }
+
   return 0;
 };
 
@@ -145,9 +129,6 @@ const sortVacationing = (a: Mentor, b: Mentor) => {
 export const compare =
   (userId: string | undefined) => (a: Mentor, b: Mentor) => {
     return (
-      sortMe(userId, a, b) ||
-      sortVacationing(a, b) ||
-      compareLang(a, b) ||
-      compareIds(userId, a, b)
+      sortVacationing(a, b) || sortMe(userId, a, b) || compareIds(userId, a, b)
     );
   };