diff --git a/tests/resources.qrc b/tests/resources.qrc
index 8d8b1159f..d59ae408b 100644
--- a/tests/resources.qrc
+++ b/tests/resources.qrc
@@ -32,18 +32,13 @@
     <file>assets/images/video_call_normal.svg</file>
     <file>assets/images/video_call_pressed.svg</file>
     <file>assets/old_images/add_field.svg</file>
-    <file>assets/old_images/call.svg</file>
-    <file>assets/old_images/cam.svg</file>
     <file>assets/old_images/cat_contact.jpg</file>
     <file>assets/old_images/chat_attachment.svg</file>
-    <file>assets/old_images/chat.svg</file>
     <file>assets/old_images/collapse.svg</file>
     <file>assets/old_images/conference.svg</file>
     <file>assets/old_images/contacts_list.svg</file>
     <file>assets/old_images/contact.svg</file>
-    <file>assets/old_images/delete.svg</file>
     <file>assets/old_images/hangup.svg</file>
-    <file>assets/old_images/history.svg</file>
     <file>assets/old_images/home.svg</file>
     <file>assets/old_images/incoming_call.svg</file>
     <file>assets/old_images/lost_incoming_call.svg</file>
diff --git a/tests/ui/modules/Common/Colors.qml b/tests/ui/modules/Common/Colors.qml
index 24ef1b049..ddb7be38c 100644
--- a/tests/ui/modules/Common/Colors.qml
+++ b/tests/ui/modules/Common/Colors.qml
@@ -1,6 +1,8 @@
 pragma Singleton
 import QtQuick 2.7
 
+// ===================================================================
+
 QtObject {
   property color a: 'transparent'
   property color b: '#5E5E5F' // Pressed toolbar.
@@ -21,9 +23,6 @@ QtObject {
 
   property color q: '#E6E6E6'
 
-  property color r: '#8F8F8F'
-
-
 
   // -----------------------------------------------------------------
   // OK.
@@ -39,8 +38,10 @@ QtObject {
   property color j75: '#BF4B5964'
   property color k:   '#FFFFFF'
   property color k50: '#32FFFFFF'
+  property color r:   '#595759'
   property color s:   '#D64D00'
   property color t:   '#FF8600'
   property color u:   '#B1B1B1'
   property color v:   '#E2E2E2'
+  property color w:   '#A1A1A1'
 }
diff --git a/tests/ui/modules/Common/Styles/Form/TextFieldStyle.qml b/tests/ui/modules/Common/Styles/Form/TextFieldStyle.qml
index 2c707ab62..c09330dd6 100644
--- a/tests/ui/modules/Common/Styles/Form/TextFieldStyle.qml
+++ b/tests/ui/modules/Common/Styles/Form/TextFieldStyle.qml
@@ -12,7 +12,7 @@ QtObject {
     property int radius: 4
 
     property QtObject border: QtObject {
-      property color color: '#CBCBCB'
+      property color color: Colors.c
       property int width: 1
     }
   }
diff --git a/tests/ui/modules/Linphone/Account/AccountStatus.qml b/tests/ui/modules/Linphone/Account/AccountStatus.qml
index a6bf8623c..3de60eda2 100644
--- a/tests/ui/modules/Linphone/Account/AccountStatus.qml
+++ b/tests/ui/modules/Linphone/Account/AccountStatus.qml
@@ -3,11 +3,14 @@ import QtQuick.Layouts 1.3
 
 import Linphone 1.0
 import Linphone.Styles 1.0
-import Utils 1.0
 
 // ===================================================================
 
 Item {
+  id: accountStatus
+
+  signal clicked
+
   Column {
     anchors.fill: parent
 
@@ -17,12 +20,12 @@ Item {
       width: parent.width
 
       PresenceLevel {
+        Layout.alignment: Qt.AlignBottom
+        Layout.bottomMargin: AccountStatusStyle.presenceLevel.bottoMargin
         Layout.preferredHeight: AccountStatusStyle.presenceLevel.size
         Layout.preferredWidth: AccountStatusStyle.presenceLevel.size
         icon: 'chevron'
         level: AccountSettingsModel.presenceLevel
-        Layout.alignment: Qt.AlignBottom
-        Layout.bottomMargin: AccountStatusStyle.presenceLevel.bottoMargin
       }
 
       Text {
@@ -55,6 +58,6 @@ Item {
       : Qt.ArrowCursor
     hoverEnabled: true
 
-    onClicked: Utils.openWindow('ManageAccounts', this)
+    onClicked: accountStatus.clicked()
   }
 }
diff --git a/tests/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml b/tests/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml
index 96c4b180f..8cb32bc7a 100644
--- a/tests/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml
+++ b/tests/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml
@@ -3,16 +3,16 @@ import QtQuick 2.7
 
 import Common 1.0
 
+// ===================================================================
+
 QtObject {
   property QtObject initials: QtObject {
     property color color: Colors.k
-
     property int fontSize: 10
   }
 
   property QtObject mask: QtObject {
     property color color: Colors.r
-
     property int radius: 500
   }
 }
diff --git a/tests/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml b/tests/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml
index 124a68041..3f6e901f2 100644
--- a/tests/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml
+++ b/tests/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml
@@ -3,16 +3,16 @@ import QtQuick 2.7
 
 import Common 1.0
 
+// ===================================================================
+
 QtObject {
   property QtObject sipAddress: QtObject {
     property color color: Colors.d
-
     property int fontSize: 10
   }
 
   property QtObject username: QtObject {
     property color color: Colors.d
-
     property int fontSize: 11
   }
 }
diff --git a/tests/ui/modules/Linphone/Styles/Contact/ContactStyle.qml b/tests/ui/modules/Linphone/Styles/Contact/ContactStyle.qml
index e5e5b77a7..df3c09bdb 100644
--- a/tests/ui/modules/Linphone/Styles/Contact/ContactStyle.qml
+++ b/tests/ui/modules/Linphone/Styles/Contact/ContactStyle.qml
@@ -1,6 +1,8 @@
 pragma Singleton
 import QtQuick 2.7
 
+// ===================================================================
+
 QtObject {
   property int contentHeight: 32
   property int height: 50
diff --git a/tests/ui/modules/Linphone/Styles/Presence/PresenceStringStyle.qml b/tests/ui/modules/Linphone/Styles/Presence/PresenceStringStyle.qml
index 9960eac9e..d15fc1890 100644
--- a/tests/ui/modules/Linphone/Styles/Presence/PresenceStringStyle.qml
+++ b/tests/ui/modules/Linphone/Styles/Presence/PresenceStringStyle.qml
@@ -6,6 +6,6 @@ import Common 1.0
 // ===================================================================
 
 QtObject {
-  property color color: '#A1A1A1'
+  property color color: Colors.w
   property int fontSize: 10
 }
diff --git a/tests/ui/views/App/MainWindow/Contacts.qml b/tests/ui/views/App/MainWindow/Contacts.qml
index 2b02c6c28..fa488180d 100644
--- a/tests/ui/views/App/MainWindow/Contacts.qml
+++ b/tests/ui/views/App/MainWindow/Contacts.qml
@@ -148,6 +148,7 @@ ColumnLayout {
                   id: container1
 
                   anchors.fill: parent
+                  spacing: ContactsStyle.contact.spacing
 
                   PresenceLevel {
                     Layout.preferredHeight: ContactsStyle.contact.presenceLevelSize
diff --git a/tests/ui/views/App/MainWindow/MainWindow.qml b/tests/ui/views/App/MainWindow/MainWindow.qml
index 52209e672..76af5009e 100644
--- a/tests/ui/views/App/MainWindow/MainWindow.qml
+++ b/tests/ui/views/App/MainWindow/MainWindow.qml
@@ -55,6 +55,8 @@ ApplicationWindow {
 
         Layout.fillHeight: parent.height
         Layout.preferredWidth: MainWindowStyle.accountStatus.width
+
+        onClicked: Utils.openWindow('ManageAccounts', window)
       }
 
       Column {