diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b6a3c8b3..78512ea76 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,7 +102,7 @@ option(ENABLE_TESTS "Build with testing binaries of SDK" NO )
option(ENABLE_TESTS_COMPONENTS "Build libbctoolbox-tester" NO )
option(ENABLE_TOOLS "Enable tools of SDK" NO)
option(ENABLE_STRICT "Build with strict compilator flags e.g. -Wall -Werror" NO)
-option(ENABLE_FFMPEG "Build mediastreamer2 with ffmpeg video support." YES)
+option(ENABLE_FFMPEG "Build mediastreamer2 with ffmpeg video support." ON)
option(ENABLE_BUILD_VERBOSE "Enable the build generation to be more verbose" NO)
option(ENABLE_OPENH264 "Enable the use of OpenH264 codec" YES)
option(ENABLE_NON_FREE_CODECS "Enable the use of non free codecs" YES)
@@ -210,10 +210,10 @@ endif()
include(FindPkgConfig)
set(APP_DEPENDS sdk)
-find_package(Qt5 5.9 COMPONENTS Core REQUIRED)
+find_package(Qt5 5.10 COMPONENTS Core REQUIRED)
if ( NOT Qt5_FOUND )
- message(FATAL_ERROR "Minimum supported Qt5 version is 5.9!")
+ message(FATAL_ERROR "Minimum supported Qt5 version is 5.10!")
endif()
find_package(LinphoneCxx CONFIG QUIET)
diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt
index 5399280c3..499fe4983 100644
--- a/linphone-app/CMakeLists.txt
+++ b/linphone-app/CMakeLists.txt
@@ -158,6 +158,7 @@ set(SOURCES
src/components/other/colors/ColorModel.cpp
src/components/other/colors/ColorListModel.cpp
src/components/other/colors/ColorProxyModel.cpp
+ src/components/other/colors/ImageColorsProxyModel.cpp
src/components/other/images/ImageModel.cpp
src/components/other/images/ImageListModel.cpp
src/components/other/images/ImageProxyModel.cpp
@@ -263,6 +264,7 @@ set(HEADERS
src/components/other/colors/ColorModel.hpp
src/components/other/colors/ColorListModel.hpp
src/components/other/colors/ColorProxyModel.hpp
+ src/components/other/colors/ImageColorsProxyModel.hpp
src/components/other/images/ImageModel.hpp
src/components/other/images/ImageListModel.hpp
src/components/other/images/ImageProxyModel.hpp
diff --git a/linphone-app/assets/images/menu_delete.svg b/linphone-app/assets/images/add_custom.svg
similarity index 54%
rename from linphone-app/assets/images/menu_delete.svg
rename to linphone-app/assets/images/add_custom.svg
index 4c9eff791..0195c2fca 100644
--- a/linphone-app/assets/images/menu_delete.svg
+++ b/linphone-app/assets/images/add_custom.svg
@@ -1,11 +1,10 @@
+ inkscape:current-layer="svg8" />
-
-
-
+ id="g6"
+ transform="matrix(4.4444441,0,0,4.4444467,0,-1.9873506e-5)">
+
+
diff --git a/linphone-app/assets/images/add_disabled.svg b/linphone-app/assets/images/add_disabled.svg
deleted file mode 100644
index 787a60cd1..000000000
--- a/linphone-app/assets/images/add_disabled.svg
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
diff --git a/linphone-app/assets/images/add_hovered.svg b/linphone-app/assets/images/add_hovered.svg
deleted file mode 100644
index 3c9311d2e..000000000
--- a/linphone-app/assets/images/add_hovered.svg
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
diff --git a/linphone-app/assets/images/add_normal.svg b/linphone-app/assets/images/add_normal.svg
deleted file mode 100644
index a54c9f43b..000000000
--- a/linphone-app/assets/images/add_normal.svg
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
diff --git a/linphone-app/assets/images/add_participant_normal.svg b/linphone-app/assets/images/add_participant_custom.svg
similarity index 64%
rename from linphone-app/assets/images/add_participant_normal.svg
rename to linphone-app/assets/images/add_participant_custom.svg
index fa20f9912..b3bb1981e 100644
--- a/linphone-app/assets/images/add_participant_normal.svg
+++ b/linphone-app/assets/images/add_participant_custom.svg
@@ -1,11 +1,11 @@