Unify menu/buttons colors.

Fix chat in calls.
Fix avatar display.

linphone-app/assets/languages/da.ts

@@ -955,6 +955,11 @@ Server url ikke konfigureret.</translation>
         <extracomment>&apos;Search in messages&apos; : this is a placeholder when searching something in the timeline list</extracomment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>conversationMenuDelete</source>
+        <extracomment>&apos;Delete&apos; : Item menu to delete the chat</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CreateAppSipAccount</name>

linphone-app/assets/languages/de.ts

@@ -955,6 +955,11 @@ Server URL ist nicht konfiguriert.</translation>
         <extracomment>&apos;Search in messages&apos; : this is a placeholder when searching something in the timeline list</extracomment>
         <translation>Nachrichten durchsuchen</translation>
     </message>
+    <message>
+        <source>conversationMenuDelete</source>
+        <extracomment>&apos;Delete&apos; : Item menu to delete the chat</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CreateAppSipAccount</name>

linphone-app/assets/languages/en.ts

@@ -955,6 +955,11 @@ Server URL not configured.</translation>
         <extracomment>&apos;Search in messages&apos; : this is a placeholder when searching something in the timeline list</extracomment>
         <translation>Search messages</translation>
     </message>
+    <message>
+        <source>conversationMenuDelete</source>
+        <extracomment>&apos;Delete&apos; : Item menu to delete the chat</extracomment>
+        <translation>Delete</translation>
+    </message>
 </context>
 <context>
     <name>CreateAppSipAccount</name>

linphone-app/assets/languages/es.ts

@@ -955,6 +955,11 @@ URL del servidor no configurada.</translation>
         <extracomment>&apos;Search in messages&apos; : this is a placeholder when searching something in the timeline list</extracomment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>conversationMenuDelete</source>
+        <extracomment>&apos;Delete&apos; : Item menu to delete the chat</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CreateAppSipAccount</name>

linphone-app/assets/languages/fr_FR.ts

@@ -955,6 +955,11 @@ URL du serveur non configurée.</translation>
         <extracomment>&apos;Search in messages&apos; : this is a placeholder when searching something in the timeline list</extracomment>
         <translation>Rechercher dans les messages</translation>
     </message>
+    <message>
+        <source>conversationMenuDelete</source>
+        <extracomment>&apos;Delete&apos; : Item menu to delete the chat</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CreateAppSipAccount</name>

linphone-app/assets/languages/hu.ts

@@ -950,6 +950,11 @@ A kiszolgáló URL-je nincs konfigurálva.</translation>
         <extracomment>&apos;Search in messages&apos; : this is a placeholder when searching something in the timeline list</extracomment>
         <translation>Üzenetek keresése</translation>
     </message>
+    <message>
+        <source>conversationMenuDelete</source>
+        <extracomment>&apos;Delete&apos; : Item menu to delete the chat</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CreateAppSipAccount</name>

linphone-app/assets/languages/it.ts

@@ -955,6 +955,11 @@ URL del server non configurato.</translation>
         <extracomment>&apos;Search in messages&apos; : this is a placeholder when searching something in the timeline list</extracomment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>conversationMenuDelete</source>
+        <extracomment>&apos;Delete&apos; : Item menu to delete the chat</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CreateAppSipAccount</name>

linphone-app/assets/languages/ja.ts

@@ -950,6 +950,11 @@
         <extracomment>&apos;Search in messages&apos; : this is a placeholder when searching something in the timeline list</extracomment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>conversationMenuDelete</source>
+        <extracomment>&apos;Delete&apos; : Item menu to delete the chat</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CreateAppSipAccount</name>

linphone-app/assets/languages/lt.ts

@@ -960,6 +960,11 @@ Nesukonfigūruotas serverio url.</translation>
         <extracomment>&apos;Search in messages&apos; : this is a placeholder when searching something in the timeline list</extracomment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>conversationMenuDelete</source>
+        <extracomment>&apos;Delete&apos; : Item menu to delete the chat</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CreateAppSipAccount</name>

linphone-app/assets/languages/pt_BR.ts

@@ -955,6 +955,11 @@ URL do servidor não configurado.</translation>
         <extracomment>&apos;Search in messages&apos; : this is a placeholder when searching something in the timeline list</extracomment>
         <translation>Pesquisar mensagens</translation>
     </message>
+    <message>
+        <source>conversationMenuDelete</source>
+        <extracomment>&apos;Delete&apos; : Item menu to delete the chat</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CreateAppSipAccount</name>

linphone-app/assets/languages/ru.ts

@@ -960,6 +960,11 @@
         <extracomment>&apos;Search in messages&apos; : this is a placeholder when searching something in the timeline list</extracomment>
         <translation>Поиск сообщений</translation>
     </message>
+    <message>
+        <source>conversationMenuDelete</source>
+        <extracomment>&apos;Delete&apos; : Item menu to delete the chat</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CreateAppSipAccount</name>

linphone-app/assets/languages/sv.ts

@@ -955,6 +955,11 @@ Serverwebbadressen är inte konfigurerad.</translation>
         <extracomment>&apos;Search in messages&apos; : this is a placeholder when searching something in the timeline list</extracomment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>conversationMenuDelete</source>
+        <extracomment>&apos;Delete&apos; : Item menu to delete the chat</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CreateAppSipAccount</name>

linphone-app/assets/languages/tr.ts

@@ -950,6 +950,11 @@ Sunucu url&apos;si yapılandırılmadı.</translation>
         <extracomment>&apos;Search in messages&apos; : this is a placeholder when searching something in the timeline list</extracomment>
         <translation>İletileri ara</translation>
     </message>
+    <message>
+        <source>conversationMenuDelete</source>
+        <extracomment>&apos;Delete&apos; : Item menu to delete the chat</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CreateAppSipAccount</name>

linphone-app/assets/languages/uk.ts

@@ -960,6 +960,11 @@
         <extracomment>&apos;Search in messages&apos; : this is a placeholder when searching something in the timeline list</extracomment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>conversationMenuDelete</source>
+        <extracomment>&apos;Delete&apos; : Item menu to delete the chat</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CreateAppSipAccount</name>

linphone-app/assets/languages/zh_CN.ts

@@ -950,6 +950,11 @@
         <extracomment>&apos;Search in messages&apos; : this is a placeholder when searching something in the timeline list</extracomment>
         <translation>查找信息</translation>
     </message>
+    <message>
+        <source>conversationMenuDelete</source>
+        <extracomment>&apos;Delete&apos; : Item menu to delete the chat</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CreateAppSipAccount</name>

linphone-app/src/components/call/CallModel.cpp

@@ -50,6 +50,7 @@ constexpr char AutoAnswerObjectName[] = "auto-answer-timer";
 }
 
 CallModel::CallModel (shared_ptr<linphone::Call> call){
+	connect(this, &CallModel::callIdChanged, this, &CallModel::chatRoomModelChanged);// When the call Id change, the chat room change.
 	mCall = call;
 	if(mCall)
 		mCall->setData("call-model", *this);
@@ -407,6 +408,7 @@ void CallModel::handleCallStateChanged (const shared_ptr<linphone::Call> &call,
 			}
 			mPausedByRemote = false;
 			setConferenceVideoLayout(LinphoneEnums::fromLinphone(call->getParams()->getConferenceVideoLayout()));
+			setCallId(QString::fromStdString(mCall->getCallLog()->getCallId()));
 			break;
 		}
 		case linphone::Call::State::Connected:
@@ -594,6 +596,13 @@ void CallModel::setCallErrorFromReason (linphone::Reason reason) {
 	emit callErrorChanged(mCallError);
 }
 
+void CallModel::setCallId(const QString& callId){
+	if(callId != mCallId){
+		mCallId = callId;
+		emit callIdChanged();
+	}
+}
+
 // -----------------------------------------------------------------------------
 
 int CallModel::getDuration () const {

linphone-app/src/components/call/CallModel.hpp

@@ -42,11 +42,12 @@ class CallModel : public QObject {
 	Q_PROPERTY(QString fullLocalAddress READ getFullLocalAddress CONSTANT)
 	
 	Q_PROPERTY(ContactModel *contactModel READ getContactModel CONSTANT )
-	Q_PROPERTY(ChatRoomModel * chatRoomModel READ getChatRoomModel CONSTANT)
+	Q_PROPERTY(ChatRoomModel * chatRoomModel READ getChatRoomModel NOTIFY chatRoomModelChanged)
 	Q_PROPERTY(ConferenceModel * conferenceModel READ getConferenceModel NOTIFY conferenceModelChanged)
 	
 	Q_PROPERTY(CallStatus status READ getStatus NOTIFY statusChanged)
 	Q_PROPERTY(QString callError READ getCallError NOTIFY callErrorChanged)
+	Q_PROPERTY(QString callId MEMBER mCallId WRITE setCallId NOTIFY callIdChanged)
 	
 	Q_PROPERTY(bool isOutgoing READ isOutgoing CONSTANT)
 	
@@ -187,8 +188,10 @@ public slots:
 	
 signals:
 	void callErrorChanged (const QString &callError);
+	void callIdChanged();
 	void isInConferenceChanged (bool status);
 	void conferenceModelChanged();
+	void chatRoomModelChanged();
 	void speakerMutedChanged (bool status);
 	void microMutedChanged (bool status);
 	void cameraEnabledChanged();
@@ -230,6 +233,8 @@ public:
 	QString getCallError () const;
 	void setCallErrorFromReason (linphone::Reason reason);
 	
+	void setCallId(const QString& callId);
+	
 	int getDuration () const;
 	float getQuality () const;
 	float getMicroVu () const;
@@ -292,6 +297,7 @@ private:
 	bool mNotifyCameraFirstFrameReceived = true;
 	
 	QString mCallError;
+	QString mCallId;
 	
 	QVariantList mAudioStats;
 	QVariantList mVideoStats;

linphone-app/src/components/chat-room/ChatRoomModel.cpp

@@ -155,7 +155,7 @@ ChatRoomModel::ChatRoomModel (std::shared_ptr<linphone::ChatRoom> chatRoom, QObj
 	if(mChatRoom){
 		mParticipantListModel = QSharedPointer<ParticipantListModel>::create(this);
 		connect(mParticipantListModel.get(), &ParticipantListModel::participantsChanged, this, &ChatRoomModel::fullPeerAddressChanged);
-		auto participants = getParticipants();
+		auto participants = getParticipants(false);
 		for(auto participant : participants){
 			auto contact = CoreManager::getInstance()->getContactsListModel()->findContactModelFromSipAddress(Utils::coreStringToAppString((participant)->getAddress()->asString()));
 			if(contact) {
@@ -347,8 +347,9 @@ QString ChatRoomModel::getUsername () const {
 }
 
 QString ChatRoomModel::getAvatar () const {
+	qWarning() << getUsername() << " *> " << mChatRoom->getNbParticipants();
 	if( mChatRoom && mChatRoom->getNbParticipants() == 1){
-		auto participants = getParticipants();	
+		auto participants = getParticipants(false);	
 		auto contact = CoreManager::getInstance()->getContactsListModel()->findContactModelFromSipAddress(Utils::coreStringToAppString((*participants.begin())->getAddress()->asString()));
 		if(contact)
 			return contact->getVcardModel()->getAvatar();
@@ -358,7 +359,7 @@ QString ChatRoomModel::getAvatar () const {
 
 int ChatRoomModel::getPresenceStatus() const {
 	if( mChatRoom && mChatRoom->getNbParticipants() == 1 && !isGroupEnabled()){
-		auto participants = getParticipants();	
+		auto participants = getParticipants(false);
 		auto contact = CoreManager::getInstance()->getContactsListModel()->findContactModelFromSipAddress(Utils::coreStringToAppString((*participants.begin())->getAddress()->asString()));
 		if(contact) {
 			return contact->getPresenceLevel();
@@ -373,11 +374,13 @@ ParticipantListModel* ChatRoomModel::getParticipantListModel() const{
 	return mParticipantListModel.get();
 }
 
-std::list<std::shared_ptr<linphone::Participant>> ChatRoomModel::getParticipants() const{
+std::list<std::shared_ptr<linphone::Participant>> ChatRoomModel::getParticipants(const bool& withMe) const{
 	auto participantList = mChatRoom->getParticipants();
-	auto me = mChatRoom->getMe();
-	if( me )
-		participantList.push_front(me);
+	if(withMe) {
+		auto me = mChatRoom->getMe();
+		if( me )
+			participantList.push_front(me);
+	}
 	return participantList;
 }
 
@@ -590,6 +593,10 @@ void ChatRoomModel::markAsToDelete(){
 	mDeleteChatRoom = true;
 }
 
+void ChatRoomModel::deleteChatRoom(){
+	CoreManager::getInstance()->getCore()->deleteChatRoom(mChatRoom);
+}
+
 void ChatRoomModel::leaveChatRoom (){
 	if(mChatRoom)
 		mChatRoom->leave();
@@ -1121,7 +1128,7 @@ void ChatRoomModel::handlePresenceStatusReceived(std::shared_ptr<linphone::Frien
 			//cleanContactAddress->clean();
 			canUpdatePresence = mChatRoom->getLocalAddress()->weakEqual(*itContactAddress);
 			if(!canUpdatePresence && !isGroupEnabled() && mChatRoom->getNbParticipants() == 1){
-				auto participants = getParticipants();	
+				auto participants = getParticipants(false);
 				auto contact = CoreManager::getInstance()->getContactsListModel()->findContactModelFromSipAddress(Utils::coreStringToAppString((*participants.begin())->getAddress()->asString()));
 				if(contact){
 					auto friendsAddresses = contact->getVcardModel()->getSipAddresses();

linphone-app/src/components/chat-room/ChatRoomModel.hpp

@@ -134,7 +134,7 @@ public:
 	bool isEntriesLoading() const;
 	bool isBasic() const;
 	ParticipantListModel* getParticipantListModel() const;
-	std::list<std::shared_ptr<linphone::Participant>> getParticipants() const;
+	std::list<std::shared_ptr<linphone::Participant>> getParticipants(const bool& withMe = true) const;
 	std::shared_ptr<linphone::ChatRoom> getChatRoom();
 	QList<QString> getComposers();
 	QString getParticipantAddress();	// return peerAddress if not secure else return the first participant SIP address.
@@ -161,6 +161,7 @@ public:
 
 // Tools
 	void markAsToDelete();
+	Q_INVOKABLE void deleteChatRoom();
 	Q_INVOKABLE void leaveChatRoom ();
 	Q_INVOKABLE void updateParticipants(const QVariantList& participants);		
 	void sendMessage (const QString &message);

linphone-app/src/components/chat-room/ChatRoomProxyModel.cpp

@@ -87,6 +87,7 @@ CREATE_PARENT_MODEL_FUNCTION_WITH_PARAM(forwardMessage, ChatMessageModel *)
 
 CREATE_PARENT_MODEL_FUNCTION_WITH_ID(removeRow)
 
+CREATE_PARENT_MODEL_FUNCTION(deleteChatRoom)
 
 #undef GET_CHAT_MODEL
 #undef CREATE_PARENT_MODEL_FUNCTION

linphone-app/src/components/chat-room/ChatRoomProxyModel.hpp

@@ -61,6 +61,7 @@ public:
 	
 	Q_INVOKABLE void removeAllEntries ();
 	Q_INVOKABLE void removeRow (int index);
+	Q_INVOKABLE void deleteChatRoom();
 	
 	Q_INVOKABLE void sendMessage (const QString &message);
 	Q_INVOKABLE void forwardMessage(ChatMessageModel * model);

linphone-app/src/components/other/colors/ColorListModel.hpp

@@ -124,14 +124,14 @@ class ColorListModel : public ProxyListModel {
 		ADD_COLOR("readonly_fg", "#B1B1B1", "Chat text area Readonly foreground")
 		
 
-// Standard actions
-//
 // Keywords: 'mKeywordsMap'
 //		s=standard, ma=main, l=list, sc=screen, me=menu
 //		n=normal, d=disabled, h=hovered, p=pressed, u=updating, c=checked
 //		b=button
 //		inv=inverse
 //		bg=background, fg=foreground
+
+// Standard actions : 
 		ADD_COLOR("s_n_b_bg", "#96A5B1", "[M] Standard normal button : background")
 		ADD_COLOR("s_d_b_bg", "#D0D8DE", "[M] Standard disabled button : background")
 		ADD_COLOR("s_h_b_bg", "#4B5964", "[M] Standard hovered button : background")
@@ -154,7 +154,7 @@ class ColorListModel : public ProxyListModel {
 		ADD_COLOR("s_p_b_inv_fg", "black", "Standard pressed button : inverse foreground")
 		*/
 //----------------------------
-// Main Actions
+// Main Actions : like home button 
 		ADD_COLOR("ma_n_b_bg", "#FF5E00", "[M] Main normal button : background")
 		ADD_COLOR("ma_d_b_bg", "#FFCEB2", "[M] Main disabled button : background")
 		ADD_COLOR("ma_h_b_bg", "#4B5964", "[M] Main hovered button : background")
@@ -165,7 +165,7 @@ class ColorListModel : public ProxyListModel {
 		ADD_COLOR("ma_h_b_fg", "white", "[M] Main hovered button : foreground")
 		ADD_COLOR("ma_p_b_fg", "white", "[M] Main pressed button : foreground")
 //-------------------------------------
-// Accept Actions
+// Accept Actions : like accepting a call 
 		ADD_COLOR("a_n_b_bg", "#9ECD1D", "[M] Accept normal button : background")
 		ADD_COLOR("a_d_b_bg", "#809ECD1D", "[M] Accept disabled button : background")
 		ADD_COLOR("a_h_b_bg", "#7D9F21", "[M] Accept hovered button : background")
@@ -176,7 +176,7 @@ class ColorListModel : public ProxyListModel {
 		ADD_COLOR("a_h_b_fg", "white", "[M] Accept hovered button : foreground")
 		ADD_COLOR("a_p_b_fg", "white", "[M] Accept pressed button : foreground")
 //-------------------------------------
-// Reject Actions
+// Reject Actions : like rejecting a call
 		ADD_COLOR("r_n_b_bg", "#FF5E00", "[M] Reject normal button : background")
 		ADD_COLOR("r_d_b_bg", "#80FF5E00", "[M] Reject disabled button : background")
 		ADD_COLOR("r_h_b_bg", "#DC4100", "[M] Reject hovered button : background")
@@ -187,38 +187,32 @@ class ColorListModel : public ProxyListModel {
 		ADD_COLOR("r_h_b_fg", "white", "[M] Reject hovered button : foreground")
 		ADD_COLOR("r_p_b_fg", "white", "[M] Reject pressed button : foreground")
 //-------------------------------------
-// List Actions
+// List Actions : like dot menu in chat
 		ADD_COLOR("l_n_b_bg", "transparent", "[M] List normal button : background")
 		ADD_COLOR("l_d_b_bg", "transparent", "[M] List disabled button : background")
 		ADD_COLOR("l_h_b_bg", "transparent", "[M] List hovered button : background")
 		ADD_COLOR("l_p_b_bg", "transparent", "[M] List pressed button : background")
+		ADD_COLOR_WITH_LINK("l_u_b_bg", "", "[M] List updating button : background", "l_p_b_bg")
 		
-		ADD_COLOR("l_n_b_fg", "#96A5B1", "[M] List normal button : foreground")
+		ADD_COLOR("l_n_b_fg", "#4B5964", "[M] List normal button : foreground")
 		ADD_COLOR("l_d_b_fg", "#8096A5B1", "[M] List disabled button : foreground")
-		ADD_COLOR("l_h_b_fg", "#4B5964", "[M] List hovered button : foreground")
+		ADD_COLOR("l_h_b_fg", "#96A5B1", "[M] List hovered button : foreground")
 		ADD_COLOR("l_p_b_fg", "#FF5E00", "[M] List pressed button : foreground")
-//-------------------------------------
-// Screen Actions
-		ADD_COLOR("sc_n_b_bg", "#E8E8E8", "[M] Screen normal button : background")
-		ADD_COLOR("sc_d_b_bg", "#80E8E8E8", "[M] Screen disabled button : background")
-		ADD_COLOR("sc_h_b_bg", "#E8E8E8", "[M] Screen hovered button : background")
-		ADD_COLOR("sc_p_b_bg", "#FF5E00", "[M] Screen pressed button : background")
-		
-		ADD_COLOR("sc_n_b_fg", "#6B7A86", "[M] Screen normal button : foreground")
-		ADD_COLOR("sc_d_b_fg", "#806B7A86", "[M] Screen disabled button : foreground")
-		ADD_COLOR("sc_h_b_fg", "#FF5E00", "[M] Screen hovered button : foreground")
-		ADD_COLOR("sc_p_b_fg", "white", "[M] Screen pressed button : foreground")
+		ADD_COLOR_WITH_LINK("l_u_b_fg", "", "[M] List updating button : foreground", "l_p_b_fg")
+
 //-------------------------------------		
 // Menu Actions
 		ADD_COLOR("me_n_b_bg", "transparent", "[M] Menu normal button : background")
 		ADD_COLOR("me_d_b_bg", "transparent", "[M] Menu disabled button : background")
 		ADD_COLOR("me_h_b_bg", "transparent", "[M] Menu hovered button : background")
 		ADD_COLOR("me_p_b_bg", "transparent", "[M] Menu pressed button : background")
+		ADD_COLOR_WITH_LINK("me_u_b_bg", "", "[M] Menu updating button : background", "me_p_b_bg")
 		
 		ADD_COLOR("me_n_b_fg", "#96A5B1", "[M] Menu normal button : foreground")
 		ADD_COLOR("me_d_b_fg", "#8096A5B1", "[M] Menu disabled button : foreground")
 		ADD_COLOR("me_h_b_fg", "#4B5964", "[M] Menu hovered button : foreground")
 		ADD_COLOR("me_p_b_fg", "#FF5E00", "[M] Menu pressed button : foreground")
+		ADD_COLOR_WITH_LINK("me_u_b_fg", "", "[M] Menu updating button : background", "me_p_b_fg")
 // Inverse
 		ADD_COLOR("me_n_b_inv_bg", "transparent", "[M] Menu normal button : inverse background")
 		ADD_COLOR("me_d_b_inv_bg", "transparent", "[M] Menu disabled button : inverse background")
@@ -243,6 +237,17 @@ class ColorListModel : public ProxyListModel {
 		ADD_COLOR_WITH_LINK("w_h_b_fg", "", "[M] Wave play hovered button : foreground", "ma_h_b_fg")
 		ADD_COLOR_WITH_LINK("w_p_b_fg", "", "[M] Wave play pressed button : foreground", "ma_p_b_fg")
 		
+// Wave Record
+		ADD_COLOR("wr_n_b_bg", "transparent", "[M] Wave record normal button : background")
+		ADD_COLOR("wr_d_b_bg", "transparent", "[M] Wave record disabled button : background")
+		ADD_COLOR("wr_h_b_bg", "transparent", "[M] Wave record hovered button : background")
+		ADD_COLOR("wr_p_b_bg", "transparent", "[M] Wave record pressed button : background")
+		
+		ADD_COLOR("wr_n_b_fg", "#96A5B1", "[M] Wave record normal button : foreground")
+		ADD_COLOR("wr_d_b_fg", "#96A5B1", "[M] Wave record disabled button : foreground")
+		ADD_COLOR("wr_h_b_fg", "#4B5964", "[M] Wave record hovered button : foreground")
+		ADD_COLOR("wr_p_b_fg", "#FF5E00", "[M] Wave record pressed button : foreground")
+				
 //--------------------------------------------------------------------------------------------------------------------
 /*		
 		ADD_COLOR("m_b_bg_h", "#4B5964", "Main color for hovered buttons(background)")

linphone-app/ui/modules/Common/Form/ActionButton.qml

@@ -81,6 +81,7 @@ Item {
 	// ---------------------------------------------------------------------------
 	
 	signal clicked(real x, real y)
+	signal pressed(real x, real y)
 	
 	// ---------------------------------------------------------------------------
 		
@@ -212,6 +213,7 @@ Item {
 			}
 		hoverEnabled: !wrappedButton.updating//|| wrappedButton.autoIcon
 		onClicked: !wrappedButton.updating && wrappedButton.enabled && wrappedButton.clicked(pressX, pressY)
+		onPressed: !wrappedButton.updating && wrappedButton.enabled && wrappedButton.pressed(pressX, pressY)
 		Rectangle{
 			id: foregroundColor
 			anchors.fill:parent

linphone-app/ui/modules/Common/Menus/DropDownDynamicMenu.qml

@@ -6,81 +6,82 @@ import Utils 1.0
 // =============================================================================
 
 Item {
-  id: menu
-
-  // ---------------------------------------------------------------------------
-
-  property alias relativeTo: popup.relativeTo
-  property alias relativeX: popup.relativeX
-  property alias relativeY: popup.relativeY
-
-  // Can be computed, but for performance usage, it must be given in attribute.
-  property int entryHeight
-  property int maxMenuHeight
-
-  default property alias _content: menuContent.data
-  property alias popup : popup
-
-  // ---------------------------------------------------------------------------
-
-  signal closed
-  signal opened
-
-  // ---------------------------------------------------------------------------
-
-  function open () {
-    popup.open()
-  }
-
-  function close () {
-    popup.close()
-  }
-
-  // ---------------------------------------------------------------------------
-
-  function _computeHeight () {
-    Utils.assert(_content != null && _content.length > 0, '`_content` cannot be null and must exists.')
-
-    var list = _content[0]
-    Utils.assert(list != null, 'No list found.')
-
-    var height = list.count * entryHeight
-
-    if (list.headerPositioning === ListView.OverlayHeader) {
-      // Workaround to force header layout.
-      list.headerItem.z = Constants.zMax
-
-      height += list.headerItem.height
-    }
-
-    return (maxMenuHeight !== undefined && height > maxMenuHeight)
-      ? maxMenuHeight
-      : height
-  }
-
-  // ---------------------------------------------------------------------------
-
-  visible: false
-
-  // ---------------------------------------------------------------------------
-
-  Popup {
-    id: popup    
-
-    onOpened: menu.opened()
-    onClosed: menu.closed()
-
-    Item {
-      id: menuContent
-
-      height: menu._computeHeight()
-      width: menu._content[0].width
-    }
-  }
-
-  Binding {
-    property: 'height'
-    target: menu._content[0]
-    value: menuContent.height
-  }
+	id: menu
+	
+	// ---------------------------------------------------------------------------
+	
+	property alias relativeTo: popup.relativeTo
+	property alias relativeX: popup.relativeX
+	property alias relativeY: popup.relativeY
+	
+	// Can be computed, but for performance usage, it must be given in attribute.
+	property int entryHeight
+	property int maxMenuHeight
+	
+	default property alias _content: menuContent.data
+	property alias popup : popup
+	
+	// ---------------------------------------------------------------------------
+	
+	signal closed
+	signal opened
+	
+	// ---------------------------------------------------------------------------
+	
+	function open () {
+		popup.open()
+	}
+	
+	function close () {
+		popup.close()
+	}
+	
+	// ---------------------------------------------------------------------------
+	
+	function _computeHeight () {
+		Utils.assert(_content != null && _content.length > 0, '`_content` cannot be null and must exists.')
+		
+		var list = _content[0]
+		Utils.assert(list != null, 'No list found.')
+		
+		var height = list.count * entryHeight
+		
+		if (list.headerPositioning === ListView.OverlayHeader) {
+			// Workaround to force header layout.
+			list.headerItem.z = Constants.zMax
+			
+			height += list.headerItem.height
+		}
+		
+		return  (maxMenuHeight !== undefined && maxMenuHeight != 0 && height > maxMenuHeight)
+				? maxMenuHeight
+				: height
+	}
+	
+	// ---------------------------------------------------------------------------
+	
+	visible: false
+	
+	// ---------------------------------------------------------------------------
+	
+	Popup {
+		id: popup    
+		
+		onOpened: menu.opened()
+		onClosed: menu.closed()
+		height: menu._computeHeight()
+		width: menu._content[0].width
+		
+		Item {
+			id: menuContent
+			anchors.fill: parent
+			
+		}
+	}
+	
+	Binding {
+		property: 'height'
+		target: menu._content[0]
+		value: menuContent.height
+	}
 }

linphone-app/ui/modules/Common/Menus/Menu.qml

@@ -7,22 +7,22 @@ import Common.Styles 1.0
 // =============================================================================
 
 Controls.Menu {
-  id: menu
-  property var menuStyle : MenuStyle.normal
-
-  background: Rectangle {
-    implicitWidth: menu.width
-    color: menuStyle.color
-    radius: menuStyle.radius
+	id: menu
+	property var menuStyle : MenuStyle.normal
 	
-	border{
-		color:menuStyle.border.color
-		width: menuStyle.border.width
+	background: Rectangle {
+		implicitWidth: menu.width
+		color: menuStyle.color
+		radius: menuStyle.radius
+		
+		border{
+			color:menuStyle.border.color
+			width: menuStyle.border.width
+		}
+		
+		layer {
+			enabled: menuStyle.shadowEnabled
+			effect: PopupShadow {}
+		}    
 	}
-	
-    layer {
-      enabled: menuStyle.shadowEnabled
-      effect: PopupShadow {}
-    }    
-  }
 }

linphone-app/ui/modules/Common/Styles/Menus/MenuItemStyle.qml

@@ -97,7 +97,7 @@ QtObject {
 			}
 		}
 	}
-	property QtObject auxRed : QtObject{
+	property QtObject auxError : QtObject{
 		property int leftMargin: 10
 		property int rightMargin: 10
 		
@@ -116,10 +116,10 @@ QtObject {
 			property int weight : Font.Normal
 			
 			property QtObject color: QtObject {
-				property color hovered: ColorsList.add(sectionName+'_auxRed_text_h', 'error').color
-				property color normal: ColorsList.add(sectionName+'_auxRed_text_n', 'error').color
-				property color pressed: ColorsList.add(sectionName+'_auxRed_text_p', 'error').color
-				property color disabled: ColorsList.add(sectionName+'_auxRed_text_d', 'l50').color
+				property color hovered: ColorsList.add(sectionName+'_auxError_text_h', 'error').color
+				property color normal: ColorsList.add(sectionName+'_auxError_text_n', 'error').color
+				property color pressed: ColorsList.add(sectionName+'_auxError_text_p', 'error').color
+				property color disabled: ColorsList.add(sectionName+'_auxError_text_d', 'l50').color
 			}
 		}
 	}
@@ -149,4 +149,30 @@ QtObject {
 			}
 		}
 	}
+	property QtObject aux2Error : QtObject{
+		property int leftMargin: 10
+		property int rightMargin: 10
+		
+		property QtObject background: QtObject {
+			property int height: 50
+			
+			property QtObject color: QtObject {
+				property color hovered: ColorsList.add(sectionName+'_aux2Error_bg_h', 'w').color
+				property color normal: ColorsList.add(sectionName+'_aux2Error_bg_n', 'w').color
+				property color pressed: ColorsList.add(sectionName+'_aux2Error_bg_p', 'v').color
+			}
+		}
+		
+		property QtObject text: QtObject {
+			property int pointSize: Units.dp * 11
+			property int weight : Font.Normal
+			
+			property QtObject color: QtObject {
+				property color hovered: ColorsList.add(sectionName+'_aux2Error_text_h', 'error').color
+				property color normal: ColorsList.add(sectionName+'_aux2Error_text_n', 'error').color
+				property color pressed: ColorsList.add(sectionName+'_aux2Error_text_p', 'error').color
+				property color disabled: ColorsList.add(sectionName+'_aux2Error_text_d', 'l50').color
+			}
+		}
+	}
 }

linphone-app/ui/modules/Linphone/Chat/ChatMenu.qml

@@ -110,7 +110,7 @@ Item {
 			iconMenu: MenuItemStyle.deleteEntry.icon
 			iconSizeMenu: MenuItemStyle.deleteEntry.iconSize
 			iconLayoutDirection: Qt.RightToLeft
-			menuItemStyle : MenuItemStyle.auxRed
+			menuItemStyle : MenuItemStyle.auxError
 			onTriggered: container.removeEntryRequested()
 		}
 	}

linphone-app/ui/modules/Linphone/Contact/Contact.qml

@@ -23,14 +23,14 @@ Rectangle {
 	property bool showContactAddress : true
 	property bool showAuxData : false
 	
-	// A entry from `SipAddressesModel` or an `SipAddressObserver`.
+	// An entry from `SipAddressesModel`, an `SipAddressObserver` or a ChatRoomModel
 	property var entry
 	
 	// entry should have these functions : presenceStatus, sipAddress, username, avatar (image)
 	
-	property string username: (entry != undefined ?(entry.contactModel != undefined ? entry.contactModel.vcard.username
-																			:entry.username != undefined ?entry.username:
-																										   UtilsCpp.getDisplayName(entry.sipAddress || entry.fullPeerAddress  || entry.peerAddress || '')
+	property string username: (entry != undefined ?( entry.username != undefined ?entry.username
+														: entry.contactModel != undefined ? entry.contactModel.vcard.username
+																			: UtilsCpp.getDisplayName(entry.sipAddress || entry.fullPeerAddress  || entry.peerAddress || '')
 											):'')
 	signal avatarClicked(var mouse)
 	// ---------------------------------------------------------------------------
@@ -53,8 +53,9 @@ Rectangle {
 			Layout.preferredWidth: ContactStyle.contentHeight
 			
 			//image: _contact && _contact.vcard.avatar
-			image: entry?(entry.contactModel	? entry.contactModel.vcard.avatar
-												: entry.avatar ? entry.avatar : '')
+			image: entry?(entry.avatar ? entry.avatar
+									: entry.contactModel ? entry.contactModel.vcard.avatar
+														: '')
 						:''
 			presenceLevel: entry?(entry.contactModel ? (entry.contactModel.presenceStatus >= 0 ? Presence.getPresenceLevel(entry.contactModel.presenceStatus) : -1)
 													 : (entry.presenceStatus >= 0 ? Presence.getPresenceLevel(entry.presenceStatus) : -1)

linphone-app/ui/modules/Linphone/Menus/SipAddressesMenu.qml

@@ -57,6 +57,9 @@ Item {
     property var callback
 
     parent: sipAddressesMenu.parent
+    
+	relativeTo: sipAddressesMenu.parent
+	relativeY: sipAddressesMenu.parent.height
 
     entryHeight: SipAddressesMenuStyle.entry.height
     maxMenuHeight: SipAddressesMenuStyle.maxHeight

linphone-app/ui/modules/Linphone/Styles/Chat/ChatAudioPreviewStyle.qml

@@ -103,12 +103,12 @@ QtObject {
 		property string name : 'recording_progression_soundwave'
 		property string icon : 'chat_audio_soundwave_custom'
 		
-		property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'l_n_b_bg').color
-		property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'l_h_b_bg').color
-		property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'l_p_b_bg').color
-		property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'l_h_b_fg').color
-		property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'l_n_b_fg').color
-		property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'l_p_b_fg').color
+		property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'wr_n_b_bg').color
+		property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'wr_h_b_bg').color
+		property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'wr_p_b_bg').color
+		property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'wr_n_b_fg').color
+		property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'wr_h_b_fg').color
+		property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'wr_p_b_fg').color
 		
 		// Old color: l_n_b_bg
 		property color backgroundHiddenPartNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_bg_n', icon, 'ai').color

linphone-app/ui/views/App/Calls/CallsWindow.js

@@ -67,7 +67,6 @@ function openWaitingRoom(model){
 // -----------------------------------------------------------------------------
 // Used to get Component based from Call Status
 function getContent (call, conferenceInfoModel) {
-	console.log('getContent call')
 	if (call == null) {
 		if(conferenceInfoModel)
 			return waitingRoom

linphone-app/ui/views/App/Calls/CallsWindow.qml

@@ -17,7 +17,7 @@ Window {
 	// ---------------------------------------------------------------------------
 	
 	// `{}` is a workaround to avoid `TypeError: Cannot read property...` when calls list is empty
-	readonly property CallModel call: calls.selectedCall
+	property CallModel call: calls.selectedCall
 	/*
 	?calls.selectedCall:{
 														  callError: '',
@@ -219,6 +219,7 @@ Window {
 				id: chat
 				
 				Chat {
+					anchors.fill: parent
 					proxyModel: ChatRoomProxyModel {
 						Component.onCompleted: {
 							if (chatRoomModel
@@ -283,7 +284,7 @@ Window {
 			
 			childB: Loader {
 				anchors.fill: parent
-				sourceComponent: window.call && window.call.peerAddress && window.call.localAddress ? chat : null
+				sourceComponent: window.call && window.call.chatRoomModel ? chat : null
 			}
 		}
 	}

linphone-app/ui/views/App/Main/Conversation.qml

@@ -124,11 +124,11 @@ ColumnLayout  {
 					spacing:0
 					
 					ColumnLayout{
-					
+						
 						property int maximumContentWidth: contactBar.width
-															-(avatar.visible?avatar.width:0)-(groupChat.visible?groupChat.width:0)
-															-actionBar.width - (secureIcon.visible?secureIcon.width :0)
-															-3*ConversationStyle.bar.spacing 
+														  -(avatar.visible?avatar.width:0)-(groupChat.visible?groupChat.width:0)
+														  -actionBar.width - (secureIcon.visible?secureIcon.width :0)
+														  -3*ConversationStyle.bar.spacing 
 						Layout.fillHeight: true
 						Layout.minimumWidth: 20
 						Layout.maximumWidth: maximumContentWidth
@@ -168,14 +168,14 @@ ColumnLayout  {
 							username: avatar.username
 							usernameClickable: chatRoomModel.isMeAdmin && !chatRoomModel.isOneToOne
 							participants: if(chatRoomModel) {
-											if(chatRoomModel.groupEnabled) {
-												return chatRoomModel.participants.displayNamesToString;
-											}else if(chatRoomModel.isSecure()) {
-												return chatRoomModel.participants.addressesToString;
-											}else
-												return ''
-										}else
-											return ''
+											  if(chatRoomModel.groupEnabled) {
+												  return chatRoomModel.participants.displayNamesToString;
+											  }else if(chatRoomModel.isSecure()) {
+												  return chatRoomModel.participants.addressesToString;
+											  }else
+												  return ''
+										  }else
+											  return ''
 							sipAddress: {
 								if(chatRoomModel) {
 									if(chatRoomModel.groupEnabled) {
@@ -191,11 +191,11 @@ ColumnLayout  {
 								
 							}
 							onUsernameClicked: {
-													if(!conversation.isReadOnly) {
-														usernameEdit.visible = !usernameEdit.visible
-														usernameEdit.forceActiveFocus()
-													}
-												}
+								if(!conversation.isReadOnly) {
+									usernameEdit.visible = !usernameEdit.visible
+									usernameEdit.forceActiveFocus()
+								}
+							}
 						}
 						Item{
 							Layout.fillHeight: true
@@ -294,10 +294,10 @@ ColumnLayout  {
 						
 						onClicked: CallsListModel.launchChat(chatRoomModel.participants.addressesToString, 1)
 						Icon{
-								icon:'secure_level_1'
-								iconSize: parent.height/2
-								anchors.top:parent.top
-								anchors.horizontalCenter: parent.right
+							icon:'secure_level_1'
+							iconSize: parent.height/2
+							anchors.top:parent.top
+							anchors.horizontalCenter: parent.right
 						}
 					}
 					
@@ -330,27 +330,20 @@ ColumnLayout  {
 						tooltipText: Logic.getEditTooltipText()
 					}
 					
-					ActionButton {
-						isCustom: true
-						backgroundRadius: 4
-						colorSet: 	ConversationStyle.bar.actions.del.deleteHistory
-						iconSize: ConversationStyle.bar.actions.del.iconSize
-						
-						onClicked: Logic.removeAllEntries()
-						
-						TooltipArea {
-							text: qsTr('cleanHistory')
-						}
-					}
 					ActionButton {
 						id:dotButton
 						isCustom: true
 						backgroundRadius: 90
 						colorSet: 	ConversationStyle.bar.actions.openMenu
-						visible: conversationMenu.showGroupInfo || conversationMenu.showDevices || conversationMenu.showEphemerals
-												
-						onClicked: {
-							conversationMenu.open()
+						visible: true //conversationMenu.showGroupInfo || conversationMenu.showDevices || conversationMenu.showEphemerals
+						toggled: conversationMenu.opened
+						
+						onPressed: {// Bug : Not working : Menu is still closed before pressing on button (even with closePolicy)
+							if( conversationMenu.opened ) {
+								conversationMenu.close()
+							}else {
+								conversationMenu.open()
+							}
 						}
 						
 					}
@@ -421,6 +414,28 @@ ColumnLayout  {
 													   ,{chatRoomModel:chatRoomModel})
 						}
 					}
+					Rectangle{
+						id: separator3
+						height:1
+						width:parent.width
+						color: ConversationStyle.menu.separatorColor
+						visible: deleteMenuItem.visible && (groupInfoMenu.visible || devicesMenuItem.visible || ephemeralMenuItem.visible)
+					}
+					MenuItem{
+						id: deleteMenuItem
+						//: 'Delete' : Item menu to delete the chat
+						text: qsTr('conversationMenuDelete')
+						iconMenu: MenuItemStyle.deleteEntry.icon
+						iconSizeMenu: 40
+						menuItemStyle : MenuItemStyle.aux2Error
+						visible: true
+						onTriggered: {
+							Logic.removeAllEntries()
+						}
+						TooltipArea {
+							text: qsTr('cleanHistory')
+						}
+					}
 				}
 			}
 		}
@@ -468,7 +483,7 @@ ColumnLayout  {
 			anchors.verticalCenter: parent.verticalCenter
 			running: chatArea.tryingToLoadMoreEntries
 		}
-			
+		
 		// -------------------------------------------------------------------------
 		// Search.
 		// -------------------------------------------------------------------------
@@ -529,8 +544,8 @@ ColumnLayout  {
 					interval: 500
 					running: false
 					onTriggered: if( searchView.visible){
-						chatRoomProxyModel.filterText = searchBar.text
-					}
+									 chatRoomProxyModel.filterText = searchBar.text
+								 }
 				}
 			}
 			

linphone-app/ui/views/App/Styles/Calls/CallFullscreenStyle.qml

@@ -160,25 +160,25 @@ QtObject {
 			property int iconSize: 40
 			property string icon : 'screenshot_custom'
 			property string name : 'screenshot'
-			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'sc_n_b_bg').color
-			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'sc_h_b_bg').color
-			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'sc_p_b_bg').color
-			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'sc_n_b_fg').color
-			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'sc_h_b_fg').color
-			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'sc_p_b_fg').color
+			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color
+			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color
+			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color
+			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color
+			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color
+			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color
 		}
 		property QtObject record: QtObject {
 			property int iconSize: 40
 			property string icon : 'record_custom'
 			property string name : 'record'
-			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'sc_n_b_bg').color
-			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'sc_h_b_bg').color
-			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'sc_p_b_bg').color
-			property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_c', icon, 'sc_p_b_bg').color
-			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'sc_n_b_fg').color
-			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'sc_h_b_fg').color
-			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'sc_p_b_fg').color
-			property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_c', icon, 'sc_p_b_fg').color
+			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color
+			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color
+			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color
+			property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_c', icon, 's_p_b_bg').color
+			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color
+			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color
+			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color
+			property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_c', icon, 's_p_b_fg').color
 		}
 		property QtObject fullscreen: QtObject {
 			property int iconSize: 40
@@ -195,12 +195,12 @@ QtObject {
 			property int iconSize: 40
 			property string icon : 'stop_fullscreen_custom'
 			property string name : 'stopFullscreen'
-			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'sc_n_b_bg').color
-			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'sc_h_b_bg').color
-			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'sc_p_b_bg').color
-			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'sc_n_b_fg').color
-			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'sc_h_b_fg').color
-			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'sc_p_b_fg').color
+			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color
+			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color
+			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color
+			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color
+			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color
+			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color
 		}
 		property QtObject microOn: QtObject {
 			property int iconSize: 40

linphone-app/ui/views/App/Styles/Calls/VideoConferenceStyle.qml

@@ -175,58 +175,58 @@ QtObject {
 			property int iconSize: 40
 			property string icon : 'screen_sharing_custom'
 			property string name : 'screenSharing'
-			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'sc_n_b_bg').color
-			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'sc_h_b_bg').color
-			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'sc_p_b_bg').color
-			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'sc_n_b_fg').color
-			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'sc_h_b_fg').color
-			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'sc_p_b_fg').color
+			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color
+			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color
+			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color
+			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color
+			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color
+			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color
 		}
 		property QtObject record: QtObject {
 			property int iconSize: 40
 			property string icon : 'record_custom'
 			property string name : 'record'
-			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'sc_n_b_bg').color
-			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'sc_h_b_bg').color
-			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'sc_p_b_bg').color
-			property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_c', icon, 'sc_p_b_bg').color
-			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'sc_n_b_fg').color
-			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'sc_h_b_fg').color
-			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'sc_p_b_fg').color
-			property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_c', icon, 'sc_p_b_fg').color
+			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color
+			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color
+			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color
+			property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_c', icon, 's_p_b_bg').color
+			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color
+			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color
+			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color
+			property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_c', icon, 's_p_b_fg').color
 		}
 		property QtObject screenshot: QtObject {
 			property int iconSize: 40
 			property string icon : 'screenshot_custom'
 			property string name : 'screenshot'
-			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'sc_n_b_bg').color
-			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'sc_h_b_bg').color
-			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'sc_p_b_bg').color
-			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'sc_n_b_fg').color
-			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'sc_h_b_fg').color
-			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'sc_p_b_fg').color
+			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color
+			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color
+			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color
+			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color
+			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color
+			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color
 		}
 		property QtObject fullscreen: QtObject {
 			property int iconSize: 40
 			property string icon : 'fullscreen_custom'
 			property string name : 'fullscreen'
-			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'sc_n_b_bg').color
-			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'sc_h_b_bg').color
-			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'sc_p_b_bg').color
-			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'sc_n_b_fg').color
-			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'sc_h_b_fg').color
-			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'sc_p_b_fg').color
+			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color
+			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color
+			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color
+			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color
+			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color
+			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color
 		}
 		property QtObject stopFullscreen: QtObject {
 			property int iconSize: 40
 			property string icon : 'stop_fullscreen_custom'
 			property string name : 'stopFullscreen'
-			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'sc_n_b_bg').color
-			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'sc_h_b_bg').color
-			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'sc_p_b_bg').color
-			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'sc_n_b_fg').color
-			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'sc_h_b_fg').color
-			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'sc_p_b_fg').color
+			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color
+			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color
+			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color
+			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color
+			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color
+			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color
 		}
 //------------------------------------------------------------------------------
 		property QtObject secure: QtObject {

linphone-app/ui/views/App/Styles/Calls/WaitingRoomStyle.qml

@@ -249,263 +249,5 @@ QtObject {
 			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color
 			property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_c', icon, 's_p_b_fg').color
 		}
-		/*
-		property QtObject callsList: QtObject {
-			property int iconSize: 40
-			property string name : 'callsList'
-			property string icon : 'call_menu_custom'
-			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color
-			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color
-			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color
-			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color
-			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color
-			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color
-		}
-		property QtObject dialpad: QtObject {
-			property int iconSize: 40
-			property string name : 'dialpad'
-			property string icon : 'dialpad_custom'
-			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color
-			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color
-			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color
-			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color
-			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color
-			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color
-		}
-		property QtObject screenSharing: QtObject {
-			property int iconSize: 40
-			property string icon : 'screen_sharing_custom'
-			property string name : 'screenSharing'
-			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'sc_n_b_bg').color
-			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'sc_h_b_bg').color
-			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'sc_p_b_bg').color
-			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'sc_n_b_fg').color
-			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'sc_h_b_fg').color
-			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'sc_p_b_fg').color
-		}
-		property QtObject recordOn: QtObject {
-			property int iconSize: 40
-			property string icon : 'record_custom'
-			property string name : 'recordOn'
-			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'sc_n_b_bg').color
-			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'sc_h_b_bg').color
-			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'sc_p_b_bg').color
-			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'sc_n_b_fg').color
-			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'sc_h_b_fg').color
-			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'sc_p_b_fg').color
-		}
-		property QtObject recordOff: QtObject {
-			property int iconSize: 40
-			property string icon : 'record_custom'
-			property string name : 'recordOff'
-			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'sc_n_b_bg').color
-			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'sc_h_b_bg').color
-			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'sc_p_b_bg').color
-			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'sc_n_b_fg').color
-			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'sc_h_b_fg').color
-			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'sc_p_b_fg').color
-		}
-		property QtObject screenshot: QtObject {
-			property int iconSize: 40
-			property string icon : 'screenshot_custom'
-			property string name : 'screenshot'
-			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'sc_n_b_bg').color
-			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'sc_h_b_bg').color
-			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'sc_p_b_bg').color
-			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'sc_n_b_fg').color
-			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'sc_h_b_fg').color
-			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'sc_p_b_fg').color
-		}
-		property QtObject fullscreen: QtObject {
-			property int iconSize: 40
-			property string icon : 'fullscreen_custom'
-			property string name : 'fullscreen'
-			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'sc_n_b_bg').color
-			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'sc_h_b_bg').color
-			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'sc_p_b_bg').color
-			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'sc_n_b_fg').color
-			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'sc_h_b_fg').color
-			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'sc_p_b_fg').color
-		}
-		property QtObject stopFullscreen: QtObject {
-			property int iconSize: 40
-			property string icon : 'stop_fullscreen_custom'
-			property string name : 'stopFullscreen'
-			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'sc_n_b_bg').color
-			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'sc_h_b_bg').color
-			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'sc_p_b_bg').color
-			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'sc_n_b_fg').color
-			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'sc_h_b_fg').color
-			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'sc_p_b_fg').color
-		}
-//------------------------------------------------------------------------------
-		property QtObject secure: QtObject {
-			property int buttonSize: 40
-			property int iconSize: 20
-			property string icon : ''
-			property string name : 'secure'
-			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, '', '', '#66727B').color
-			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, '', '', '#66727B').color
-			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, '', '', '#66727B').color
-			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon,  '', '', 'transparent').color
-			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon,  '', '', 'transparent').color
-			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon,  '', '', 'transparent').color
-		}
-		property QtObject unsecure: QtObject {
-			property int iconSize: 16
-			property string icon : 'call_chat_unsecure_custom'
-			property string name : 'unsecure'
-			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, '', '', 'transparent').color
-			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, '', '', 'transparent').color
-			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, '', '', 'transparent').color
-			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon,  '', '', '#ff0000').color
-			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon,  '', '', '#ff0000').color
-			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon,  '', '', '#ff0000').color
-		}
-		
-		property QtObject pause: QtObject {
-			property int iconSize: 40
-			property string icon : 'pause_custom'
-			property string name : 'pause'
-			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color
-			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color
-			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color
-			property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color
-			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color
-			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color
-			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color
-			property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color
-		}
-		property QtObject play: QtObject {
-			property int iconSize: 40
-			property string icon : 'play_custom'
-			property string name : 'play'
-			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color
-			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color
-			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color
-			property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color
-			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color
-			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color
-			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color
-			property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color
-		}
-		property QtObject hangup: QtObject {
-			property int iconSize: 40
-			property string icon : 'hangup_custom'
-			property string name : 'hangup'
-			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'r_n_b_bg').color
-			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'r_h_b_bg').color
-			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'r_p_b_bg').color
-			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'r_n_b_fg').color
-			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'r_h_b_fg').color
-			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'r_p_b_fg').color
-		}
-//------------------------------------------------------------------------------
-		property QtObject chat: QtObject {
-			property int iconSize: 40
-			property string icon : 'chat_custom'
-			property string name : 'chat'
-			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_inv_bg').color
-			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_inv_bg').color
-			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_inv_bg').color
-			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_inv_fg').color
-			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_inv_fg').color
-			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_inv_fg').color
-		}
-		property QtObject participants: QtObject {
-			property int iconSize: 40
-			property string icon : 'participants_custom'
-			property string name : 'participants'
-			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_inv_bg').color
-			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_inv_bg').color
-			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_inv_bg').color
-			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_inv_fg').color
-			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_inv_fg').color
-			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_inv_fg').color
-		}
-		property QtObject callQuality: QtObject {
-			property int iconSize: 20
-			property string name : 'quality'
-			property string icon : 'call_quality_custom'
-			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg').color
-			property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 'me_d_b_bg').color
-			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color
-			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color
-			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg').color
-			property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 'me_d_b_fg').color
-			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color
-			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color
-			
-			property color backgroundHiddenPartNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_bg_n', icon, 'me_n_b_inv_bg').color
-			property color backgroundHiddenPartDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_bg_d', icon, 'me_d_b_inv_bg').color
-			property color backgroundHiddenPartHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_bg_h', icon, 'me_h_b_inv_bg').color
-			property color backgroundHiddenPartPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_bg_p', icon, 'me_p_b_inv_bg').color
-			property color foregroundHiddenPartNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_fg_n', icon, 'me_n_b_inv_fg').color
-			property color foregroundHiddenPartDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_fg_d', icon, 'me_d_b_inv_fg').color
-			property color foregroundHiddenPartHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_fg_h', icon, 'me_h_b_inv_fg').color
-			property color foregroundHiddenPartPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_fg_p', icon, 'me_p_b_inv_fg').color
-		}
-		property QtObject options: QtObject {
-			property int iconSize: 40
-			property string icon : 'options_custom'
-			property string name : 'options'
-			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_inv_bg').color
-			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_inv_bg').color
-			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_inv_bg').color
-			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_inv_fg').color
-			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_inv_fg').color
-			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_inv_fg').color
-		}
-//------------------------------------------------------------------------------
-		property QtObject closePreview: QtObject {
-			property int iconSize: 40
-			property string icon : 'close_custom'
-			property string name : 'close_preview'
-			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_inv_bg').color
-			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_inv_bg').color
-			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_inv_bg').color
-			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_inv_fg').color
-			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_inv_fg').color
-			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_inv_fg').color
-		}
-//------------------------------------------------------------------------------		
-		
-		
-		property QtObject history: QtObject {
-			property int iconSize: 40
-			property string icon : 'history_custom'
-			property string name : 'history'
-			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color
-			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color
-			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color
-			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color
-			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color
-			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color
-		}
-		
-		
-		property QtObject acceptVideoCall: QtObject {
-			property int iconSize: 40
-			property string icon : 'video_call_accept_custom'
-			property string name : 'videoCallAccept'
-			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'a_n_b_bg').color
-			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'a_h_b_bg').color
-			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'a_p_b_bg').color
-			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'a_n_b_fg').color
-			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'a_h_b_fg').color
-			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'a_p_b_fg').color
-		}
-		property QtObject acceptCall: QtObject {
-			property int iconSize: 40
-			property string icon : 'call_accept_custom'
-			property string name : 'callAccept'
-			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'a_n_b_bg').color
-			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'a_h_b_bg').color
-			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'a_p_b_bg').color
-			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'a_n_b_fg').color
-			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'a_h_b_fg').color
-			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'a_p_b_fg').color
-		}
-		*/
 	}
 }

linphone-app/ui/views/App/Styles/Main/ConversationStyle.qml

@@ -124,12 +124,14 @@ QtObject {
 					property int iconSize: 40
 					property string name : 'other'
 					property string icon : 'menu_vdots_custom'
-					property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg').color
-					property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color
-					property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color
-					property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg').color
-					property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color
-					property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color
+					property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'l_n_b_bg').color
+					property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'l_h_b_bg').color
+					property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'l_p_b_bg').color
+					property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 'l_u_b_bg').color
+					property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'l_n_b_fg').color
+					property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'l_h_b_fg').color
+					property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'l_p_b_fg').color
+					property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 'l_u_b_fg').color
 				}
 		}
 		

linphone-app/ui/views/App/Styles/Main/MainWindowStyle.qml

@@ -109,14 +109,14 @@ QtObject {
 			property int iconSize: 40
 			property string name : 'burgerMenu'
 			property string icon : 'burger_menu_custom'
-			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg').color
-			property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 'me_p_b_bg').color
-			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color
-			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color
-			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg').color
-			property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 'me_p_b_fg').color
-			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color
-			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color
+			property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'l_n_b_bg').color
+			property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 'l_u_b_bg').color
+			property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'l_h_b_bg').color
+			property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'l_p_b_bg').color
+			property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'l_n_b_fg').color
+			property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 'l_u_b_fg').color
+			property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'l_h_b_fg').color
+			property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'l_p_b_fg').color
 		}
 	}
 }

linphone-sdk

@@ -1 +1 @@
-Subproject commit 118f804d7d74e04cd4b2a20a53ebf029b5124c02
+Subproject commit be381f199d2c55dcfca959f65cbe589329b4bee7