diff --git a/inc/fields/actorfield.class.php b/inc/fields/actorfield.class.php
index 97f1a1d35..e0a7ba601 100644
--- a/inc/fields/actorfield.class.php
+++ b/inc/fields/actorfield.class.php
@@ -325,8 +325,6 @@ public function isAnonymousFormCompatible() {
    }
 
    public function getHtmlIcon() {
-      global $CFG_GLPI;
-
-      return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-actor-field.png" title="" />';
+      return '<i class="fa fa-user" aria-hidden="true"></i>';
    }
 }
diff --git a/inc/fields/checkboxesfield.class.php b/inc/fields/checkboxesfield.class.php
index 6bae695ba..4ff92c433 100644
--- a/inc/fields/checkboxesfield.class.php
+++ b/inc/fields/checkboxesfield.class.php
@@ -309,8 +309,6 @@ public function isAnonymousFormCompatible() {
    }
 
    public function getHtmlIcon() {
-      global $CFG_GLPI;
-
-      return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-checkboxes-field.png" title="" />';
+      return '<i class="fa fa-check-square" aria-hidden="true"></i>';
    }
 }
diff --git a/inc/fields/datefield.class.php b/inc/fields/datefield.class.php
index d1a86548c..eea213244 100644
--- a/inc/fields/datefield.class.php
+++ b/inc/fields/datefield.class.php
@@ -142,8 +142,6 @@ public function isAnonymousFormCompatible() {
    }
 
    public function getHtmlIcon() {
-      global $CFG_GLPI;
-
-      return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-date-field.png" title="" />';
+      return '<i class="fa fa-calendar" aria-hidden="true"></i>';
    }
 }
diff --git a/inc/fields/datetimefield.class.php b/inc/fields/datetimefield.class.php
index 16aeb2353..7558357b1 100644
--- a/inc/fields/datetimefield.class.php
+++ b/inc/fields/datetimefield.class.php
@@ -149,8 +149,6 @@ public function isAnonymousFormCompatible() {
    }
 
    public function getHtmlIcon() {
-      global $CFG_GLPI;
-
-      return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-datetime-field.png" title="" />';
+      return '<i class="fa fa-calendar" aria-hidden="true"></i>';
    }
 }
diff --git a/inc/fields/dropdownfield.class.php b/inc/fields/dropdownfield.class.php
index db96d2ec5..f3beda3bb 100644
--- a/inc/fields/dropdownfield.class.php
+++ b/inc/fields/dropdownfield.class.php
@@ -645,8 +645,6 @@ public function parseObjectProperties(
    }
 
    public function getHtmlIcon() {
-      global $CFG_GLPI;
-
-      return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-dropdown-field.png" title="" />';
+      return '<i class="fa fa-caret-down" aria-hidden="true"></i>';
    }
 }
diff --git a/inc/fields/emailfield.class.php b/inc/fields/emailfield.class.php
index fa5da2888..1101c1814 100644
--- a/inc/fields/emailfield.class.php
+++ b/inc/fields/emailfield.class.php
@@ -156,8 +156,6 @@ public function isAnonymousFormCompatible() {
    }
 
    public function getHtmlIcon() {
-      global $CFG_GLPI;
-
-      return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-email-field.png" title="" />';
+      return '<i class="fa fa-envelope" aria-hidden="true"></i>';
    }
 }
diff --git a/inc/fields/filefield.class.php b/inc/fields/filefield.class.php
index 9c7f365eb..c55a0f6e2 100644
--- a/inc/fields/filefield.class.php
+++ b/inc/fields/filefield.class.php
@@ -217,8 +217,6 @@ public function isAnonymousFormCompatible() {
    }
 
    public function getHtmlIcon() {
-      global $CFG_GLPI;
-
-      return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-file-field.png" title="" />';
+      return '<i class="fa fa-file" aria-hidden="true"></i>';
    }
 }
diff --git a/inc/fields/hiddenfield.class.php b/inc/fields/hiddenfield.class.php
index a4c8ac60b..1d2ee9b90 100644
--- a/inc/fields/hiddenfield.class.php
+++ b/inc/fields/hiddenfield.class.php
@@ -140,8 +140,6 @@ public function isAnonymousFormCompatible() {
    }
 
    public function getHtmlIcon() {
-      global $CFG_GLPI;
-
-      return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-hidden-field.png" title="" />';
+      return '<i class="fa fa-eye-slash" aria-hidden="true"></i>';
    }
 }
diff --git a/inc/fields/hostnamefield.class.php b/inc/fields/hostnamefield.class.php
index 0b7051c43..ab6a07047 100644
--- a/inc/fields/hostnamefield.class.php
+++ b/inc/fields/hostnamefield.class.php
@@ -97,8 +97,6 @@ public function isAnonymousFormCompatible() {
    }
 
    public function getHtmlIcon() {
-      global $CFG_GLPI;
-
-      return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-actor-field.png" title="" />';
+      return '<i class="fa fa-desktop" aria-hidden="true"></i>';
    }
 }
diff --git a/inc/fields/ipfield.class.php b/inc/fields/ipfield.class.php
index 93f79848a..71b06572f 100644
--- a/inc/fields/ipfield.class.php
+++ b/inc/fields/ipfield.class.php
@@ -134,8 +134,6 @@ public function isAnonymousFormCompatible() {
    }
 
    public function getHtmlIcon() {
-      global $CFG_GLPI;
-
-      return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-hostname-field.png" title="" />';
+      return '<i class="fa fa-desktop" aria-hidden="true"></i>';
    }
 }
diff --git a/inc/fields/ldapselectfield.class.php b/inc/fields/ldapselectfield.class.php
index 10d39125f..e7c2522d8 100644
--- a/inc/fields/ldapselectfield.class.php
+++ b/inc/fields/ldapselectfield.class.php
@@ -272,8 +272,6 @@ public function isAnonymousFormCompatible() {
    }
 
    public function getHtmlIcon() {
-      global $CFG_GLPI;
-
-      return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-ldapselect-field.png" title="" />';
+      return '<i class="fa fa-sitemap" aria-hidden="true"></i>';
    }
 }
diff --git a/inc/fields/radiosfield.class.php b/inc/fields/radiosfield.class.php
index eae8a2e5c..792144747 100644
--- a/inc/fields/radiosfield.class.php
+++ b/inc/fields/radiosfield.class.php
@@ -244,8 +244,6 @@ public function isAnonymousFormCompatible() {
    }
 
    public function getHtmlIcon() {
-      global $CFG_GLPI;
-
-      return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-radios-field.png" title="" />';
+      return '<i class="fa fa-check-circle" aria-hidden="true"></i>';
    }
 }
diff --git a/inc/fields/urgencyfield.class.php b/inc/fields/urgencyfield.class.php
index 0d6e95c8f..b0def2218 100644
--- a/inc/fields/urgencyfield.class.php
+++ b/inc/fields/urgencyfield.class.php
@@ -200,8 +200,6 @@ public function isAnonymousFormCompatible() {
    }
 
    public function getHtmlIcon() {
-      global $CFG_GLPI;
-
-      return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-urgency-field.png" title="" />';
+      return '<i class="fa fa-exclamation" aria-hidden="true"></i>';
    }
 }
diff --git a/inc/question.class.php b/inc/question.class.php
index 663c47676..cc1397b54 100644
--- a/inc/question.class.php
+++ b/inc/question.class.php
@@ -192,7 +192,9 @@ public static function showForForm(CommonDBTM $item, $withtemplate = '') {
          $i = 0;
          foreach ($found_questions as $question) {
             $fieldType = 'PluginFormcreator' . ucfirst($question['fieldtype']) . 'Field';
-            $field = new $fieldType($question);
+            $questionInstance = new PluginFormcreatorQuestion();
+            $questionInstance->getFromDB($question['id']);
+            $field = new $fieldType($questionInstance);
             $i++;
             echo '<tr class="line' . ($i % 2) . '" id="question_row_' . $question['id'] . '">';
             echo '<td onclick="plugin_formcreator_editQuestion(' . $item->getId() . ', \'' . $token . '\', ' . $question['id'] . ', ' . $section['id'] . ')">';
diff --git a/pics/ui-actor-field.png b/pics/ui-actor-field.png
deleted file mode 100644
index 9ab454913..000000000
Binary files a/pics/ui-actor-field.png and /dev/null differ
diff --git a/pics/ui-checkbox-field.png b/pics/ui-checkbox-field.png
deleted file mode 100644
index 07f3522a9..000000000
Binary files a/pics/ui-checkbox-field.png and /dev/null differ
diff --git a/pics/ui-checkboxes-field.png b/pics/ui-checkboxes-field.png
deleted file mode 100644
index 05eed23df..000000000
Binary files a/pics/ui-checkboxes-field.png and /dev/null differ
diff --git a/pics/ui-date-field.png b/pics/ui-date-field.png
deleted file mode 100644
index 6b0b3d475..000000000
Binary files a/pics/ui-date-field.png and /dev/null differ
diff --git a/pics/ui-datetime-field.png b/pics/ui-datetime-field.png
deleted file mode 100644
index 6b0b3d475..000000000
Binary files a/pics/ui-datetime-field.png and /dev/null differ
diff --git a/pics/ui-dropdown-field.png b/pics/ui-dropdown-field.png
deleted file mode 100644
index 53d306e74..000000000
Binary files a/pics/ui-dropdown-field.png and /dev/null differ
diff --git a/pics/ui-email-field.png b/pics/ui-email-field.png
deleted file mode 100644
index 6fcbf9463..000000000
Binary files a/pics/ui-email-field.png and /dev/null differ
diff --git a/pics/ui-file-field.png b/pics/ui-file-field.png
deleted file mode 100644
index bdd0dc7c1..000000000
Binary files a/pics/ui-file-field.png and /dev/null differ
diff --git a/pics/ui-hidden-field.png b/pics/ui-hidden-field.png
deleted file mode 100644
index dc8b275b6..000000000
Binary files a/pics/ui-hidden-field.png and /dev/null differ
diff --git a/pics/ui-hostname-field.png b/pics/ui-hostname-field.png
deleted file mode 100644
index 6324c2add..000000000
Binary files a/pics/ui-hostname-field.png and /dev/null differ
diff --git a/pics/ui-ip-field.png b/pics/ui-ip-field.png
deleted file mode 100644
index 1706c174e..000000000
Binary files a/pics/ui-ip-field.png and /dev/null differ
diff --git a/pics/ui-ldapselect-field.png b/pics/ui-ldapselect-field.png
deleted file mode 100644
index 53d306e74..000000000
Binary files a/pics/ui-ldapselect-field.png and /dev/null differ
diff --git a/pics/ui-radios-field.png b/pics/ui-radios-field.png
deleted file mode 100644
index 1d27c7cc7..000000000
Binary files a/pics/ui-radios-field.png and /dev/null differ
diff --git a/pics/ui-urgency-field.png b/pics/ui-urgency-field.png
deleted file mode 100644
index 53d306e74..000000000
Binary files a/pics/ui-urgency-field.png and /dev/null differ
diff --git a/tests/fixture/PluginFormcreatorDependentField.php b/tests/fixture/PluginFormcreatorDependentField.php
index 2321b5d7b..a30c9127f 100644
--- a/tests/fixture/PluginFormcreatorDependentField.php
+++ b/tests/fixture/PluginFormcreatorDependentField.php
@@ -230,4 +230,8 @@ public function lessThan($value) {
    public function isAnonymousFormCompatible() {
       return true;
    }
+
+   public function getHtmlIcon() {
+      return '';
+   }
 }
\ No newline at end of file