diff --git a/linphone-desktop/assets/images/file_hovered.svg b/linphone-desktop/assets/images/file_hovered.svg
new file mode 100644
index 000000000..a3b51852b
--- /dev/null
+++ b/linphone-desktop/assets/images/file_hovered.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="20px" viewBox="0 0 16 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
+    <title>settings_file_1</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="settings_file_1" stroke="#6B7A86">
+            <g id="Group-13">
+                <g id="Group-12">
+                    <rect id="Rectangle-10-Copy" transform="translate(8.000000, 10.000000) rotate(-270.000000) translate(-8.000000, -10.000000) " x="-1.5" y="2.5" width="19" height="15" rx="3"></rect>
+                    <g id="Group-9" transform="translate(4.000000, 4.000000)" stroke-linecap="round">
+                        <path d="M0.444444444,4.5 L7.55555556,4.5" id="Line"></path>
+                        <path d="M0.444444444,1.5 L7.55555556,1.5" id="Line"></path>
+                        <path d="M0.444444444,10.5 L7.55555556,10.5" id="Line"></path>
+                        <path d="M0.444444444,7.5 L7.55555556,7.5" id="Line"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/linphone-desktop/assets/images/file_normal.svg b/linphone-desktop/assets/images/file_normal.svg
new file mode 100644
index 000000000..bd7f84cb7
--- /dev/null
+++ b/linphone-desktop/assets/images/file_normal.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="20px" viewBox="0 0 16 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
+    <title>settings_file_3</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="settings_file_3" stroke="#96A5B1">
+            <rect id="Rectangle-10-Copy" transform="translate(8.000000, 10.000000) rotate(-270.000000) translate(-8.000000, -10.000000) " x="-1.5" y="2.5" width="19" height="15" rx="3"></rect>
+            <path d="M4.44444444,8.5 L11.5555556,8.5" id="Line" stroke-linecap="round"></path>
+            <path d="M4.44444444,5.5 L11.5555556,5.5" id="Line" stroke-linecap="round"></path>
+            <path d="M4.44444444,14.5 L11.5555556,14.5" id="Line" stroke-linecap="round"></path>
+            <path d="M4.44444444,11.5 L11.5555556,11.5" id="Line" stroke-linecap="round"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/linphone-desktop/assets/images/file_pressed.svg b/linphone-desktop/assets/images/file_pressed.svg
new file mode 100644
index 000000000..c9123f0c7
--- /dev/null
+++ b/linphone-desktop/assets/images/file_pressed.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="20px" viewBox="0 0 16 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
+    <title>settings_file_2</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="settings_file_2" stroke="#FF5E00">
+            <rect id="Rectangle-10-Copy" transform="translate(8.000000, 10.000000) rotate(-270.000000) translate(-8.000000, -10.000000) " x="-1.5" y="2.5" width="19" height="15" rx="3"></rect>
+            <path d="M4.44444444,8.5 L11.5555556,8.5" id="Line" stroke-linecap="round"></path>
+            <path d="M4.44444444,5.5 L11.5555556,5.5" id="Line" stroke-linecap="round"></path>
+            <path d="M4.44444444,14.5 L11.5555556,14.5" id="Line" stroke-linecap="round"></path>
+            <path d="M4.44444444,11.5 L11.5555556,11.5" id="Line" stroke-linecap="round"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/linphone-desktop/assets/images/folder_hovered.svg b/linphone-desktop/assets/images/folder_hovered.svg
new file mode 100644
index 000000000..c3b8b181c
--- /dev/null
+++ b/linphone-desktop/assets/images/folder_hovered.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="21px" height="18px" viewBox="0 0 21 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
+    <title>settings_folder_1</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="settings_folder_1" stroke="#6B7A86">
+            <path d="M10.1717552,2.5 L10.5248326,2.5 L10.6429477,2.16726507 C10.9945521,1.17678114 11.9372463,0.5 13.0057983,0.5 L17.9942017,0.5 C19.3800816,0.5 20.5,1.61712484 20.5,3.00166547 L20.5,4.99833453 C20.4999993,5.00066969 20.4999993,5.00066969 20.4999958,5.00301806 C20.4999993,5.00713802 20.4999993,5.00713802 20.5,5.00947762 L20.5,14.9905224 C20.5,16.3770475 19.3776888,17.5 17.991212,17.5 L3.00878799,17.5 C1.61924805,17.5 0.5,16.3832597 0.5,14.9905224 L0.5,5.00947762 C0.5,3.62295255 1.62231116,2.5 3.00878799,2.5 L10.1717552,2.5 Z" id="Combined-Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/linphone-desktop/assets/images/folder_normal.svg b/linphone-desktop/assets/images/folder_normal.svg
new file mode 100644
index 000000000..4ef86b906
--- /dev/null
+++ b/linphone-desktop/assets/images/folder_normal.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="21px" height="18px" viewBox="0 0 21 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
+    <title>settings_folder_3</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="settings_folder_3" stroke="#96A5B1">
+            <path d="M10.1717552,2.5 L10.5248326,2.5 L10.6429477,2.16726507 C10.9945521,1.17678114 11.9372463,0.5 13.0057983,0.5 L17.9942017,0.5 C19.3800816,0.5 20.5,1.61712484 20.5,3.00166547 L20.5,4.99833453 C20.4999993,5.00066969 20.4999993,5.00066969 20.4999958,5.00301806 C20.4999993,5.00713802 20.4999993,5.00713802 20.5,5.00947762 L20.5,14.9905224 C20.5,16.3770475 19.3776888,17.5 17.991212,17.5 L3.00878799,17.5 C1.61924805,17.5 0.5,16.3832597 0.5,14.9905224 L0.5,5.00947762 C0.5,3.62295255 1.62231116,2.5 3.00878799,2.5 L10.1717552,2.5 Z" id="Combined-Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/linphone-desktop/assets/images/folder_pressed.svg b/linphone-desktop/assets/images/folder_pressed.svg
new file mode 100644
index 000000000..6e6a2ce9a
--- /dev/null
+++ b/linphone-desktop/assets/images/folder_pressed.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="21px" height="18px" viewBox="0 0 21 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
+    <title>settings_folder_2</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="settings_folder_2" stroke="#FF5E00">
+            <path d="M10.1717552,2.5 L10.5248326,2.5 L10.6429477,2.16726507 C10.9945521,1.17678114 11.9372463,0.5 13.0057983,0.5 L17.9942017,0.5 C19.3800816,0.5 20.5,1.61712484 20.5,3.00166547 L20.5,4.99833453 C20.4999993,5.00066969 20.4999993,5.00066969 20.4999958,5.00301806 C20.4999993,5.00713802 20.4999993,5.00713802 20.5,5.00947762 L20.5,14.9905224 C20.5,16.3770475 19.3776888,17.5 17.991212,17.5 L3.00878799,17.5 C1.61924805,17.5 0.5,16.3832597 0.5,14.9905224 L0.5,5.00947762 C0.5,3.62295255 1.62231116,2.5 3.00878799,2.5 L10.1717552,2.5 Z" id="Combined-Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/linphone-desktop/resources.qrc b/linphone-desktop/resources.qrc
index 042a776d7..5be4da53f 100644
--- a/linphone-desktop/resources.qrc
+++ b/linphone-desktop/resources.qrc
@@ -82,8 +82,14 @@
     <file>assets/images/edit_normal.svg</file>
     <file>assets/images/edit_pressed.svg</file>
     <file>assets/images/ended_call.svg</file>
+    <file>assets/images/file_hovered.svg</file>
+    <file>assets/images/file_normal.svg</file>
+    <file>assets/images/file_pressed.svg</file>
     <file>assets/images/file_sign.svg</file>
     <file>assets/images/filter.svg</file>
+    <file>assets/images/folder_hovered.svg</file>
+    <file>assets/images/folder_normal.svg</file>
+    <file>assets/images/folder_pressed.svg</file>
     <file>assets/images/fullscreen_hovered.svg</file>
     <file>assets/images/fullscreen_normal.svg</file>
     <file>assets/images/fullscreen_pressed.svg</file>
diff --git a/linphone-desktop/ui/modules/Common/Form/Buttons/FileChooserButton.qml b/linphone-desktop/ui/modules/Common/Form/Buttons/FileChooserButton.qml
index 2c549e850..8f458c627 100644
--- a/linphone-desktop/ui/modules/Common/Form/Buttons/FileChooserButton.qml
+++ b/linphone-desktop/ui/modules/Common/Form/Buttons/FileChooserButton.qml
@@ -50,7 +50,16 @@ TextField {
 
       Icon {
         anchors.centerIn: parent
-        // TODO: Set icon file or folder.
+
+        icon: (textField.selectFolder ? 'folder' : 'file') + (mouseArea.pressed
+          ? '_pressed'
+          : (
+            mouseArea.containsMouse
+              ? '_hovered'
+              : '_normal'
+          )
+        )
+
         iconSize: FileChooserButtonStyle.tools.button.iconSize
       }
     }
diff --git a/linphone-desktop/ui/modules/Common/Form/Fields/TextField.qml b/linphone-desktop/ui/modules/Common/Form/Fields/TextField.qml
index 70e401d57..c79ab587e 100644
--- a/linphone-desktop/ui/modules/Common/Form/Fields/TextField.qml
+++ b/linphone-desktop/ui/modules/Common/Form/Fields/TextField.qml
@@ -13,8 +13,8 @@ Controls.TextField {
 
   // ---------------------------------------------------------------------------
 
-  property alias icon: icon.icon
   property string error: ''
+  property string icon: ''
   property var tools
 
   // ---------------------------------------------------------------------------