diff --git a/Linphone/model/setting/SettingsModel.cpp b/Linphone/model/setting/SettingsModel.cpp
index d20dd8759..264e9bd10 100644
--- a/Linphone/model/setting/SettingsModel.cpp
+++ b/Linphone/model/setting/SettingsModel.cpp
@@ -58,7 +58,6 @@ SettingsModel::SettingsModel() {
 		    if (gstate == linphone::GlobalState::On) { // reached when misc|config-uri is set in config and app starts
 			                                           // and after config is fetched.
 			    notifyConfigReady();
-
 		    }
 	    });
 	QObject::connect(CoreModel::getInstance().get(), &CoreModel::configuringStatus, this,
@@ -314,8 +313,6 @@ QVariantList SettingsModel::getCaptureDevices() const {
 	for (const auto &device : core->getExtendedAudioDevices()) {
 		if (device->hasCapability(linphone::AudioDevice::Capabilities::CapabilityRecord)) {
 			list << ToolModel::createVariant(device);
-		} else if (device->hasCapability(linphone::AudioDevice::Capabilities::CapabilityAll)) {
-			list << ToolModel::createVariant(device);
 		}
 	}
 	return list;
@@ -329,8 +326,6 @@ QVariantList SettingsModel::getPlaybackDevices() const {
 	for (const auto &device : core->getExtendedAudioDevices()) {
 		if (device->hasCapability(linphone::AudioDevice::Capabilities::CapabilityPlay)) {
 			list << ToolModel::createVariant(device);
-		} else if (device->hasCapability(linphone::AudioDevice::Capabilities::CapabilityAll)) {
-			list << ToolModel::createVariant(device);
 		}
 	}
 
@@ -706,9 +701,6 @@ QString SettingsModel::getLogsEmail() const {
 	return Utils::coreStringToAppString(mConfig->getString(UiSection, "logs_email", Constants::DefaultLogsEmail));
 }
 
-
-
-
 // =============================================================================
 // Do not disturb
 // =============================================================================
diff --git a/Linphone/view/Page/Window/Call/CallsWindow.qml b/Linphone/view/Page/Window/Call/CallsWindow.qml
index 671ff40ee..434ab0933 100644
--- a/Linphone/view/Page/Window/Call/CallsWindow.qml
+++ b/Linphone/view/Page/Window/Call/CallsWindow.qml
@@ -347,7 +347,17 @@ AbstractWindow {
                             Layout.preferredWidth: Utils.getSizeWithScreenRatio(30)
                             Layout.preferredHeight: Utils.getSizeWithScreenRatio(30)
                             // TODO : change with broadcast or meeting icon when available
-                            imageSource: !mainWindow.call ? AppIcons.meeting : (mainWindow.callState === LinphoneEnums.CallState.End || mainWindow.callState === LinphoneEnums.CallState.Released) ? AppIcons.endCall : (mainWindow.callState === LinphoneEnums.CallState.Paused || mainWindow.callState === LinphoneEnums.CallState.PausedByRemote) ? AppIcons.pause : mainWindow.conference ? AppIcons.usersThree : mainWindow.call.core.dir === LinphoneEnums.CallDir.Outgoing ? AppIcons.arrowUpRight : AppIcons.arrowDownLeft
+                            imageSource: !mainWindow.call
+                                ? AppIcons.meeting
+                                : (mainWindow.callState === LinphoneEnums.CallState.End || mainWindow.callState === LinphoneEnums.CallState.Released)
+                                    ? AppIcons.endCall
+                                    : (mainWindow.callState === LinphoneEnums.CallState.Paused || mainWindow.callState === LinphoneEnums.CallState.PausedByRemote)
+                                        ? AppIcons.pause
+                                        : mainWindow.conference
+                                            ? AppIcons.usersThree
+                                            : mainWindow.call.core.dir === LinphoneEnums.CallDir.Outgoing
+                                                ? AppIcons.arrowUpRight
+                                                : AppIcons.arrowDownLeft
                             colorizationColor: !mainWindow.call
                                                || mainWindow.call.core.paused
                                                || mainWindow.callState