diff --git a/linphone-app/src/components/settings/SettingsModel.cpp b/linphone-app/src/components/settings/SettingsModel.cpp
index 966a140c5..a5a8d39f4 100644
--- a/linphone-app/src/components/settings/SettingsModel.cpp
+++ b/linphone-app/src/components/settings/SettingsModel.cpp
@@ -114,6 +114,8 @@ SettingsModel::SettingsModel (QObject *parent) : QObject(parent) {
 	});
 #endif
 	updateRlsUri();
+	shared_ptr<linphone::Factory> factory = linphone::Factory::get();
+	factory->setDownloadDir(Utils::appStringToCoreString(getDownloadFolder()));
 }
 
 SettingsModel::~SettingsModel()
@@ -1509,7 +1511,7 @@ void SettingsModel::setTextMessageFontSize(const int& size){
 
 QFont SettingsModel::getEmojiFont() const{
 	QString family = Utils::coreStringToAppString(mConfig->getString(UiSection, "emoji_font", Utils::appStringToCoreString(QFont(Constants::DefaultEmojiFont).family())));
-	int pointSize = getTextMessageFontSize();
+	int pointSize = getEmojiFontSize();
 	return QFont(family,pointSize);
 }
 
@@ -1583,7 +1585,10 @@ QString SettingsModel::getDownloadFolder () const {
 
 void SettingsModel::setDownloadFolder (const QString &folder) {
 	QString cleanedFolder = QDir::cleanPath(folder) + QDir::separator();
-	mConfig->setString(UiSection, "download_folder", Utils::appStringToCoreString(cleanedFolder));
+	auto lFolder = Utils::appStringToCoreString(cleanedFolder);
+	mConfig->setString(UiSection, "download_folder", lFolder);
+	shared_ptr<linphone::Factory> factory = linphone::Factory::get();
+	factory->setDownloadDir(lFolder);
 	emit downloadFolderChanged(cleanedFolder);
 }
 
diff --git a/linphone-app/src/utils/Constants.hpp b/linphone-app/src/utils/Constants.hpp
index d0d820eae..9d5e8d5eb 100644
--- a/linphone-app/src/utils/Constants.hpp
+++ b/linphone-app/src/utils/Constants.hpp
@@ -39,7 +39,11 @@ public:
 	static constexpr char DefaultLocale[] = "en";
 	static constexpr char DefaultFont[] = "Noto Sans";
 	static constexpr int DefaultFontPointSize = 10;
+#ifdef __APPLE__
+	static constexpr char DefaultEmojiFont[] = "Apple Color Emoji";
+#else
 	static constexpr char DefaultEmojiFont[] = "Noto Color Emoji";
+#endif
 	static constexpr int DefaultEmojiFontPointSize = 10;
 	
 	static constexpr size_t MaxLogsCollectionSize = 10485760*5; // 50MB.