From 61654e610e666d120f844ab4ed29f54b7679aeae Mon Sep 17 00:00:00 2001
From: Fabien Rassinier <frassinier@talend.com>
Date: Wed, 18 Sep 2019 14:33:19 +0200
Subject: [PATCH] fix(components): tooltips (#2413)

---
 .../Intercom.component.test.js.snap           |   39 +-
 .../ActionDropdown.snapshot.test.js.snap      |   21 +
 .../BadgeCategory.component.test.js.snap      |   14 +-
 .../BadgeDelete.component.test.js.snap        |   32 +-
 .../BadgeLabel.component.test.js.snap         |   12 +-
 .../Badge.component.test.js.snap              |   12 +-
 .../CollapsiblePanel.snapshot.test.js.snap    |  426 +-
 .../__snapshots__/ConfirmDialog.test.js.snap  |   17 +-
 .../ListDisplayMode.component.test.js.snap    |  134 +-
 .../TextFilter.component.test.js.snap         |  142 +-
 .../Header.snapshot.test.js.snap              |   42 +-
 .../headerInput.snapshot.test.js.snap         |   42 +-
 .../Items/__snapshots__/items.test.js.snap    |   69 +-
 .../__snapshots__/Progress.test.js.snap       |  106 +-
 .../__snapshots__/FiltersBar.test.js.snap     |   42 +-
 .../__snapshots__/TitleBar.test.js.snap       |   42 +-
 .../TooltipTrigger.component.js               |  122 +-
 .../src/TooltipTrigger/TooltipTrigger.hook.js |    5 +-
 .../__snapshots__/TooltipTrigger.test.js.snap |   65 +-
 .../Typeahead.snapshot.test.js.snap           |   32 +-
 packages/components/stories/TooltipTrigger.js |    7 +-
 .../ListView.component.test.js.snap           |   69 +-
 .../EnumerationWidget.test.js.snap            | 3735 ++++++++---------
 23 files changed, 2517 insertions(+), 2710 deletions(-)

diff --git a/packages/components/src/ActionIntercom/__snapshots__/Intercom.component.test.js.snap b/packages/components/src/ActionIntercom/__snapshots__/Intercom.component.test.js.snap
index f23d40d0f71..e2a3f3f14df 100644
--- a/packages/components/src/ActionIntercom/__snapshots__/Intercom.component.test.js.snap
+++ b/packages/components/src/ActionIntercom/__snapshots__/Intercom.component.test.js.snap
@@ -21,9 +21,11 @@ exports[`Intercom button should render a button 1`] = `
     label="Chat with Talend Support"
     tooltipPlacement="bottom"
   >
-    <div
+    <button
       aria-describedby={42}
-      className="theme-tc-tooltip"
+      className="btn btn-link tc-intercom theme-tc-intercom"
+      id="my-intercom"
+      key=".0"
       onBlur={[Function]}
       onClick={[Function]}
       onFocus={[Function]}
@@ -31,29 +33,22 @@ exports[`Intercom button should render a button 1`] = `
       onMouseOut={[Function]}
       onMouseOver={[Function]}
     >
-      <button
-        aria-describedby={42}
-        className="btn btn-link tc-intercom theme-tc-intercom"
-        id="my-intercom"
-        key=".0"
+      <Icon
+        name="talend-bubbles"
       >
-        <Icon
+        <svg
+          aria-hidden="true"
+          className="theme-tc-svg-icon tc-svg-icon"
+          focusable="false"
           name="talend-bubbles"
+          title={null}
         >
-          <svg
-            aria-hidden="true"
-            className="theme-tc-svg-icon tc-svg-icon"
-            focusable="false"
-            name="talend-bubbles"
-            title={null}
-          >
-            <use
-              xlinkHref="#talend-bubbles"
-            />
-          </svg>
-        </Icon>
-      </button>
-    </div>
+          <use
+            xlinkHref="#talend-bubbles"
+          />
+        </svg>
+      </Icon>
+    </button>
   </TooltipTrigger>
 </Intercom>
 `;
diff --git a/packages/components/src/Actions/ActionDropdown/__snapshots__/ActionDropdown.snapshot.test.js.snap b/packages/components/src/Actions/ActionDropdown/__snapshots__/ActionDropdown.snapshot.test.js.snap
index 7a3eef99444..d7c08c92b5e 100644
--- a/packages/components/src/Actions/ActionDropdown/__snapshots__/ActionDropdown.snapshot.test.js.snap
+++ b/packages/components/src/Actions/ActionDropdown/__snapshots__/ActionDropdown.snapshot.test.js.snap
@@ -837,6 +837,12 @@ exports[`ActionDropdown should render icon only with hideLabel props 1`] = `
   i18n={Object {}}
   id="dropdown-id"
   key=".0"
+  onBlur={[Function]}
+  onClick={[Function]}
+  onFocus={[Function]}
+  onKeyPress={[Function]}
+  onMouseOut={[Function]}
+  onMouseOver={[Function]}
   onSelect={[Function]}
   onToggle={[Function]}
   role="button"
@@ -886,8 +892,13 @@ exports[`ActionDropdown should render icon only with hideLabel props 1`] = `
             i18n={Object {}}
             id="dropdown-id"
             key=".0"
+            onBlur={[Function]}
             onClick={[Function]}
+            onFocus={[Function]}
             onKeyDown={[Function]}
+            onKeyPress={[Function]}
+            onMouseOut={[Function]}
+            onMouseOver={[Function]}
             open={false}
             role="button"
             useAnchor={false}
@@ -905,8 +916,13 @@ exports[`ActionDropdown should render icon only with hideLabel props 1`] = `
               disabled={false}
               i18n={Object {}}
               id="dropdown-id"
+              onBlur={[Function]}
               onClick={[Function]}
+              onFocus={[Function]}
               onKeyDown={[Function]}
+              onKeyPress={[Function]}
+              onMouseOut={[Function]}
+              onMouseOver={[Function]}
               role="button"
             >
               <button
@@ -918,8 +934,13 @@ exports[`ActionDropdown should render icon only with hideLabel props 1`] = `
                 disabled={false}
                 i18n={Object {}}
                 id="dropdown-id"
+                onBlur={[Function]}
                 onClick={[Function]}
+                onFocus={[Function]}
                 onKeyDown={[Function]}
+                onKeyPress={[Function]}
+                onMouseOut={[Function]}
+                onMouseOver={[Function]}
                 role="button"
                 type="button"
               >
diff --git a/packages/components/src/Badge/BadgeComposition/BadgeCategory/__snapshots__/BadgeCategory.component.test.js.snap b/packages/components/src/Badge/BadgeComposition/BadgeCategory/__snapshots__/BadgeCategory.component.test.js.snap
index e380e1ad6f8..7e9dc1ed500 100644
--- a/packages/components/src/Badge/BadgeComposition/BadgeCategory/__snapshots__/BadgeCategory.component.test.js.snap
+++ b/packages/components/src/Badge/BadgeComposition/BadgeCategory/__snapshots__/BadgeCategory.component.test.js.snap
@@ -1,14 +1,10 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`BadgeCategory should render with the label 1`] = `
-<div class="theme-tc-tooltip"
-     aria-describedby="42"
+<span aria-label="my badge label"
+      class="tc-badge-category theme-tc-badge-category"
+      aria-describedby="42"
 >
-  <span aria-label="my badge label"
-        class="tc-badge-category theme-tc-badge-category"
-        aria-describedby="42"
-  >
-    my badge label
-  </span>
-</div>
+  my badge label
+</span>
 `;
diff --git a/packages/components/src/Badge/BadgeComposition/BadgeDelete/__snapshots__/BadgeDelete.component.test.js.snap b/packages/components/src/Badge/BadgeComposition/BadgeDelete/__snapshots__/BadgeDelete.component.test.js.snap
index aec277db566..049ef1e8220 100644
--- a/packages/components/src/Badge/BadgeComposition/BadgeDelete/__snapshots__/BadgeDelete.component.test.js.snap
+++ b/packages/components/src/Badge/BadgeComposition/BadgeDelete/__snapshots__/BadgeDelete.component.test.js.snap
@@ -1,24 +1,20 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`BadgeDelete should render 1`] = `
-<div class="theme-tc-tooltip"
-     aria-describedby="42"
+<button role="button"
+        aria-label="Delete"
+        id="tc-badge-delete-my-id"
+        aria-describedby="42"
+        type="button"
+        class="tc-badge-delete-icon theme-tc-badge-delete-icon btn-icon-only btn btn-link"
 >
-  <button role="button"
-          aria-label="Delete"
-          id="tc-badge-delete-my-id"
-          aria-describedby="42"
-          type="button"
-          class="tc-badge-delete-icon theme-tc-badge-delete-icon btn-icon-only btn btn-link"
+  <svg name="talend-cross"
+       class="theme-tc-svg-icon tc-svg-icon"
+       focusable="false"
+       aria-hidden="true"
   >
-    <svg name="talend-cross"
-         class="theme-tc-svg-icon tc-svg-icon"
-         focusable="false"
-         aria-hidden="true"
-    >
-      <use xlink:href="#talend-cross">
-      </use>
-    </svg>
-  </button>
-</div>
+    <use xlink:href="#talend-cross">
+    </use>
+  </svg>
+</button>
 `;
diff --git a/packages/components/src/Badge/BadgeComposition/BadgeLabel/__snapshots__/BadgeLabel.component.test.js.snap b/packages/components/src/Badge/BadgeComposition/BadgeLabel/__snapshots__/BadgeLabel.component.test.js.snap
index 14fd39920e4..b64c3908d31 100644
--- a/packages/components/src/Badge/BadgeComposition/BadgeLabel/__snapshots__/BadgeLabel.component.test.js.snap
+++ b/packages/components/src/Badge/BadgeComposition/BadgeLabel/__snapshots__/BadgeLabel.component.test.js.snap
@@ -2,14 +2,10 @@
 
 exports[`BadgeLabel should default render 1`] = `
 <div class="tc-badge-label theme-tc-badge-label">
-  <div class="theme-tc-tooltip"
-       aria-describedby="42"
+  <span class="tc-badge-label-text theme-tc-badge-label-text"
+        aria-describedby="42"
   >
-    <span class="tc-badge-label-text theme-tc-badge-label-text"
-          aria-describedby="42"
-    >
-      my label
-    </span>
-  </div>
+    my label
+  </span>
 </div>
 `;
diff --git a/packages/components/src/Badge/__snapshots__/Badge.component.test.js.snap b/packages/components/src/Badge/__snapshots__/Badge.component.test.js.snap
index 7804a6ff744..a686257dea9 100644
--- a/packages/components/src/Badge/__snapshots__/Badge.component.test.js.snap
+++ b/packages/components/src/Badge/__snapshots__/Badge.component.test.js.snap
@@ -4,15 +4,11 @@ exports[`Badge should render by default 1`] = `
 <div class="tc-badge theme-tc-badge tc-badge-display-large theme-tc-badge-display-large tc-badge-readonly theme-tc-badge-readonly">
   <div class="tc-badge-button theme-tc-badge-button">
     <div class="tc-badge-label theme-tc-badge-label">
-      <div class="theme-tc-tooltip"
-           aria-describedby="42"
+      <span class="tc-badge-label-text theme-tc-badge-label-text"
+            aria-describedby="42"
       >
-        <span class="tc-badge-label-text theme-tc-badge-label-text"
-              aria-describedby="42"
-        >
-          my label
-        </span>
-      </div>
+        my label
+      </span>
     </div>
   </div>
 </div>
diff --git a/packages/components/src/CollapsiblePanel/__snapshots__/CollapsiblePanel.snapshot.test.js.snap b/packages/components/src/CollapsiblePanel/__snapshots__/CollapsiblePanel.snapshot.test.js.snap
index dcc0b5efc7f..2fd5694cadc 100644
--- a/packages/components/src/CollapsiblePanel/__snapshots__/CollapsiblePanel.snapshot.test.js.snap
+++ b/packages/components/src/CollapsiblePanel/__snapshots__/CollapsiblePanel.snapshot.test.js.snap
@@ -91,41 +91,35 @@ exports[`CollapsiblePanel should render default with expanded key/value content
             <div
               className="theme-undefined theme-col-4"
             >
-              <div
+              <button
                 aria-describedby={42}
-                className="theme-tc-tooltip"
+                aria-label="edit"
+                className="theme-undefined btn-icon-only btn btn-link"
+                disabled={false}
                 onBlur={[Function]}
                 onClick={[Function]}
                 onFocus={[Function]}
                 onKeyPress={[Function]}
+                onMouseDown={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
+                role="link"
+                type="button"
               >
-                <button
-                  aria-describedby={42}
-                  aria-label="edit"
-                  className="theme-undefined btn-icon-only btn btn-link"
-                  disabled={false}
-                  onClick={[Function]}
-                  onMouseDown={[Function]}
-                  role="link"
-                  type="button"
-                >
-                  <i
-                    aria-hidden="true"
-                    className="fa fa-edit"
-                    focusable="false"
-                    title={null}
-                  />
-                </button>
-              </div>
+                <i
+                  aria-hidden="true"
+                  className="fa fa-edit"
+                  focusable="false"
+                  title={null}
+                />
+              </button>
             </div>
             <div
               className="theme-undefined theme-col-4"
             >
               <div
                 aria-describedby={42}
-                className="theme-tc-tooltip"
+                className="theme-undefined"
                 onBlur={[Function]}
                 onClick={[Function]}
                 onFocus={[Function]}
@@ -133,12 +127,7 @@ exports[`CollapsiblePanel should render default with expanded key/value content
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
               >
-                <div
-                  aria-describedby={42}
-                  className="theme-undefined"
-                >
-                  by Charles
-                </div>
+                by Charles
               </div>
             </div>
             <div
@@ -146,7 +135,7 @@ exports[`CollapsiblePanel should render default with expanded key/value content
             >
               <div
                 aria-describedby={42}
-                className="theme-tc-tooltip"
+                className="theme-undefined"
                 onBlur={[Function]}
                 onClick={[Function]}
                 onFocus={[Function]}
@@ -154,16 +143,11 @@ exports[`CollapsiblePanel should render default with expanded key/value content
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
               >
-                <div
-                  aria-describedby={42}
-                  className="theme-undefined"
-                >
-                  on TDP
-                </div>
+                on TDP
               </div>
-              <div
+              <span
                 aria-describedby={42}
-                className="theme-tc-tooltip"
+                className="theme-undefined label label-default"
                 onBlur={[Function]}
                 onClick={[Function]}
                 onFocus={[Function]}
@@ -171,49 +155,38 @@ exports[`CollapsiblePanel should render default with expanded key/value content
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
               >
-                <span
-                  aria-describedby={42}
-                  className="theme-undefined label label-default"
-                >
-                  XML
-                </span>
-              </div>
+                XML
+              </span>
             </div>
           </div>
         </button>
-        <div
+        <button
           aria-describedby={42}
-          className="theme-tc-tooltip"
+          aria-expanded={true}
+          aria-label="Collapse panel"
+          aria-pressed={true}
+          className="theme-toggle toggle tc-icon-toggle theme-tc-icon-toggle theme-active active btn btn-link"
+          disabled={false}
           onBlur={[Function]}
           onClick={[Function]}
           onFocus={[Function]}
           onKeyPress={[Function]}
           onMouseOut={[Function]}
           onMouseOver={[Function]}
+          type="button"
         >
-          <button
-            aria-describedby={42}
-            aria-expanded={true}
-            aria-label="Collapse panel"
-            aria-pressed={true}
-            className="theme-toggle toggle tc-icon-toggle theme-tc-icon-toggle theme-active active btn btn-link"
-            disabled={false}
-            onClick={[MockFunction]}
-            type="button"
+          <svg
+            aria-hidden="true"
+            className="theme-tc-svg-icon tc-svg-icon theme-flip-vertical"
+            focusable="false"
+            name="talend-caret-down"
+            title={null}
           >
-            <svg
-              aria-hidden="true"
-              className="theme-tc-svg-icon tc-svg-icon theme-flip-vertical"
-              focusable="false"
-              name="talend-caret-down"
-              title={null}
-            >
-              <use
-                xlinkHref="#talend-caret-down"
-              />
-            </svg>
-          </button>
-        </div>
+            <use
+              xlinkHref="#talend-caret-down"
+            />
+          </svg>
+        </button>
       </div>
     </div>
   </div>
@@ -338,41 +311,35 @@ exports[`CollapsiblePanel should render default with key/value content 1`] = `
             <div
               className="theme-undefined theme-col-4"
             >
-              <div
+              <button
                 aria-describedby={42}
-                className="theme-tc-tooltip"
+                aria-label="edit"
+                className="theme-undefined btn-icon-only btn btn-link"
+                disabled={false}
                 onBlur={[Function]}
                 onClick={[Function]}
                 onFocus={[Function]}
                 onKeyPress={[Function]}
+                onMouseDown={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
+                role="link"
+                type="button"
               >
-                <button
-                  aria-describedby={42}
-                  aria-label="edit"
-                  className="theme-undefined btn-icon-only btn btn-link"
-                  disabled={false}
-                  onClick={[Function]}
-                  onMouseDown={[Function]}
-                  role="link"
-                  type="button"
-                >
-                  <i
-                    aria-hidden="true"
-                    className="fa fa-edit"
-                    focusable="false"
-                    title={null}
-                  />
-                </button>
-              </div>
+                <i
+                  aria-hidden="true"
+                  className="fa fa-edit"
+                  focusable="false"
+                  title={null}
+                />
+              </button>
             </div>
             <div
               className="theme-undefined theme-col-4"
             >
               <div
                 aria-describedby={42}
-                className="theme-tc-tooltip"
+                className="theme-undefined"
                 onBlur={[Function]}
                 onClick={[Function]}
                 onFocus={[Function]}
@@ -380,12 +347,7 @@ exports[`CollapsiblePanel should render default with key/value content 1`] = `
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
               >
-                <div
-                  aria-describedby={42}
-                  className="theme-undefined"
-                >
-                  by Charles
-                </div>
+                by Charles
               </div>
             </div>
             <div
@@ -393,7 +355,7 @@ exports[`CollapsiblePanel should render default with key/value content 1`] = `
             >
               <div
                 aria-describedby={42}
-                className="theme-tc-tooltip"
+                className="theme-undefined"
                 onBlur={[Function]}
                 onClick={[Function]}
                 onFocus={[Function]}
@@ -401,16 +363,11 @@ exports[`CollapsiblePanel should render default with key/value content 1`] = `
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
               >
-                <div
-                  aria-describedby={42}
-                  className="theme-undefined"
-                >
-                  on TDP
-                </div>
+                on TDP
               </div>
-              <div
+              <span
                 aria-describedby={42}
-                className="theme-tc-tooltip"
+                className="theme-undefined label label-default"
                 onBlur={[Function]}
                 onClick={[Function]}
                 onFocus={[Function]}
@@ -418,48 +375,37 @@ exports[`CollapsiblePanel should render default with key/value content 1`] = `
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
               >
-                <span
-                  aria-describedby={42}
-                  className="theme-undefined label label-default"
-                >
-                  XML
-                </span>
-              </div>
+                XML
+              </span>
             </div>
           </div>
         </button>
-        <div
+        <button
           aria-describedby={42}
-          className="theme-tc-tooltip"
+          aria-label="Expand panel"
+          aria-pressed={false}
+          className="theme-toggle toggle tc-icon-toggle theme-tc-icon-toggle btn btn-link"
+          disabled={false}
           onBlur={[Function]}
           onClick={[Function]}
           onFocus={[Function]}
           onKeyPress={[Function]}
           onMouseOut={[Function]}
           onMouseOver={[Function]}
+          type="button"
         >
-          <button
-            aria-describedby={42}
-            aria-label="Expand panel"
-            aria-pressed={false}
-            className="theme-toggle toggle tc-icon-toggle theme-tc-icon-toggle btn btn-link"
-            disabled={false}
-            onClick={[MockFunction]}
-            type="button"
+          <svg
+            aria-hidden="true"
+            className="theme-tc-svg-icon tc-svg-icon"
+            focusable="false"
+            name="talend-caret-down"
+            title={null}
           >
-            <svg
-              aria-hidden="true"
-              className="theme-tc-svg-icon tc-svg-icon"
-              focusable="false"
-              name="talend-caret-down"
-              title={null}
-            >
-              <use
-                xlinkHref="#talend-caret-down"
-              />
-            </svg>
-          </button>
-        </div>
+            <use
+              xlinkHref="#talend-caret-down"
+            />
+          </svg>
+        </button>
       </div>
     </div>
   </div>
@@ -584,41 +530,35 @@ exports[`CollapsiblePanel should render default without content 1`] = `
             <div
               className="theme-undefined theme-col-4"
             >
-              <div
+              <button
                 aria-describedby={42}
-                className="theme-tc-tooltip"
+                aria-label="edit"
+                className="theme-undefined btn-icon-only btn btn-link"
+                disabled={false}
                 onBlur={[Function]}
                 onClick={[Function]}
                 onFocus={[Function]}
                 onKeyPress={[Function]}
+                onMouseDown={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
+                role="link"
+                type="button"
               >
-                <button
-                  aria-describedby={42}
-                  aria-label="edit"
-                  className="theme-undefined btn-icon-only btn btn-link"
-                  disabled={false}
-                  onClick={[Function]}
-                  onMouseDown={[Function]}
-                  role="link"
-                  type="button"
-                >
-                  <i
-                    aria-hidden="true"
-                    className="fa fa-edit"
-                    focusable="false"
-                    title={null}
-                  />
-                </button>
-              </div>
+                <i
+                  aria-hidden="true"
+                  className="fa fa-edit"
+                  focusable="false"
+                  title={null}
+                />
+              </button>
             </div>
             <div
               className="theme-undefined theme-col-4"
             >
               <div
                 aria-describedby={42}
-                className="theme-tc-tooltip"
+                className="theme-undefined"
                 onBlur={[Function]}
                 onClick={[Function]}
                 onFocus={[Function]}
@@ -626,12 +566,7 @@ exports[`CollapsiblePanel should render default without content 1`] = `
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
               >
-                <div
-                  aria-describedby={42}
-                  className="theme-undefined"
-                >
-                  by Charles
-                </div>
+                by Charles
               </div>
             </div>
             <div
@@ -639,7 +574,7 @@ exports[`CollapsiblePanel should render default without content 1`] = `
             >
               <div
                 aria-describedby={42}
-                className="theme-tc-tooltip"
+                className="theme-undefined"
                 onBlur={[Function]}
                 onClick={[Function]}
                 onFocus={[Function]}
@@ -647,16 +582,11 @@ exports[`CollapsiblePanel should render default without content 1`] = `
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
               >
-                <div
-                  aria-describedby={42}
-                  className="theme-undefined"
-                >
-                  on TDP
-                </div>
+                on TDP
               </div>
-              <div
+              <span
                 aria-describedby={42}
-                className="theme-tc-tooltip"
+                className="theme-undefined label label-default"
                 onBlur={[Function]}
                 onClick={[Function]}
                 onFocus={[Function]}
@@ -664,13 +594,8 @@ exports[`CollapsiblePanel should render default without content 1`] = `
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
               >
-                <span
-                  aria-describedby={42}
-                  className="theme-undefined label label-default"
-                >
-                  XML
-                </span>
-              </div>
+                XML
+              </span>
             </div>
           </div>
         </button>
@@ -715,7 +640,7 @@ exports[`CollapsiblePanel should render panel with custom element 1`] = `
             >
               <div
                 aria-describedby={42}
-                className="theme-tc-tooltip"
+                className="theme-undefined"
                 onBlur={[Function]}
                 onClick={[Function]}
                 onFocus={[Function]}
@@ -723,12 +648,7 @@ exports[`CollapsiblePanel should render panel with custom element 1`] = `
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
               >
-                <div
-                  aria-describedby={42}
-                  className="theme-undefined"
-                >
-                  Version 1 Version 1
-                </div>
+                Version 1 Version 1
               </div>
             </div>
             <div
@@ -736,7 +656,7 @@ exports[`CollapsiblePanel should render panel with custom element 1`] = `
             >
               <div
                 aria-describedby={42}
-                className="theme-tc-tooltip"
+                className="theme-undefined"
                 onBlur={[Function]}
                 onClick={[Function]}
                 onFocus={[Function]}
@@ -744,14 +664,9 @@ exports[`CollapsiblePanel should render panel with custom element 1`] = `
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
               >
-                <div
-                  aria-describedby={42}
-                  className="theme-undefined"
-                >
-                  <span>
-                    Custom element
-                  </span>
-                </div>
+                <span>
+                  Custom element
+                </span>
               </div>
             </div>
             <div
@@ -759,7 +674,7 @@ exports[`CollapsiblePanel should render panel with custom element 1`] = `
             >
               <div
                 aria-describedby={42}
-                className="theme-tc-tooltip"
+                className="theme-undefined"
                 onBlur={[Function]}
                 onClick={[Function]}
                 onFocus={[Function]}
@@ -767,12 +682,7 @@ exports[`CollapsiblePanel should render panel with custom element 1`] = `
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
               >
-                <div
-                  aria-describedby={42}
-                  className="theme-undefined"
-                >
-                  03/02/2017 14:44:55
-                </div>
+                03/02/2017 14:44:55
               </div>
             </div>
           </div>
@@ -818,7 +728,7 @@ exports[`CollapsiblePanel should render themed with textual content 1`] = `
             >
               <div
                 aria-describedby={42}
-                className="theme-tc-tooltip"
+                className="theme-undefined"
                 onBlur={[Function]}
                 onClick={[Function]}
                 onFocus={[Function]}
@@ -826,16 +736,11 @@ exports[`CollapsiblePanel should render themed with textual content 1`] = `
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
               >
-                <div
-                  aria-describedby={42}
-                  className="theme-undefined"
-                >
-                  Version 1 Version 1
-                </div>
+                Version 1 Version 1
               </div>
               <div
                 aria-describedby={42}
-                className="theme-tc-tooltip"
+                className="theme-undefined"
                 onBlur={[Function]}
                 onClick={[Function]}
                 onFocus={[Function]}
@@ -843,12 +748,7 @@ exports[`CollapsiblePanel should render themed with textual content 1`] = `
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
               >
-                <div
-                  aria-describedby={42}
-                  className="theme-undefined"
-                >
-                  (Read Only)
-                </div>
+                (Read Only)
               </div>
             </div>
             <div
@@ -856,7 +756,7 @@ exports[`CollapsiblePanel should render themed with textual content 1`] = `
             >
               <div
                 aria-describedby={42}
-                className="theme-tc-tooltip"
+                className="theme-undefined"
                 onBlur={[Function]}
                 onClick={[Function]}
                 onFocus={[Function]}
@@ -864,48 +764,37 @@ exports[`CollapsiblePanel should render themed with textual content 1`] = `
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
               >
-                <div
-                  aria-describedby={42}
-                  className="theme-undefined"
-                >
-                  03/02/2017 14:44:55
-                </div>
+                03/02/2017 14:44:55
               </div>
             </div>
           </div>
         </button>
-        <div
+        <button
           aria-describedby={42}
-          className="theme-tc-tooltip"
+          aria-label="Expand panel"
+          aria-pressed={false}
+          className="theme-toggle toggle tc-icon-toggle theme-tc-icon-toggle btn btn-link"
+          disabled={false}
           onBlur={[Function]}
           onClick={[Function]}
           onFocus={[Function]}
           onKeyPress={[Function]}
           onMouseOut={[Function]}
           onMouseOver={[Function]}
+          type="button"
         >
-          <button
-            aria-describedby={42}
-            aria-label="Expand panel"
-            aria-pressed={false}
-            className="theme-toggle toggle tc-icon-toggle theme-tc-icon-toggle btn btn-link"
-            disabled={false}
-            onClick={[MockFunction]}
-            type="button"
+          <svg
+            aria-hidden="true"
+            className="theme-tc-svg-icon tc-svg-icon"
+            focusable="false"
+            name="talend-caret-down"
+            title={null}
           >
-            <svg
-              aria-hidden="true"
-              className="theme-tc-svg-icon tc-svg-icon"
-              focusable="false"
-              name="talend-caret-down"
-              title={null}
-            >
-              <use
-                xlinkHref="#talend-caret-down"
-              />
-            </svg>
-          </button>
-        </div>
+            <use
+              xlinkHref="#talend-caret-down"
+            />
+          </svg>
+        </button>
       </div>
     </div>
   </div>
@@ -922,9 +811,8 @@ exports[`CollapsiblePanel should render themed with textual content 1`] = `
         <div
           className="theme-head"
         >
-          <div
+          <span
             aria-describedby={42}
-            className="theme-tc-tooltip"
             onBlur={[Function]}
             onClick={[Function]}
             onFocus={[Function]}
@@ -932,15 +820,11 @@ exports[`CollapsiblePanel should render themed with textual content 1`] = `
             onMouseOut={[Function]}
             onMouseOver={[Function]}
           >
-            <span
-              aria-describedby={42}
-            >
-              21 step
-            </span>
-          </div>
-          <div
+            21 step
+          </span>
+          <span
             aria-describedby={42}
-            className="theme-tc-tooltip"
+            className="text-right"
             onBlur={[Function]}
             onClick={[Function]}
             onFocus={[Function]}
@@ -948,13 +832,8 @@ exports[`CollapsiblePanel should render themed with textual content 1`] = `
             onMouseOut={[Function]}
             onMouseOver={[Function]}
           >
-            <span
-              aria-describedby={42}
-              className="text-right"
-            >
-              by Abdelaziz Maalej test 1 test 2 test 1 test 2
-            </span>
-          </div>
+            by Abdelaziz Maalej test 1 test 2 test 1 test 2
+          </span>
         </div>
         <div
           className="theme-content-description content-description"
@@ -1002,7 +881,7 @@ exports[`CollapsiblePanel should render themed without textual content 1`] = `
             >
               <div
                 aria-describedby={42}
-                className="theme-tc-tooltip"
+                className="theme-undefined"
                 onBlur={[Function]}
                 onClick={[Function]}
                 onFocus={[Function]}
@@ -1010,16 +889,11 @@ exports[`CollapsiblePanel should render themed without textual content 1`] = `
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
               >
-                <div
-                  aria-describedby={42}
-                  className="theme-undefined"
-                >
-                  Version 1 Version 1
-                </div>
+                Version 1 Version 1
               </div>
               <div
                 aria-describedby={42}
-                className="theme-tc-tooltip"
+                className="theme-undefined"
                 onBlur={[Function]}
                 onClick={[Function]}
                 onFocus={[Function]}
@@ -1027,12 +901,7 @@ exports[`CollapsiblePanel should render themed without textual content 1`] = `
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
               >
-                <div
-                  aria-describedby={42}
-                  className="theme-undefined"
-                >
-                  (Read Only)
-                </div>
+                (Read Only)
               </div>
             </div>
             <div
@@ -1040,7 +909,7 @@ exports[`CollapsiblePanel should render themed without textual content 1`] = `
             >
               <div
                 aria-describedby={42}
-                className="theme-tc-tooltip"
+                className="theme-undefined"
                 onBlur={[Function]}
                 onClick={[Function]}
                 onFocus={[Function]}
@@ -1048,12 +917,7 @@ exports[`CollapsiblePanel should render themed without textual content 1`] = `
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
               >
-                <div
-                  aria-describedby={42}
-                  className="theme-undefined"
-                >
-                  03/02/2017 14:44:55
-                </div>
+                03/02/2017 14:44:55
               </div>
             </div>
           </div>
diff --git a/packages/components/src/ConfirmDialog/__snapshots__/ConfirmDialog.test.js.snap b/packages/components/src/ConfirmDialog/__snapshots__/ConfirmDialog.test.js.snap
index b7b6918442e..b71ecfebe0e 100644
--- a/packages/components/src/ConfirmDialog/__snapshots__/ConfirmDialog.test.js.snap
+++ b/packages/components/src/ConfirmDialog/__snapshots__/ConfirmDialog.test.js.snap
@@ -116,24 +116,19 @@ exports[`ConfirmDialog should render with a progress bar 1`] = `
   >
     <div
       aria-describedby={42}
-      className="theme-tc-tooltip"
+      className="theme-progress-percent"
       onBlur={[Function]}
       onClick={[Function]}
       onFocus={[Function]}
       onKeyPress={[Function]}
       onMouseOut={[Function]}
       onMouseOver={[Function]}
-    >
-      <div
-        aria-describedby={42}
-        className="theme-progress-percent"
-        style={
-          Object {
-            "width": "25%",
-          }
+      style={
+        Object {
+          "width": "25%",
         }
-      />
-    </div>
+      }
+    />
   </div>
   <div
     className="Body mocked-component"
diff --git a/packages/components/src/List/ListComposition/DisplayMode/__snapshots__/ListDisplayMode.component.test.js.snap b/packages/components/src/List/ListComposition/DisplayMode/__snapshots__/ListDisplayMode.component.test.js.snap
index 3949c1466fd..a6b2fdab5c0 100644
--- a/packages/components/src/List/ListComposition/DisplayMode/__snapshots__/ListDisplayMode.component.test.js.snap
+++ b/packages/components/src/List/ListComposition/DisplayMode/__snapshots__/ListDisplayMode.component.test.js.snap
@@ -35,9 +35,18 @@ exports[`List DisplayMode should render 1`] = `
           label="Set Table as current display mode."
           tooltipPlacement="top"
         >
-          <div
+          <Button
+            active={false}
             aria-describedby={42}
-            className="theme-tc-tooltip"
+            aria-label="Set Table as current display mode."
+            aria-pressed={true}
+            block={false}
+            bsClass="btn"
+            bsStyle="link"
+            className="tc-icon-toggle theme-tc-icon-toggle theme-active active"
+            disabled={true}
+            id="myDisplayMode-table"
+            key=".0"
             onBlur={[Function]}
             onClick={[Function]}
             onFocus={[Function]}
@@ -45,48 +54,38 @@ exports[`List DisplayMode should render 1`] = `
             onMouseOut={[Function]}
             onMouseOver={[Function]}
           >
-            <Button
-              active={false}
+            <button
               aria-describedby={42}
               aria-label="Set Table as current display mode."
               aria-pressed={true}
-              block={false}
-              bsClass="btn"
-              bsStyle="link"
-              className="tc-icon-toggle theme-tc-icon-toggle theme-active active"
+              className="tc-icon-toggle theme-tc-icon-toggle theme-active active btn btn-link"
               disabled={true}
               id="myDisplayMode-table"
-              key=".0"
+              onBlur={[Function]}
               onClick={[Function]}
+              onFocus={[Function]}
+              onKeyPress={[Function]}
+              onMouseOut={[Function]}
+              onMouseOver={[Function]}
+              type="button"
             >
-              <button
-                aria-describedby={42}
-                aria-label="Set Table as current display mode."
-                aria-pressed={true}
-                className="tc-icon-toggle theme-tc-icon-toggle theme-active active btn btn-link"
-                disabled={true}
-                id="myDisplayMode-table"
-                onClick={[Function]}
-                type="button"
+              <Icon
+                name="talend-table"
               >
-                <Icon
+                <svg
+                  aria-hidden="true"
+                  className="theme-tc-svg-icon tc-svg-icon"
+                  focusable="false"
                   name="talend-table"
+                  title={null}
                 >
-                  <svg
-                    aria-hidden="true"
-                    className="theme-tc-svg-icon tc-svg-icon"
-                    focusable="false"
-                    name="talend-table"
-                    title={null}
-                  >
-                    <use
-                      xlinkHref="#talend-table"
-                    />
-                  </svg>
-                </Icon>
-              </button>
-            </Button>
-          </div>
+                  <use
+                    xlinkHref="#talend-table"
+                  />
+                </svg>
+              </Icon>
+            </button>
+          </Button>
         </TooltipTrigger>
       </ActionIconToggle>
     </Component>
@@ -112,9 +111,18 @@ exports[`List DisplayMode should render 1`] = `
           label="Set Expanded as current display mode."
           tooltipPlacement="top"
         >
-          <div
+          <Button
+            active={false}
             aria-describedby={42}
-            className="theme-tc-tooltip"
+            aria-label="Set Expanded as current display mode."
+            aria-pressed={false}
+            block={false}
+            bsClass="btn"
+            bsStyle="link"
+            className="tc-icon-toggle theme-tc-icon-toggle"
+            disabled={false}
+            id="myDisplayMode-large"
+            key=".0"
             onBlur={[Function]}
             onClick={[Function]}
             onFocus={[Function]}
@@ -122,48 +130,38 @@ exports[`List DisplayMode should render 1`] = `
             onMouseOut={[Function]}
             onMouseOver={[Function]}
           >
-            <Button
-              active={false}
+            <button
               aria-describedby={42}
               aria-label="Set Expanded as current display mode."
               aria-pressed={false}
-              block={false}
-              bsClass="btn"
-              bsStyle="link"
-              className="tc-icon-toggle theme-tc-icon-toggle"
+              className="tc-icon-toggle theme-tc-icon-toggle btn btn-link"
               disabled={false}
               id="myDisplayMode-large"
-              key=".0"
+              onBlur={[Function]}
               onClick={[Function]}
+              onFocus={[Function]}
+              onKeyPress={[Function]}
+              onMouseOut={[Function]}
+              onMouseOver={[Function]}
+              type="button"
             >
-              <button
-                aria-describedby={42}
-                aria-label="Set Expanded as current display mode."
-                aria-pressed={false}
-                className="tc-icon-toggle theme-tc-icon-toggle btn btn-link"
-                disabled={false}
-                id="myDisplayMode-large"
-                onClick={[Function]}
-                type="button"
+              <Icon
+                name="talend-expanded"
               >
-                <Icon
+                <svg
+                  aria-hidden="true"
+                  className="theme-tc-svg-icon tc-svg-icon"
+                  focusable="false"
                   name="talend-expanded"
+                  title={null}
                 >
-                  <svg
-                    aria-hidden="true"
-                    className="theme-tc-svg-icon tc-svg-icon"
-                    focusable="false"
-                    name="talend-expanded"
-                    title={null}
-                  >
-                    <use
-                      xlinkHref="#talend-expanded"
-                    />
-                  </svg>
-                </Icon>
-              </button>
-            </Button>
-          </div>
+                  <use
+                    xlinkHref="#talend-expanded"
+                  />
+                </svg>
+              </Icon>
+            </button>
+          </Button>
         </TooltipTrigger>
       </ActionIconToggle>
     </Component>
diff --git a/packages/components/src/List/ListComposition/TextFilter/__snapshots__/TextFilter.component.test.js.snap b/packages/components/src/List/ListComposition/TextFilter/__snapshots__/TextFilter.component.test.js.snap
index cb5ef830180..152e5d3167b 100644
--- a/packages/components/src/List/ListComposition/TextFilter/__snapshots__/TextFilter.component.test.js.snap
+++ b/packages/components/src/List/ListComposition/TextFilter/__snapshots__/TextFilter.component.test.js.snap
@@ -72,61 +72,60 @@ exports[`TextFilter should render text filter component 1`] = `
               label="Toggle filter"
               tooltipPlacement="top"
             >
-              <div
+              <Button
+                active={false}
                 aria-describedby={42}
-                className="theme-tc-tooltip"
+                aria-label="Toggle filter"
+                block={false}
+                bsClass="btn"
+                bsStyle="link"
+                className="btn-icon-only"
+                disabled={false}
+                id="myTextFilter"
+                key=".0"
                 onBlur={[Function]}
                 onClick={[Function]}
                 onFocus={[Function]}
                 onKeyPress={[Function]}
+                onMouseDown={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
+                role="search"
               >
-                <Button
-                  active={false}
+                <button
                   aria-describedby={42}
                   aria-label="Toggle filter"
-                  block={false}
-                  bsClass="btn"
-                  bsStyle="link"
-                  className="btn-icon-only"
+                  className="btn-icon-only btn btn-link"
                   disabled={false}
                   id="myTextFilter"
-                  key=".0"
+                  onBlur={[Function]}
                   onClick={[Function]}
+                  onFocus={[Function]}
+                  onKeyPress={[Function]}
                   onMouseDown={[Function]}
+                  onMouseOut={[Function]}
+                  onMouseOver={[Function]}
                   role="search"
+                  type="button"
                 >
-                  <button
-                    aria-describedby={42}
-                    aria-label="Toggle filter"
-                    className="btn-icon-only btn btn-link"
-                    disabled={false}
-                    id="myTextFilter"
-                    onClick={[Function]}
-                    onMouseDown={[Function]}
-                    role="search"
-                    type="button"
+                  <Icon
+                    key="icon"
+                    name="talend-search"
                   >
-                    <Icon
-                      key="icon"
+                    <svg
+                      aria-hidden="true"
+                      className="theme-tc-svg-icon tc-svg-icon"
+                      focusable="false"
                       name="talend-search"
+                      title={null}
                     >
-                      <svg
-                        aria-hidden="true"
-                        className="theme-tc-svg-icon tc-svg-icon"
-                        focusable="false"
-                        name="talend-search"
-                        title={null}
-                      >
-                        <use
-                          xlinkHref="#talend-search"
-                        />
-                      </svg>
-                    </Icon>
-                  </button>
-                </Button>
-              </div>
+                      <use
+                        xlinkHref="#talend-search"
+                      />
+                    </svg>
+                  </Icon>
+                </button>
+              </Button>
             </TooltipTrigger>
           </ActionButton>
         </withI18nextTranslation(ActionButton)>
@@ -209,61 +208,60 @@ exports[`TextFilter should render text filter component with defined docked stat
               label="Toggle filter"
               tooltipPlacement="top"
             >
-              <div
+              <Button
+                active={false}
                 aria-describedby={42}
-                className="theme-tc-tooltip"
+                aria-label="Toggle filter"
+                block={false}
+                bsClass="btn"
+                bsStyle="link"
+                className="btn-icon-only"
+                disabled={false}
+                id="myTextFilter"
+                key=".0"
                 onBlur={[Function]}
                 onClick={[Function]}
                 onFocus={[Function]}
                 onKeyPress={[Function]}
+                onMouseDown={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
+                role="search"
               >
-                <Button
-                  active={false}
+                <button
                   aria-describedby={42}
                   aria-label="Toggle filter"
-                  block={false}
-                  bsClass="btn"
-                  bsStyle="link"
-                  className="btn-icon-only"
+                  className="btn-icon-only btn btn-link"
                   disabled={false}
                   id="myTextFilter"
-                  key=".0"
+                  onBlur={[Function]}
                   onClick={[Function]}
+                  onFocus={[Function]}
+                  onKeyPress={[Function]}
                   onMouseDown={[Function]}
+                  onMouseOut={[Function]}
+                  onMouseOver={[Function]}
                   role="search"
+                  type="button"
                 >
-                  <button
-                    aria-describedby={42}
-                    aria-label="Toggle filter"
-                    className="btn-icon-only btn btn-link"
-                    disabled={false}
-                    id="myTextFilter"
-                    onClick={[Function]}
-                    onMouseDown={[Function]}
-                    role="search"
-                    type="button"
+                  <Icon
+                    key="icon"
+                    name="talend-search"
                   >
-                    <Icon
-                      key="icon"
+                    <svg
+                      aria-hidden="true"
+                      className="theme-tc-svg-icon tc-svg-icon"
+                      focusable="false"
                       name="talend-search"
+                      title={null}
                     >
-                      <svg
-                        aria-hidden="true"
-                        className="theme-tc-svg-icon tc-svg-icon"
-                        focusable="false"
-                        name="talend-search"
-                        title={null}
-                      >
-                        <use
-                          xlinkHref="#talend-search"
-                        />
-                      </svg>
-                    </Icon>
-                  </button>
-                </Button>
-              </div>
+                      <use
+                        xlinkHref="#talend-search"
+                      />
+                    </svg>
+                  </Icon>
+                </button>
+              </Button>
             </TooltipTrigger>
           </ActionButton>
         </withI18nextTranslation(ActionButton)>
diff --git a/packages/components/src/ListView/Header/__snapshots__/Header.snapshot.test.js.snap b/packages/components/src/ListView/Header/__snapshots__/Header.snapshot.test.js.snap
index 0f6df096a7b..ff78c3230f5 100644
--- a/packages/components/src/ListView/Header/__snapshots__/Header.snapshot.test.js.snap
+++ b/packages/components/src/ListView/Header/__snapshots__/Header.snapshot.test.js.snap
@@ -10,39 +10,33 @@ exports[`Header should render header with one button 1`] = `
   <div
     className="actions"
   >
-    <div
+    <button
       aria-describedby={42}
-      className="theme-tc-tooltip"
+      aria-label="Search for specific values"
+      className="btn-icon-only btn btn-link"
+      disabled={false}
       onBlur={[Function]}
       onClick={[Function]}
       onFocus={[Function]}
       onKeyPress={[Function]}
+      onMouseDown={[Function]}
       onMouseOut={[Function]}
       onMouseOver={[Function]}
+      role="link"
+      type="button"
     >
-      <button
-        aria-describedby={42}
-        aria-label="Search for specific values"
-        className="btn-icon-only btn btn-link"
-        disabled={false}
-        onClick={[Function]}
-        onMouseDown={[Function]}
-        role="link"
-        type="button"
+      <svg
+        aria-hidden="true"
+        className="theme-tc-svg-icon tc-svg-icon"
+        focusable="false"
+        name="talend-search"
+        title={null}
       >
-        <svg
-          aria-hidden="true"
-          className="theme-tc-svg-icon tc-svg-icon"
-          focusable="false"
-          name="talend-search"
-          title={null}
-        >
-          <use
-            xlinkHref="#talend-search"
-          />
-        </svg>
-      </button>
-    </div>
+        <use
+          xlinkHref="#talend-search"
+        />
+      </svg>
+    </button>
   </div>
 </header>
 `;
diff --git a/packages/components/src/ListView/Header/__snapshots__/headerInput.snapshot.test.js.snap b/packages/components/src/ListView/Header/__snapshots__/headerInput.snapshot.test.js.snap
index c59f7b95dac..faed274be73 100644
--- a/packages/components/src/ListView/Header/__snapshots__/headerInput.snapshot.test.js.snap
+++ b/packages/components/src/ListView/Header/__snapshots__/headerInput.snapshot.test.js.snap
@@ -12,38 +12,32 @@ exports[`Header should render filter header 1`] = `
     placeholder="Search"
     type="text"
   />
-  <div
+  <button
     aria-describedby={42}
-    className="theme-tc-tooltip"
+    aria-label="Abort"
+    className="btn-icon-only btn btn-link"
+    disabled={false}
     onBlur={[Function]}
     onClick={[Function]}
     onFocus={[Function]}
     onKeyPress={[Function]}
+    onMouseDown={[Function]}
     onMouseOut={[Function]}
     onMouseOver={[Function]}
+    role="link"
+    type="button"
   >
-    <button
-      aria-describedby={42}
-      aria-label="Abort"
-      className="btn-icon-only btn btn-link"
-      disabled={false}
-      onClick={[Function]}
-      onMouseDown={[Function]}
-      role="link"
-      type="button"
+    <svg
+      aria-hidden="true"
+      className="theme-tc-svg-icon tc-svg-icon"
+      focusable="false"
+      name="talend-cross"
+      title={null}
     >
-      <svg
-        aria-hidden="true"
-        className="theme-tc-svg-icon tc-svg-icon"
-        focusable="false"
-        name="talend-cross"
-        title={null}
-      >
-        <use
-          xlinkHref="#talend-cross"
-        />
-      </svg>
-    </button>
-  </div>
+      <use
+        xlinkHref="#talend-cross"
+      />
+    </svg>
+  </button>
 </header>
 `;
diff --git a/packages/components/src/ListView/Items/__snapshots__/items.test.js.snap b/packages/components/src/ListView/Items/__snapshots__/items.test.js.snap
index 8c782fbed87..0eb5bee0bde 100644
--- a/packages/components/src/ListView/Items/__snapshots__/items.test.js.snap
+++ b/packages/components/src/ListView/Items/__snapshots__/items.test.js.snap
@@ -1048,59 +1048,58 @@ exports[`Items should render with nested items 1`] = `
                                     label="Expand Lorem ipsum dolor Parent"
                                     tooltipPlacement="top"
                                   >
-                                    <div
+                                    <Button
+                                      active={false}
                                       aria-describedby={42}
-                                      className="theme-tc-tooltip"
+                                      aria-label="Expand Lorem ipsum dolor Parent"
+                                      block={false}
+                                      bsClass="btn"
+                                      bsStyle="link"
+                                      className="btn-icon-only"
+                                      disabled={false}
+                                      key=".0"
                                       onBlur={[Function]}
                                       onClick={[Function]}
                                       onFocus={[Function]}
                                       onKeyPress={[Function]}
+                                      onMouseDown={[Function]}
                                       onMouseOut={[Function]}
                                       onMouseOver={[Function]}
+                                      role={null}
                                     >
-                                      <Button
-                                        active={false}
+                                      <button
                                         aria-describedby={42}
                                         aria-label="Expand Lorem ipsum dolor Parent"
-                                        block={false}
-                                        bsClass="btn"
-                                        bsStyle="link"
-                                        className="btn-icon-only"
+                                        className="btn-icon-only btn btn-link"
                                         disabled={false}
-                                        key=".0"
+                                        onBlur={[Function]}
                                         onClick={[Function]}
+                                        onFocus={[Function]}
+                                        onKeyPress={[Function]}
                                         onMouseDown={[Function]}
+                                        onMouseOut={[Function]}
+                                        onMouseOver={[Function]}
                                         role={null}
+                                        type="button"
                                       >
-                                        <button
-                                          aria-describedby={42}
-                                          aria-label="Expand Lorem ipsum dolor Parent"
-                                          className="btn-icon-only btn btn-link"
-                                          disabled={false}
-                                          onClick={[Function]}
-                                          onMouseDown={[Function]}
-                                          role={null}
-                                          type="button"
+                                        <Icon
+                                          key="icon"
+                                          name="talend-caret-down"
                                         >
-                                          <Icon
-                                            key="icon"
+                                          <svg
+                                            aria-hidden="true"
+                                            className="theme-tc-svg-icon tc-svg-icon"
+                                            focusable="false"
                                             name="talend-caret-down"
+                                            title={null}
                                           >
-                                            <svg
-                                              aria-hidden="true"
-                                              className="theme-tc-svg-icon tc-svg-icon"
-                                              focusable="false"
-                                              name="talend-caret-down"
-                                              title={null}
-                                            >
-                                              <use
-                                                xlinkHref="#talend-caret-down"
-                                              />
-                                            </svg>
-                                          </Icon>
-                                        </button>
-                                      </Button>
-                                    </div>
+                                            <use
+                                              xlinkHref="#talend-caret-down"
+                                            />
+                                          </svg>
+                                        </Icon>
+                                      </button>
+                                    </Button>
                                   </TooltipTrigger>
                                 </ActionButton>
                               </withI18nextTranslation(ActionButton)>
diff --git a/packages/components/src/Progress/__snapshots__/Progress.test.js.snap b/packages/components/src/Progress/__snapshots__/Progress.test.js.snap
index 0de724856a6..e1699ea1ebd 100644
--- a/packages/components/src/Progress/__snapshots__/Progress.test.js.snap
+++ b/packages/components/src/Progress/__snapshots__/Progress.test.js.snap
@@ -12,24 +12,19 @@ exports[`Progress should normalize percent to 0 when prop is < 0 1`] = `
 >
   <div
     aria-describedby={42}
-    className="theme-tc-tooltip"
+    className="theme-progress-percent"
     onBlur={[Function]}
     onClick={[Function]}
     onFocus={[Function]}
     onKeyPress={[Function]}
     onMouseOut={[Function]}
     onMouseOver={[Function]}
-  >
-    <div
-      aria-describedby={42}
-      className="theme-progress-percent"
-      style={
-        Object {
-          "width": "0%",
-        }
+    style={
+      Object {
+        "width": "0%",
       }
-    />
-  </div>
+    }
+  />
 </div>
 `;
 
@@ -45,24 +40,19 @@ exports[`Progress should normalize percent to 100 when prop is > 100 1`] = `
 >
   <div
     aria-describedby={42}
-    className="theme-tc-tooltip"
+    className="theme-progress-percent"
     onBlur={[Function]}
     onClick={[Function]}
     onFocus={[Function]}
     onKeyPress={[Function]}
     onMouseOut={[Function]}
     onMouseOver={[Function]}
-  >
-    <div
-      aria-describedby={42}
-      className="theme-progress-percent"
-      style={
-        Object {
-          "width": "100%",
-        }
+    style={
+      Object {
+        "width": "100%",
       }
-    />
-  </div>
+    }
+  />
 </div>
 `;
 
@@ -78,24 +68,19 @@ exports[`Progress should render a contained progress 1`] = `
 >
   <div
     aria-describedby={42}
-    className="theme-tc-tooltip"
+    className="theme-progress-percent"
     onBlur={[Function]}
     onClick={[Function]}
     onFocus={[Function]}
     onKeyPress={[Function]}
     onMouseOut={[Function]}
     onMouseOver={[Function]}
-  >
-    <div
-      aria-describedby={42}
-      className="theme-progress-percent"
-      style={
-        Object {
-          "width": "60%",
-        }
+    style={
+      Object {
+        "width": "60%",
       }
-    />
-  </div>
+    }
+  />
 </div>
 `;
 
@@ -109,27 +94,22 @@ exports[`Progress should render an infinite progress 1`] = `
 >
   <div
     aria-describedby={42}
-    className="theme-tc-tooltip"
+    className="theme-progress-percent"
     onBlur={[Function]}
     onClick={[Function]}
     onFocus={[Function]}
     onKeyPress={[Function]}
     onMouseOut={[Function]}
     onMouseOver={[Function]}
+    style={
+      Object {
+        "width": "100%",
+      }
+    }
   >
     <div
-      aria-describedby={42}
-      className="theme-progress-percent"
-      style={
-        Object {
-          "width": "100%",
-        }
-      }
-    >
-      <div
-        className="theme-infinite-indicator"
-      />
-    </div>
+      className="theme-infinite-indicator"
+    />
   </div>
 </div>
 `;
@@ -146,24 +126,19 @@ exports[`Progress should render hidden progress at 0% 1`] = `
 >
   <div
     aria-describedby={42}
-    className="theme-tc-tooltip"
+    className="theme-progress-percent"
     onBlur={[Function]}
     onClick={[Function]}
     onFocus={[Function]}
     onKeyPress={[Function]}
     onMouseOut={[Function]}
     onMouseOver={[Function]}
-  >
-    <div
-      aria-describedby={42}
-      className="theme-progress-percent"
-      style={
-        Object {
-          "width": "0%",
-        }
+    style={
+      Object {
+        "width": "0%",
       }
-    />
-  </div>
+    }
+  />
 </div>
 `;
 
@@ -179,23 +154,18 @@ exports[`Progress should render progress with given percentage 1`] = `
 >
   <div
     aria-describedby={42}
-    className="theme-tc-tooltip"
+    className="theme-progress-percent"
     onBlur={[Function]}
     onClick={[Function]}
     onFocus={[Function]}
     onKeyPress={[Function]}
     onMouseOut={[Function]}
     onMouseOver={[Function]}
-  >
-    <div
-      aria-describedby={42}
-      className="theme-progress-percent"
-      style={
-        Object {
-          "width": "60%",
-        }
+    style={
+      Object {
+        "width": "60%",
       }
-    />
-  </div>
+    }
+  />
 </div>
 `;
diff --git a/packages/components/src/Table/Filters/__snapshots__/FiltersBar.test.js.snap b/packages/components/src/Table/Filters/__snapshots__/FiltersBar.test.js.snap
index 5b5cd911a0f..b8b9ff562a5 100644
--- a/packages/components/src/Table/Filters/__snapshots__/FiltersBar.test.js.snap
+++ b/packages/components/src/Table/Filters/__snapshots__/FiltersBar.test.js.snap
@@ -4,39 +4,33 @@ exports[`two-filters 1`] = `
 <form
   className="tc-table-filters-bar theme-tc-table-filters-bar"
 >
-  <div
+  <button
     aria-describedby={42}
-    className="theme-tc-tooltip"
+    aria-label="Toggle filter"
+    className="tc-string-filter tc-filter theme-tc-filter name-filter btn-icon-only btn btn-link"
+    disabled={false}
     onBlur={[Function]}
     onClick={[Function]}
     onFocus={[Function]}
     onKeyPress={[Function]}
+    onMouseDown={[Function]}
     onMouseOut={[Function]}
     onMouseOver={[Function]}
+    role="search"
+    type="button"
   >
-    <button
-      aria-describedby={42}
-      aria-label="Toggle filter"
-      className="tc-string-filter tc-filter theme-tc-filter name-filter btn-icon-only btn btn-link"
-      disabled={false}
-      onClick={[Function]}
-      onMouseDown={[Function]}
-      role="search"
-      type="button"
+    <svg
+      aria-hidden="true"
+      className="theme-tc-svg-icon tc-svg-icon"
+      focusable="false"
+      name="talend-search"
+      title={null}
     >
-      <svg
-        aria-hidden="true"
-        className="theme-tc-svg-icon tc-svg-icon"
-        focusable="false"
-        name="talend-search"
-        title={null}
-      >
-        <use
-          xlinkHref="#talend-search"
-        />
-      </svg>
-    </button>
-  </div>
+      <use
+        xlinkHref="#talend-search"
+      />
+    </svg>
+  </button>
   <div
     className="checkbox tc-toggle theme-tc-toggle tc-boolean-filter tc-filter theme-tc-filter mandatory-field-filter"
   >
diff --git a/packages/components/src/Table/TitleBar/__snapshots__/TitleBar.test.js.snap b/packages/components/src/Table/TitleBar/__snapshots__/TitleBar.test.js.snap
index 48c355ebf4b..3cd98e19449 100644
--- a/packages/components/src/Table/TitleBar/__snapshots__/TitleBar.test.js.snap
+++ b/packages/components/src/Table/TitleBar/__snapshots__/TitleBar.test.js.snap
@@ -12,39 +12,33 @@ exports[`title-bar 1`] = `
   <form
     className="tc-table-filters-bar theme-tc-table-filters-bar"
   >
-    <div
+    <button
       aria-describedby={42}
-      className="theme-tc-tooltip"
+      aria-label="Toggle filter"
+      className="tc-string-filter tc-filter theme-tc-filter name-filter btn-icon-only btn btn-link"
+      disabled={false}
       onBlur={[Function]}
       onClick={[Function]}
       onFocus={[Function]}
       onKeyPress={[Function]}
+      onMouseDown={[Function]}
       onMouseOut={[Function]}
       onMouseOver={[Function]}
+      role="search"
+      type="button"
     >
-      <button
-        aria-describedby={42}
-        aria-label="Toggle filter"
-        className="tc-string-filter tc-filter theme-tc-filter name-filter btn-icon-only btn btn-link"
-        disabled={false}
-        onClick={[Function]}
-        onMouseDown={[Function]}
-        role="search"
-        type="button"
+      <svg
+        aria-hidden="true"
+        className="theme-tc-svg-icon tc-svg-icon"
+        focusable="false"
+        name="talend-search"
+        title={null}
       >
-        <svg
-          aria-hidden="true"
-          className="theme-tc-svg-icon tc-svg-icon"
-          focusable="false"
-          name="talend-search"
-          title={null}
-        >
-          <use
-            xlinkHref="#talend-search"
-          />
-        </svg>
-      </button>
-    </div>
+        <use
+          xlinkHref="#talend-search"
+        />
+      </svg>
+    </button>
     <div
       className="checkbox tc-toggle theme-tc-toggle tc-boolean-filter tc-filter theme-tc-filter mandatory-field-filter"
     >
diff --git a/packages/components/src/TooltipTrigger/TooltipTrigger.component.js b/packages/components/src/TooltipTrigger/TooltipTrigger.component.js
index 14cb18e268e..ba99fdd511d 100644
--- a/packages/components/src/TooltipTrigger/TooltipTrigger.component.js
+++ b/packages/components/src/TooltipTrigger/TooltipTrigger.component.js
@@ -3,7 +3,6 @@ import React, { cloneElement, useState, useRef } from 'react';
 import ReactDOM from 'react-dom';
 import uuid from 'uuid';
 import classNames from 'classnames';
-import omit from 'lodash/omit';
 import theme from './TooltipTrigger.scss';
 import useTooltipVisibility from './TooltipTrigger.hook';
 
@@ -100,27 +99,36 @@ const props = {
 	<Icon name="my-icon" />
 </TooltipTrigger>
  */
-function TooltipTrigger(props) {
-	const refContainer = useRef(null);
-
-	const [visible, show, hide] = useTooltipVisibility(props.tooltipDelay);
+function TooltipTrigger({
+	children,
+	label,
+	tooltipDelay,
+	tooltipPlacement = 'right',
+	tooltipHeight = DEFAULT_OFFSET_Y,
+	tooltipWidth = DEFAULT_OFFSET_X,
+}) {
+	const refContainer = useRef();
+
+	const [visible, show, hide] = useTooltipVisibility(tooltipDelay);
 
 	const [id] = useState(uuid.v4());
 
-	function getTooltipPosition() {
-		const {
-			tooltipPlacement = 'right',
-			tooltipHeight = DEFAULT_OFFSET_Y,
-			tooltipWidth = DEFAULT_OFFSET_X,
-		} = props;
+	const { props: childrenProps } = children;
 
-		if (!refContainer.current) {
+	function getTooltipPosition() {
+		if (!refContainer || !refContainer.current) {
 			return {
 				tooltipPlacement,
 			};
 		}
 
-		const dimensions = refContainer.current.getBoundingClientRect();
+		let dimensions;
+		try {
+			// eslint-disable-next-line react/no-find-dom-node
+			dimensions = ReactDOM.findDOMNode(refContainer.current).getBoundingClientRect();
+		} catch (e) {
+			dimensions = {};
+		}
 
 		const placement = getAdjustedTooltipPlacement(tooltipPlacement, dimensions, {
 			tooltipHeight,
@@ -137,28 +145,77 @@ function TooltipTrigger(props) {
 		};
 	}
 
+	/**
+	 * Activate the tooltip when children are focused
+	 */
+	const onFocus = (...args) => {
+		show();
+		if (childrenProps.onFocus) {
+			childrenProps.onFocus(...args);
+		}
+	};
+
+	/**
+	 * Desactive the tooltip when children are not focused anymore
+	 */
+	const onBlur = (...args) => {
+		hide();
+		if (childrenProps.onBlur) {
+			childrenProps.onBlur(...args);
+		}
+	};
+
+	const onKeyPress = (...args) => {
+		hide();
+		if (childrenProps.onKeyPress) {
+			childrenProps.onKeyPress(...args);
+		}
+	};
+
+	const onMouseOver = (...args) => {
+		show();
+		if (childrenProps.onMouseOver) {
+			childrenProps.onMouseOver(...args);
+		}
+	};
+
+	const onMouseOut = (...args) => {
+		hide();
+		if (childrenProps.onMouseOut) {
+			childrenProps.onMouseOut(...args);
+		}
+	};
+
+	const onClick = (...args) => {
+		hide();
+		if (childrenProps.onClick) {
+			childrenProps.onClick(...args);
+		}
+	};
+
 	const { placement, style } = getTooltipPosition();
 
 	return (
-		// we use div here to wrap tooltip trigger
-		// it should not be reachable
-		// It is just a way to handle click and keyboard events
-		// eslint-disable-next-line jsx-a11y/no-static-element-interactions
-		<div
-			{...omit(props, Object.keys(TooltipTrigger.propTypes))}
-			className={classNames(theme['tc-tooltip'], props.className)}
-			onFocus={show}
-			onBlur={hide}
-			onKeyPress={hide}
-			onMouseOver={show}
-			onMouseOut={hide}
-			onClick={hide}
-			aria-describedby={id}
-			ref={refContainer}
-		>
-			{React.Children.map(props.children, child =>
+		<React.Fragment>
+			{React.Children.map(children, child =>
 				cloneElement(child, {
 					'aria-describedby': id,
+					onFocus,
+					onBlur,
+					onKeyPress,
+					onMouseOver,
+					onMouseOut,
+					onClick,
+					// Because of React Fragment, we need to maintaining ref through cloneElement
+					// @see https://github.com/facebook/react/issues/8873#issuecomment-275423780
+					// We need to follow the status of this RFC to change it as soon as possible
+					// @see https://github.com/reactjs/rfcs/pull/97
+					ref: node => {
+						refContainer.current = node;
+						const { ref } = child;
+						if (typeof ref === 'function') ref(node);
+						else if (ref) ref.current = node;
+					},
 				}),
 			)}
 
@@ -169,19 +226,18 @@ function TooltipTrigger(props) {
 							id={id}
 							className={classNames(theme['tc-tooltip-body'], theme[`tc-tooltip-${placement}`])}
 						>
-							{props.label}
+							{label}
 						</div>
 					</div>,
 					document.body,
 				)}
-		</div>
+		</React.Fragment>
 	);
 }
 
 TooltipTrigger.displayName = 'TooltipTrigger';
 
 TooltipTrigger.propTypes = {
-	className: PropTypes.string,
 	label: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
 	tooltipPlacement: PropTypes.oneOf(['top', 'right', 'bottom', 'left']),
 	tooltipHeight: PropTypes.number,
diff --git a/packages/components/src/TooltipTrigger/TooltipTrigger.hook.js b/packages/components/src/TooltipTrigger/TooltipTrigger.hook.js
index bf469943f98..36bb3169731 100644
--- a/packages/components/src/TooltipTrigger/TooltipTrigger.hook.js
+++ b/packages/components/src/TooltipTrigger/TooltipTrigger.hook.js
@@ -1,11 +1,12 @@
 import { useState } from 'react';
 
-const useTooltipVisibility = (tooltipDelay = 600) => {
-	let timeout;
+let timeout;
 
+const useTooltipVisibility = (tooltipDelay = 600) => {
 	const [visible, setVisible] = useState(false);
 
 	const show = () => {
+		if (timeout) clearTimeout(timeout);
 		timeout = setTimeout(() => {
 			setVisible(true);
 		}, tooltipDelay);
diff --git a/packages/components/src/TooltipTrigger/__snapshots__/TooltipTrigger.test.js.snap b/packages/components/src/TooltipTrigger/__snapshots__/TooltipTrigger.test.js.snap
index 728b208d7df..4e0245451a8 100644
--- a/packages/components/src/TooltipTrigger/__snapshots__/TooltipTrigger.test.js.snap
+++ b/packages/components/src/TooltipTrigger/__snapshots__/TooltipTrigger.test.js.snap
@@ -1,29 +1,24 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`ActionTooltip should render custom tooltip when focus the children 1`] = `
-<div
-  aria-describedby={42}
-  ariaLabel="a custom tooltip"
-  className="theme-tc-tooltip"
-  onBlur={[Function]}
-  onClick={[Function]}
-  onFocus={[Function]}
-  onKeyPress={[Function]}
-  onMouseOut={[Function]}
-  onMouseOver={[Function]}
->
+<React.Fragment>
   <div
     aria-describedby={42}
+    onBlur={[Function]}
+    onClick={[Function]}
+    onFocus={[Function]}
+    onKeyPress={[Function]}
+    onMouseOut={[Function]}
+    onMouseOver={[Function]}
   >
     Action
   </div>
-</div>
+</React.Fragment>
 `;
 
 exports[`ActionTooltip should render only the children 1`] = `
 <div
   aria-describedby={42}
-  className="theme-tc-tooltip"
   onBlur={[Function]}
   onClick={[Function]}
   onFocus={[Function]}
@@ -31,48 +26,38 @@ exports[`ActionTooltip should render only the children 1`] = `
   onMouseOut={[Function]}
   onMouseOver={[Function]}
 >
-  <div
-    aria-describedby={42}
-  >
-    Action
-  </div>
+  Action
 </div>
 `;
 
 exports[`ActionTooltip should render tooltip when focus the children 1`] = `
-<div
-  aria-describedby={42}
-  className="theme-tc-tooltip"
-  onBlur={[Function]}
-  onClick={[Function]}
-  onFocus={[Function]}
-  onKeyPress={[Function]}
-  onMouseOut={[Function]}
-  onMouseOver={[Function]}
->
+<React.Fragment>
   <div
     aria-describedby={42}
+    onBlur={[Function]}
+    onClick={[Function]}
+    onFocus={[Function]}
+    onKeyPress={[Function]}
+    onMouseOut={[Function]}
+    onMouseOver={[Function]}
   >
     Action
   </div>
-</div>
+</React.Fragment>
 `;
 
 exports[`ActionTooltip should render tooltip when hover the children 1`] = `
-<div
-  aria-describedby={42}
-  className="theme-tc-tooltip"
-  onBlur={[Function]}
-  onClick={[Function]}
-  onFocus={[Function]}
-  onKeyPress={[Function]}
-  onMouseOut={[Function]}
-  onMouseOver={[Function]}
->
+<React.Fragment>
   <div
     aria-describedby={42}
+    onBlur={[Function]}
+    onClick={[Function]}
+    onFocus={[Function]}
+    onKeyPress={[Function]}
+    onMouseOut={[Function]}
+    onMouseOver={[Function]}
   >
     Action
   </div>
-</div>
+</React.Fragment>
 `;
diff --git a/packages/components/src/Typeahead/__snapshots__/Typeahead.snapshot.test.js.snap b/packages/components/src/Typeahead/__snapshots__/Typeahead.snapshot.test.js.snap
index 1059eb42d66..3b210cd6752 100644
--- a/packages/components/src/Typeahead/__snapshots__/Typeahead.snapshot.test.js.snap
+++ b/packages/components/src/Typeahead/__snapshots__/Typeahead.snapshot.test.js.snap
@@ -913,31 +913,25 @@ exports[`Typeahead should pass input extra props 1`] = `
 `;
 
 exports[`Typeahead with toggle should render button 1`] = `
-<div
+<button
   aria-describedby={42}
-  className="theme-tc-tooltip"
+  aria-label="Toggle search bar"
+  className="theme-only-icon-cls tc-typeahead-toggle btn-icon-only btn btn-link"
+  disabled={false}
   onBlur={[Function]}
   onClick={[Function]}
   onFocus={[Function]}
   onKeyPress={[Function]}
+  onMouseDown={[Function]}
   onMouseOut={[Function]}
   onMouseOver={[Function]}
+  type="button"
 >
-  <button
-    aria-describedby={42}
-    aria-label="Toggle search bar"
-    className="theme-only-icon-cls tc-typeahead-toggle btn-icon-only btn btn-link"
-    disabled={false}
-    onClick={[Function]}
-    onMouseDown={[Function]}
-    type="button"
-  >
-    <i
-      aria-hidden="true"
-      className="fa fa-search"
-      focusable="false"
-      title={null}
-    />
-  </button>
-</div>
+  <i
+    aria-hidden="true"
+    className="fa fa-search"
+    focusable="false"
+    title={null}
+  />
+</button>
 `;
diff --git a/packages/components/stories/TooltipTrigger.js b/packages/components/stories/TooltipTrigger.js
index 5ac1dd3a98e..4eab7ba3198 100644
--- a/packages/components/stories/TooltipTrigger.js
+++ b/packages/components/stories/TooltipTrigger.js
@@ -2,16 +2,19 @@ import React from 'react';
 import { action } from '@storybook/addon-actions';
 import { storiesOf } from '@storybook/react';
 
-import { TooltipTrigger, Button } from '../src/index';
+import { Button, TooltipTrigger } from '../src/index';
 
 function generateButtonWithTooltip(label, tooltipPlacement) {
+	// need a wrapper (div) here since Button is a functional component
 	return (
 		<TooltipTrigger
 			label="This is a huuuuuuuuuuuuuuuuuuuuuuge tooltip for a very very demo"
 			tooltipPlacement={tooltipPlacement}
 			data-feature="my.feature"
 		>
-			<Button onClick={action('click')}>{label}</Button>
+			<div style={{ display: 'inline-block' }}>
+				<Button onClick={action('click')}>{label}</Button>
+			</div>
 		</TooltipTrigger>
 	);
 }
diff --git a/packages/forms/src/UIForm/fields/ListView/__snapshots__/ListView.component.test.js.snap b/packages/forms/src/UIForm/fields/ListView/__snapshots__/ListView.component.test.js.snap
index e44e3977df3..641920bd95f 100644
--- a/packages/forms/src/UIForm/fields/ListView/__snapshots__/ListView.component.test.js.snap
+++ b/packages/forms/src/UIForm/fields/ListView/__snapshots__/ListView.component.test.js.snap
@@ -569,59 +569,58 @@ exports[`ListView field render should render no items message 1`] = `
                     label="Search for specific values"
                     tooltipPlacement="top"
                   >
-                    <div
+                    <Button
+                      active={false}
                       aria-describedby={42}
-                      className="theme-tc-tooltip"
+                      aria-label="Search for specific values"
+                      block={false}
+                      bsClass="btn"
+                      bsStyle="link"
+                      className="btn-icon-only"
+                      disabled={false}
+                      key=".0"
                       onBlur={[Function]}
                       onClick={[Function]}
                       onFocus={[Function]}
                       onKeyPress={[Function]}
+                      onMouseDown={[Function]}
                       onMouseOut={[Function]}
                       onMouseOver={[Function]}
+                      role="link"
                     >
-                      <Button
-                        active={false}
+                      <button
                         aria-describedby={42}
                         aria-label="Search for specific values"
-                        block={false}
-                        bsClass="btn"
-                        bsStyle="link"
-                        className="btn-icon-only"
+                        className="btn-icon-only btn btn-link"
                         disabled={false}
-                        key=".0"
+                        onBlur={[Function]}
                         onClick={[Function]}
+                        onFocus={[Function]}
+                        onKeyPress={[Function]}
                         onMouseDown={[Function]}
+                        onMouseOut={[Function]}
+                        onMouseOver={[Function]}
                         role="link"
+                        type="button"
                       >
-                        <button
-                          aria-describedby={42}
-                          aria-label="Search for specific values"
-                          className="btn-icon-only btn btn-link"
-                          disabled={false}
-                          onClick={[Function]}
-                          onMouseDown={[Function]}
-                          role="link"
-                          type="button"
+                        <Icon
+                          key="icon"
+                          name="talend-search"
                         >
-                          <Icon
-                            key="icon"
+                          <svg
+                            aria-hidden="true"
+                            className="theme-tc-svg-icon tc-svg-icon"
+                            focusable="false"
                             name="talend-search"
+                            title={null}
                           >
-                            <svg
-                              aria-hidden="true"
-                              className="theme-tc-svg-icon tc-svg-icon"
-                              focusable="false"
-                              name="talend-search"
-                              title={null}
-                            >
-                              <use
-                                xlinkHref="#talend-search"
-                              />
-                            </svg>
-                          </Icon>
-                        </button>
-                      </Button>
-                    </div>
+                            <use
+                              xlinkHref="#talend-search"
+                            />
+                          </svg>
+                        </Icon>
+                      </button>
+                    </Button>
                   </TooltipTrigger>
                 </ActionButton>
               </withI18nextTranslation(ActionButton)>
diff --git a/packages/forms/src/deprecated/widgets/EnumerationWidget/__snapshots__/EnumerationWidget.test.js.snap b/packages/forms/src/deprecated/widgets/EnumerationWidget/__snapshots__/EnumerationWidget.test.js.snap
index 2c8fbce4901..7676d2ae07b 100644
--- a/packages/forms/src/deprecated/widgets/EnumerationWidget/__snapshots__/EnumerationWidget.test.js.snap
+++ b/packages/forms/src/deprecated/widgets/EnumerationWidget/__snapshots__/EnumerationWidget.test.js.snap
@@ -434,61 +434,60 @@ exports[`EnumerationWidget delete all 1`] = `
                           label="Search for specific values"
                           tooltipPlacement="top"
                         >
-                          <div
+                          <Button
+                            active={false}
                             aria-describedby={42}
-                            className="theme-tc-tooltip"
+                            aria-label="Search for specific values"
+                            block={false}
+                            bsClass="btn"
+                            bsStyle="link"
+                            className="btn-icon-only"
+                            disabled={false}
+                            id="search"
+                            key=".0"
                             onBlur={[Function]}
                             onClick={[Function]}
                             onFocus={[Function]}
                             onKeyPress={[Function]}
+                            onMouseDown={[Function]}
                             onMouseOut={[Function]}
                             onMouseOver={[Function]}
+                            role="link"
                           >
-                            <Button
-                              active={false}
+                            <button
                               aria-describedby={42}
                               aria-label="Search for specific values"
-                              block={false}
-                              bsClass="btn"
-                              bsStyle="link"
-                              className="btn-icon-only"
+                              className="btn-icon-only btn btn-link"
                               disabled={false}
                               id="search"
-                              key=".0"
+                              onBlur={[Function]}
                               onClick={[Function]}
+                              onFocus={[Function]}
+                              onKeyPress={[Function]}
                               onMouseDown={[Function]}
+                              onMouseOut={[Function]}
+                              onMouseOver={[Function]}
                               role="link"
+                              type="button"
                             >
-                              <button
-                                aria-describedby={42}
-                                aria-label="Search for specific values"
-                                className="btn-icon-only btn btn-link"
-                                disabled={false}
-                                id="search"
-                                onClick={[Function]}
-                                onMouseDown={[Function]}
-                                role="link"
-                                type="button"
+                              <Icon
+                                key="icon"
+                                name="talend-search"
                               >
-                                <Icon
-                                  key="icon"
+                                <svg
+                                  aria-hidden="true"
+                                  className="theme-tc-svg-icon tc-svg-icon"
+                                  focusable="false"
                                   name="talend-search"
+                                  title={null}
                                 >
-                                  <svg
-                                    aria-hidden="true"
-                                    className="theme-tc-svg-icon tc-svg-icon"
-                                    focusable="false"
-                                    name="talend-search"
-                                    title={null}
-                                  >
-                                    <use
-                                      xlinkHref="#talend-search"
-                                    />
-                                  </svg>
-                                </Icon>
-                              </button>
-                            </Button>
-                          </div>
+                                  <use
+                                    xlinkHref="#talend-search"
+                                  />
+                                </svg>
+                              </Icon>
+                            </button>
+                          </Button>
                         </TooltipTrigger>
                       </ActionButton>
                     </withI18nextTranslation(ActionButton)>
@@ -536,61 +535,60 @@ exports[`EnumerationWidget delete all 1`] = `
                           label="Add item"
                           tooltipPlacement="top"
                         >
-                          <div
+                          <Button
+                            active={false}
                             aria-describedby={42}
-                            className="theme-tc-tooltip"
+                            aria-label="Add item"
+                            block={false}
+                            bsClass="btn"
+                            bsStyle="link"
+                            className="btn-icon-only"
+                            disabled={false}
+                            id="add"
+                            key=".0"
                             onBlur={[Function]}
                             onClick={[Function]}
                             onFocus={[Function]}
                             onKeyPress={[Function]}
+                            onMouseDown={[Function]}
                             onMouseOut={[Function]}
                             onMouseOver={[Function]}
+                            role="link"
                           >
-                            <Button
-                              active={false}
+                            <button
                               aria-describedby={42}
                               aria-label="Add item"
-                              block={false}
-                              bsClass="btn"
-                              bsStyle="link"
-                              className="btn-icon-only"
+                              className="btn-icon-only btn btn-link"
                               disabled={false}
                               id="add"
-                              key=".0"
+                              onBlur={[Function]}
                               onClick={[Function]}
+                              onFocus={[Function]}
+                              onKeyPress={[Function]}
                               onMouseDown={[Function]}
+                              onMouseOut={[Function]}
+                              onMouseOver={[Function]}
                               role="link"
+                              type="button"
                             >
-                              <button
-                                aria-describedby={42}
-                                aria-label="Add item"
-                                className="btn-icon-only btn btn-link"
-                                disabled={false}
-                                id="add"
-                                onClick={[Function]}
-                                onMouseDown={[Function]}
-                                role="link"
-                                type="button"
+                              <Icon
+                                key="icon"
+                                name="talend-plus"
                               >
-                                <Icon
-                                  key="icon"
+                                <svg
+                                  aria-hidden="true"
+                                  className="theme-tc-svg-icon tc-svg-icon"
+                                  focusable="false"
                                   name="talend-plus"
+                                  title={null}
                                 >
-                                  <svg
-                                    aria-hidden="true"
-                                    className="theme-tc-svg-icon tc-svg-icon"
-                                    focusable="false"
-                                    name="talend-plus"
-                                    title={null}
-                                  >
-                                    <use
-                                      xlinkHref="#talend-plus"
-                                    />
-                                  </svg>
-                                </Icon>
-                              </button>
-                            </Button>
-                          </div>
+                                  <use
+                                    xlinkHref="#talend-plus"
+                                  />
+                                </svg>
+                              </Icon>
+                            </button>
+                          </Button>
                         </TooltipTrigger>
                       </ActionButton>
                     </withI18nextTranslation(ActionButton)>
@@ -1155,59 +1153,58 @@ exports[`EnumerationWidget should be in add mode 1`] = `
                         label="Abort"
                         tooltipPlacement="bottom"
                       >
-                        <div
+                        <Button
+                          active={false}
                           aria-describedby={42}
-                          className="theme-tc-tooltip"
+                          aria-label="Abort"
+                          block={false}
+                          bsClass="btn"
+                          bsStyle="link"
+                          className="btn-icon-only"
+                          disabled={false}
+                          key=".0"
                           onBlur={[Function]}
                           onClick={[Function]}
                           onFocus={[Function]}
                           onKeyPress={[Function]}
+                          onMouseDown={[Function]}
                           onMouseOut={[Function]}
                           onMouseOver={[Function]}
+                          role="link"
                         >
-                          <Button
-                            active={false}
+                          <button
                             aria-describedby={42}
                             aria-label="Abort"
-                            block={false}
-                            bsClass="btn"
-                            bsStyle="link"
-                            className="btn-icon-only"
+                            className="btn-icon-only btn btn-link"
                             disabled={false}
-                            key=".0"
+                            onBlur={[Function]}
                             onClick={[Function]}
+                            onFocus={[Function]}
+                            onKeyPress={[Function]}
                             onMouseDown={[Function]}
+                            onMouseOut={[Function]}
+                            onMouseOver={[Function]}
                             role="link"
+                            type="button"
                           >
-                            <button
-                              aria-describedby={42}
-                              aria-label="Abort"
-                              className="btn-icon-only btn btn-link"
-                              disabled={false}
-                              onClick={[Function]}
-                              onMouseDown={[Function]}
-                              role="link"
-                              type="button"
+                            <Icon
+                              key="icon"
+                              name="talend-cross"
                             >
-                              <Icon
-                                key="icon"
+                              <svg
+                                aria-hidden="true"
+                                className="theme-tc-svg-icon tc-svg-icon"
+                                focusable="false"
                                 name="talend-cross"
+                                title={null}
                               >
-                                <svg
-                                  aria-hidden="true"
-                                  className="theme-tc-svg-icon tc-svg-icon"
-                                  focusable="false"
-                                  name="talend-cross"
-                                  title={null}
-                                >
-                                  <use
-                                    xlinkHref="#talend-cross"
-                                  />
-                                </svg>
-                              </Icon>
-                            </button>
-                          </Button>
-                        </div>
+                                <use
+                                  xlinkHref="#talend-cross"
+                                />
+                              </svg>
+                            </Icon>
+                          </button>
+                        </Button>
                       </TooltipTrigger>
                     </ActionButton>
                   </withI18nextTranslation(ActionButton)>
@@ -1760,61 +1757,60 @@ exports[`EnumerationWidget should be in default mode 1`] = `
                           label="Search for specific values"
                           tooltipPlacement="top"
                         >
-                          <div
+                          <Button
+                            active={false}
                             aria-describedby={42}
-                            className="theme-tc-tooltip"
+                            aria-label="Search for specific values"
+                            block={false}
+                            bsClass="btn"
+                            bsStyle="link"
+                            className="btn-icon-only"
+                            disabled={false}
+                            id="search"
+                            key=".0"
                             onBlur={[Function]}
                             onClick={[Function]}
                             onFocus={[Function]}
                             onKeyPress={[Function]}
+                            onMouseDown={[Function]}
                             onMouseOut={[Function]}
                             onMouseOver={[Function]}
+                            role="link"
                           >
-                            <Button
-                              active={false}
+                            <button
                               aria-describedby={42}
                               aria-label="Search for specific values"
-                              block={false}
-                              bsClass="btn"
-                              bsStyle="link"
-                              className="btn-icon-only"
+                              className="btn-icon-only btn btn-link"
                               disabled={false}
                               id="search"
-                              key=".0"
+                              onBlur={[Function]}
                               onClick={[Function]}
+                              onFocus={[Function]}
+                              onKeyPress={[Function]}
                               onMouseDown={[Function]}
+                              onMouseOut={[Function]}
+                              onMouseOver={[Function]}
                               role="link"
+                              type="button"
                             >
-                              <button
-                                aria-describedby={42}
-                                aria-label="Search for specific values"
-                                className="btn-icon-only btn btn-link"
-                                disabled={false}
-                                id="search"
-                                onClick={[Function]}
-                                onMouseDown={[Function]}
-                                role="link"
-                                type="button"
+                              <Icon
+                                key="icon"
+                                name="talend-search"
                               >
-                                <Icon
-                                  key="icon"
+                                <svg
+                                  aria-hidden="true"
+                                  className="theme-tc-svg-icon tc-svg-icon"
+                                  focusable="false"
                                   name="talend-search"
+                                  title={null}
                                 >
-                                  <svg
-                                    aria-hidden="true"
-                                    className="theme-tc-svg-icon tc-svg-icon"
-                                    focusable="false"
-                                    name="talend-search"
-                                    title={null}
-                                  >
-                                    <use
-                                      xlinkHref="#talend-search"
-                                    />
-                                  </svg>
-                                </Icon>
-                              </button>
-                            </Button>
-                          </div>
+                                  <use
+                                    xlinkHref="#talend-search"
+                                  />
+                                </svg>
+                              </Icon>
+                            </button>
+                          </Button>
                         </TooltipTrigger>
                       </ActionButton>
                     </withI18nextTranslation(ActionButton)>
@@ -1862,61 +1858,60 @@ exports[`EnumerationWidget should be in default mode 1`] = `
                           label="Add item"
                           tooltipPlacement="top"
                         >
-                          <div
+                          <Button
+                            active={false}
                             aria-describedby={42}
-                            className="theme-tc-tooltip"
+                            aria-label="Add item"
+                            block={false}
+                            bsClass="btn"
+                            bsStyle="link"
+                            className="btn-icon-only"
+                            disabled={false}
+                            id="add"
+                            key=".0"
                             onBlur={[Function]}
                             onClick={[Function]}
                             onFocus={[Function]}
                             onKeyPress={[Function]}
+                            onMouseDown={[Function]}
                             onMouseOut={[Function]}
                             onMouseOver={[Function]}
+                            role="link"
                           >
-                            <Button
-                              active={false}
+                            <button
                               aria-describedby={42}
                               aria-label="Add item"
-                              block={false}
-                              bsClass="btn"
-                              bsStyle="link"
-                              className="btn-icon-only"
+                              className="btn-icon-only btn btn-link"
                               disabled={false}
                               id="add"
-                              key=".0"
+                              onBlur={[Function]}
                               onClick={[Function]}
+                              onFocus={[Function]}
+                              onKeyPress={[Function]}
                               onMouseDown={[Function]}
+                              onMouseOut={[Function]}
+                              onMouseOver={[Function]}
                               role="link"
+                              type="button"
                             >
-                              <button
-                                aria-describedby={42}
-                                aria-label="Add item"
-                                className="btn-icon-only btn btn-link"
-                                disabled={false}
-                                id="add"
-                                onClick={[Function]}
-                                onMouseDown={[Function]}
-                                role="link"
-                                type="button"
+                              <Icon
+                                key="icon"
+                                name="talend-plus"
                               >
-                                <Icon
-                                  key="icon"
+                                <svg
+                                  aria-hidden="true"
+                                  className="theme-tc-svg-icon tc-svg-icon"
+                                  focusable="false"
                                   name="talend-plus"
+                                  title={null}
                                 >
-                                  <svg
-                                    aria-hidden="true"
-                                    className="theme-tc-svg-icon tc-svg-icon"
-                                    focusable="false"
-                                    name="talend-plus"
-                                    title={null}
-                                  >
-                                    <use
-                                      xlinkHref="#talend-plus"
-                                    />
-                                  </svg>
-                                </Icon>
-                              </button>
-                            </Button>
-                          </div>
+                                  <use
+                                    xlinkHref="#talend-plus"
+                                  />
+                                </svg>
+                              </Icon>
+                            </button>
+                          </Button>
                         </TooltipTrigger>
                       </ActionButton>
                     </withI18nextTranslation(ActionButton)>
@@ -2476,61 +2471,60 @@ exports[`EnumerationWidget should be in default mode 2`] = `
                           label="Search for specific values"
                           tooltipPlacement="top"
                         >
-                          <div
+                          <Button
+                            active={false}
                             aria-describedby={42}
-                            className="theme-tc-tooltip"
+                            aria-label="Search for specific values"
+                            block={false}
+                            bsClass="btn"
+                            bsStyle="link"
+                            className="btn-icon-only"
+                            disabled={false}
+                            id="search"
+                            key=".0"
                             onBlur={[Function]}
                             onClick={[Function]}
                             onFocus={[Function]}
                             onKeyPress={[Function]}
+                            onMouseDown={[Function]}
                             onMouseOut={[Function]}
                             onMouseOver={[Function]}
+                            role="link"
                           >
-                            <Button
-                              active={false}
+                            <button
                               aria-describedby={42}
                               aria-label="Search for specific values"
-                              block={false}
-                              bsClass="btn"
-                              bsStyle="link"
-                              className="btn-icon-only"
+                              className="btn-icon-only btn btn-link"
                               disabled={false}
                               id="search"
-                              key=".0"
+                              onBlur={[Function]}
                               onClick={[Function]}
+                              onFocus={[Function]}
+                              onKeyPress={[Function]}
                               onMouseDown={[Function]}
+                              onMouseOut={[Function]}
+                              onMouseOver={[Function]}
                               role="link"
+                              type="button"
                             >
-                              <button
-                                aria-describedby={42}
-                                aria-label="Search for specific values"
-                                className="btn-icon-only btn btn-link"
-                                disabled={false}
-                                id="search"
-                                onClick={[Function]}
-                                onMouseDown={[Function]}
-                                role="link"
-                                type="button"
+                              <Icon
+                                key="icon"
+                                name="talend-search"
                               >
-                                <Icon
-                                  key="icon"
+                                <svg
+                                  aria-hidden="true"
+                                  className="theme-tc-svg-icon tc-svg-icon"
+                                  focusable="false"
                                   name="talend-search"
+                                  title={null}
                                 >
-                                  <svg
-                                    aria-hidden="true"
-                                    className="theme-tc-svg-icon tc-svg-icon"
-                                    focusable="false"
-                                    name="talend-search"
-                                    title={null}
-                                  >
-                                    <use
-                                      xlinkHref="#talend-search"
-                                    />
-                                  </svg>
-                                </Icon>
-                              </button>
-                            </Button>
-                          </div>
+                                  <use
+                                    xlinkHref="#talend-search"
+                                  />
+                                </svg>
+                              </Icon>
+                            </button>
+                          </Button>
                         </TooltipTrigger>
                       </ActionButton>
                     </withI18nextTranslation(ActionButton)>
@@ -2578,61 +2572,60 @@ exports[`EnumerationWidget should be in default mode 2`] = `
                           label="Add item"
                           tooltipPlacement="top"
                         >
-                          <div
+                          <Button
+                            active={false}
                             aria-describedby={42}
-                            className="theme-tc-tooltip"
+                            aria-label="Add item"
+                            block={false}
+                            bsClass="btn"
+                            bsStyle="link"
+                            className="btn-icon-only"
+                            disabled={false}
+                            id="add"
+                            key=".0"
                             onBlur={[Function]}
                             onClick={[Function]}
                             onFocus={[Function]}
                             onKeyPress={[Function]}
+                            onMouseDown={[Function]}
                             onMouseOut={[Function]}
                             onMouseOver={[Function]}
+                            role="link"
                           >
-                            <Button
-                              active={false}
+                            <button
                               aria-describedby={42}
                               aria-label="Add item"
-                              block={false}
-                              bsClass="btn"
-                              bsStyle="link"
-                              className="btn-icon-only"
+                              className="btn-icon-only btn btn-link"
                               disabled={false}
                               id="add"
-                              key=".0"
+                              onBlur={[Function]}
                               onClick={[Function]}
+                              onFocus={[Function]}
+                              onKeyPress={[Function]}
                               onMouseDown={[Function]}
+                              onMouseOut={[Function]}
+                              onMouseOver={[Function]}
                               role="link"
+                              type="button"
                             >
-                              <button
-                                aria-describedby={42}
-                                aria-label="Add item"
-                                className="btn-icon-only btn btn-link"
-                                disabled={false}
-                                id="add"
-                                onClick={[Function]}
-                                onMouseDown={[Function]}
-                                role="link"
-                                type="button"
+                              <Icon
+                                key="icon"
+                                name="talend-plus"
                               >
-                                <Icon
-                                  key="icon"
+                                <svg
+                                  aria-hidden="true"
+                                  className="theme-tc-svg-icon tc-svg-icon"
+                                  focusable="false"
                                   name="talend-plus"
+                                  title={null}
                                 >
-                                  <svg
-                                    aria-hidden="true"
-                                    className="theme-tc-svg-icon tc-svg-icon"
-                                    focusable="false"
-                                    name="talend-plus"
-                                    title={null}
-                                  >
-                                    <use
-                                      xlinkHref="#talend-plus"
-                                    />
-                                  </svg>
-                                </Icon>
-                              </button>
-                            </Button>
-                          </div>
+                                  <use
+                                    xlinkHref="#talend-plus"
+                                  />
+                                </svg>
+                              </Icon>
+                            </button>
+                          </Button>
                         </TooltipTrigger>
                       </ActionButton>
                     </withI18nextTranslation(ActionButton)>
@@ -3258,61 +3251,60 @@ exports[`EnumerationWidget should be in edit mode 1`] = `
                           label="Search for specific values"
                           tooltipPlacement="top"
                         >
-                          <div
+                          <Button
+                            active={false}
                             aria-describedby={42}
-                            className="theme-tc-tooltip"
+                            aria-label="Search for specific values"
+                            block={false}
+                            bsClass="btn"
+                            bsStyle="link"
+                            className="btn-icon-only"
+                            disabled={false}
+                            id="search"
+                            key=".0"
                             onBlur={[Function]}
                             onClick={[Function]}
                             onFocus={[Function]}
                             onKeyPress={[Function]}
+                            onMouseDown={[Function]}
                             onMouseOut={[Function]}
                             onMouseOver={[Function]}
+                            role="link"
                           >
-                            <Button
-                              active={false}
+                            <button
                               aria-describedby={42}
                               aria-label="Search for specific values"
-                              block={false}
-                              bsClass="btn"
-                              bsStyle="link"
-                              className="btn-icon-only"
+                              className="btn-icon-only btn btn-link"
                               disabled={false}
                               id="search"
-                              key=".0"
+                              onBlur={[Function]}
                               onClick={[Function]}
-                              onMouseDown={[Function]}
-                              role="link"
-                            >
-                              <button
-                                aria-describedby={42}
-                                aria-label="Search for specific values"
-                                className="btn-icon-only btn btn-link"
-                                disabled={false}
-                                id="search"
-                                onClick={[Function]}
-                                onMouseDown={[Function]}
-                                role="link"
-                                type="button"
+                              onFocus={[Function]}
+                              onKeyPress={[Function]}
+                              onMouseDown={[Function]}
+                              onMouseOut={[Function]}
+                              onMouseOver={[Function]}
+                              role="link"
+                              type="button"
+                            >
+                              <Icon
+                                key="icon"
+                                name="talend-search"
                               >
-                                <Icon
-                                  key="icon"
+                                <svg
+                                  aria-hidden="true"
+                                  className="theme-tc-svg-icon tc-svg-icon"
+                                  focusable="false"
                                   name="talend-search"
+                                  title={null}
                                 >
-                                  <svg
-                                    aria-hidden="true"
-                                    className="theme-tc-svg-icon tc-svg-icon"
-                                    focusable="false"
-                                    name="talend-search"
-                                    title={null}
-                                  >
-                                    <use
-                                      xlinkHref="#talend-search"
-                                    />
-                                  </svg>
-                                </Icon>
-                              </button>
-                            </Button>
-                          </div>
+                                  <use
+                                    xlinkHref="#talend-search"
+                                  />
+                                </svg>
+                              </Icon>
+                            </button>
+                          </Button>
                         </TooltipTrigger>
                       </ActionButton>
                     </withI18nextTranslation(ActionButton)>
@@ -3360,61 +3352,60 @@ exports[`EnumerationWidget should be in edit mode 1`] = `
                           label="Add item"
                           tooltipPlacement="top"
                         >
-                          <div
+                          <Button
+                            active={false}
                             aria-describedby={42}
-                            className="theme-tc-tooltip"
+                            aria-label="Add item"
+                            block={false}
+                            bsClass="btn"
+                            bsStyle="link"
+                            className="btn-icon-only"
+                            disabled={false}
+                            id="add"
+                            key=".0"
                             onBlur={[Function]}
                             onClick={[Function]}
                             onFocus={[Function]}
                             onKeyPress={[Function]}
+                            onMouseDown={[Function]}
                             onMouseOut={[Function]}
                             onMouseOver={[Function]}
+                            role="link"
                           >
-                            <Button
-                              active={false}
+                            <button
                               aria-describedby={42}
                               aria-label="Add item"
-                              block={false}
-                              bsClass="btn"
-                              bsStyle="link"
-                              className="btn-icon-only"
+                              className="btn-icon-only btn btn-link"
                               disabled={false}
                               id="add"
-                              key=".0"
+                              onBlur={[Function]}
                               onClick={[Function]}
+                              onFocus={[Function]}
+                              onKeyPress={[Function]}
                               onMouseDown={[Function]}
+                              onMouseOut={[Function]}
+                              onMouseOver={[Function]}
                               role="link"
+                              type="button"
                             >
-                              <button
-                                aria-describedby={42}
-                                aria-label="Add item"
-                                className="btn-icon-only btn btn-link"
-                                disabled={false}
-                                id="add"
-                                onClick={[Function]}
-                                onMouseDown={[Function]}
-                                role="link"
-                                type="button"
+                              <Icon
+                                key="icon"
+                                name="talend-plus"
                               >
-                                <Icon
-                                  key="icon"
+                                <svg
+                                  aria-hidden="true"
+                                  className="theme-tc-svg-icon tc-svg-icon"
+                                  focusable="false"
                                   name="talend-plus"
+                                  title={null}
                                 >
-                                  <svg
-                                    aria-hidden="true"
-                                    className="theme-tc-svg-icon tc-svg-icon"
-                                    focusable="false"
-                                    name="talend-plus"
-                                    title={null}
-                                  >
-                                    <use
-                                      xlinkHref="#talend-plus"
-                                    />
-                                  </svg>
-                                </Icon>
-                              </button>
-                            </Button>
-                          </div>
+                                  <use
+                                    xlinkHref="#talend-plus"
+                                  />
+                                </svg>
+                              </Icon>
+                            </button>
+                          </Button>
                         </TooltipTrigger>
                       </ActionButton>
                     </withI18nextTranslation(ActionButton)>
@@ -3968,59 +3959,58 @@ exports[`EnumerationWidget should be in edit mode 1`] = `
                                             label="Validate"
                                             tooltipPlacement="bottom"
                                           >
-                                            <div
+                                            <Button
+                                              active={false}
                                               aria-describedby={42}
-                                              className="theme-tc-tooltip"
+                                              aria-label="Validate"
+                                              block={false}
+                                              bsClass="btn"
+                                              bsStyle="link"
+                                              className="btn-icon-only"
+                                              disabled={false}
+                                              key=".0"
                                               onBlur={[Function]}
                                               onClick={[Function]}
                                               onFocus={[Function]}
                                               onKeyPress={[Function]}
+                                              onMouseDown={[Function]}
                                               onMouseOut={[Function]}
                                               onMouseOver={[Function]}
+                                              role="link"
                                             >
-                                              <Button
-                                                active={false}
+                                              <button
                                                 aria-describedby={42}
                                                 aria-label="Validate"
-                                                block={false}
-                                                bsClass="btn"
-                                                bsStyle="link"
-                                                className="btn-icon-only"
+                                                className="btn-icon-only btn btn-link"
                                                 disabled={false}
-                                                key=".0"
+                                                onBlur={[Function]}
                                                 onClick={[Function]}
+                                                onFocus={[Function]}
+                                                onKeyPress={[Function]}
                                                 onMouseDown={[Function]}
+                                                onMouseOut={[Function]}
+                                                onMouseOver={[Function]}
                                                 role="link"
+                                                type="button"
                                               >
-                                                <button
-                                                  aria-describedby={42}
-                                                  aria-label="Validate"
-                                                  className="btn-icon-only btn btn-link"
-                                                  disabled={false}
-                                                  onClick={[Function]}
-                                                  onMouseDown={[Function]}
-                                                  role="link"
-                                                  type="button"
+                                                <Icon
+                                                  key="icon"
+                                                  name="talend-check"
                                                 >
-                                                  <Icon
-                                                    key="icon"
+                                                  <svg
+                                                    aria-hidden="true"
+                                                    className="theme-tc-svg-icon tc-svg-icon"
+                                                    focusable="false"
                                                     name="talend-check"
+                                                    title={null}
                                                   >
-                                                    <svg
-                                                      aria-hidden="true"
-                                                      className="theme-tc-svg-icon tc-svg-icon"
-                                                      focusable="false"
-                                                      name="talend-check"
-                                                      title={null}
-                                                    >
-                                                      <use
-                                                        xlinkHref="#talend-check"
-                                                      />
-                                                    </svg>
-                                                  </Icon>
-                                                </button>
-                                              </Button>
-                                            </div>
+                                                    <use
+                                                      xlinkHref="#talend-check"
+                                                    />
+                                                  </svg>
+                                                </Icon>
+                                              </button>
+                                            </Button>
                                           </TooltipTrigger>
                                         </ActionButton>
                                       </withI18nextTranslation(ActionButton)>
@@ -4064,59 +4054,58 @@ exports[`EnumerationWidget should be in edit mode 1`] = `
                                             label="Abort"
                                             tooltipPlacement="bottom"
                                           >
-                                            <div
+                                            <Button
+                                              active={false}
                                               aria-describedby={42}
-                                              className="theme-tc-tooltip"
+                                              aria-label="Abort"
+                                              block={false}
+                                              bsClass="btn"
+                                              bsStyle="link"
+                                              className="btn-icon-only"
+                                              disabled={false}
+                                              key=".0"
                                               onBlur={[Function]}
                                               onClick={[Function]}
                                               onFocus={[Function]}
                                               onKeyPress={[Function]}
+                                              onMouseDown={[Function]}
                                               onMouseOut={[Function]}
                                               onMouseOver={[Function]}
+                                              role="link"
                                             >
-                                              <Button
-                                                active={false}
+                                              <button
                                                 aria-describedby={42}
                                                 aria-label="Abort"
-                                                block={false}
-                                                bsClass="btn"
-                                                bsStyle="link"
-                                                className="btn-icon-only"
+                                                className="btn-icon-only btn btn-link"
                                                 disabled={false}
-                                                key=".0"
+                                                onBlur={[Function]}
                                                 onClick={[Function]}
+                                                onFocus={[Function]}
+                                                onKeyPress={[Function]}
                                                 onMouseDown={[Function]}
+                                                onMouseOut={[Function]}
+                                                onMouseOver={[Function]}
                                                 role="link"
+                                                type="button"
                                               >
-                                                <button
-                                                  aria-describedby={42}
-                                                  aria-label="Abort"
-                                                  className="btn-icon-only btn btn-link"
-                                                  disabled={false}
-                                                  onClick={[Function]}
-                                                  onMouseDown={[Function]}
-                                                  role="link"
-                                                  type="button"
+                                                <Icon
+                                                  key="icon"
+                                                  name="talend-cross"
                                                 >
-                                                  <Icon
-                                                    key="icon"
+                                                  <svg
+                                                    aria-hidden="true"
+                                                    className="theme-tc-svg-icon tc-svg-icon"
+                                                    focusable="false"
                                                     name="talend-cross"
+                                                    title={null}
                                                   >
-                                                    <svg
-                                                      aria-hidden="true"
-                                                      className="theme-tc-svg-icon tc-svg-icon"
-                                                      focusable="false"
-                                                      name="talend-cross"
-                                                      title={null}
-                                                    >
-                                                      <use
-                                                        xlinkHref="#talend-cross"
-                                                      />
-                                                    </svg>
-                                                  </Icon>
-                                                </button>
-                                              </Button>
-                                            </div>
+                                                    <use
+                                                      xlinkHref="#talend-cross"
+                                                    />
+                                                  </svg>
+                                                </Icon>
+                                              </button>
+                                            </Button>
                                           </TooltipTrigger>
                                         </ActionButton>
                                       </withI18nextTranslation(ActionButton)>
@@ -4567,59 +4556,58 @@ exports[`EnumerationWidget should be in search mode 1`] = `
                         label="Abort"
                         tooltipPlacement="bottom"
                       >
-                        <div
+                        <Button
+                          active={false}
                           aria-describedby={42}
-                          className="theme-tc-tooltip"
+                          aria-label="Abort"
+                          block={false}
+                          bsClass="btn"
+                          bsStyle="link"
+                          className="btn-icon-only"
+                          disabled={false}
+                          key=".0"
                           onBlur={[Function]}
                           onClick={[Function]}
                           onFocus={[Function]}
                           onKeyPress={[Function]}
+                          onMouseDown={[Function]}
                           onMouseOut={[Function]}
                           onMouseOver={[Function]}
+                          role="link"
                         >
-                          <Button
-                            active={false}
+                          <button
                             aria-describedby={42}
                             aria-label="Abort"
-                            block={false}
-                            bsClass="btn"
-                            bsStyle="link"
-                            className="btn-icon-only"
+                            className="btn-icon-only btn btn-link"
                             disabled={false}
-                            key=".0"
+                            onBlur={[Function]}
                             onClick={[Function]}
+                            onFocus={[Function]}
+                            onKeyPress={[Function]}
                             onMouseDown={[Function]}
+                            onMouseOut={[Function]}
+                            onMouseOver={[Function]}
                             role="link"
+                            type="button"
                           >
-                            <button
-                              aria-describedby={42}
-                              aria-label="Abort"
-                              className="btn-icon-only btn btn-link"
-                              disabled={false}
-                              onClick={[Function]}
-                              onMouseDown={[Function]}
-                              role="link"
-                              type="button"
+                            <Icon
+                              key="icon"
+                              name="talend-cross"
                             >
-                              <Icon
-                                key="icon"
+                              <svg
+                                aria-hidden="true"
+                                className="theme-tc-svg-icon tc-svg-icon"
+                                focusable="false"
                                 name="talend-cross"
+                                title={null}
                               >
-                                <svg
-                                  aria-hidden="true"
-                                  className="theme-tc-svg-icon tc-svg-icon"
-                                  focusable="false"
-                                  name="talend-cross"
-                                  title={null}
-                                >
-                                  <use
-                                    xlinkHref="#talend-cross"
-                                  />
-                                </svg>
-                              </Icon>
-                            </button>
-                          </Button>
-                        </div>
+                                <use
+                                  xlinkHref="#talend-cross"
+                                />
+                              </svg>
+                            </Icon>
+                          </button>
+                        </Button>
                       </TooltipTrigger>
                     </ActionButton>
                   </withI18nextTranslation(ActionButton)>
@@ -5184,61 +5172,60 @@ exports[`EnumerationWidget should delete an item 1`] = `
                           label="Search for specific values"
                           tooltipPlacement="top"
                         >
-                          <div
+                          <Button
+                            active={false}
                             aria-describedby={42}
-                            className="theme-tc-tooltip"
+                            aria-label="Search for specific values"
+                            block={false}
+                            bsClass="btn"
+                            bsStyle="link"
+                            className="btn-icon-only"
+                            disabled={false}
+                            id="search"
+                            key=".0"
                             onBlur={[Function]}
                             onClick={[Function]}
                             onFocus={[Function]}
                             onKeyPress={[Function]}
+                            onMouseDown={[Function]}
                             onMouseOut={[Function]}
                             onMouseOver={[Function]}
+                            role="link"
                           >
-                            <Button
-                              active={false}
+                            <button
                               aria-describedby={42}
                               aria-label="Search for specific values"
-                              block={false}
-                              bsClass="btn"
-                              bsStyle="link"
-                              className="btn-icon-only"
+                              className="btn-icon-only btn btn-link"
                               disabled={false}
                               id="search"
-                              key=".0"
+                              onBlur={[Function]}
                               onClick={[Function]}
+                              onFocus={[Function]}
+                              onKeyPress={[Function]}
                               onMouseDown={[Function]}
+                              onMouseOut={[Function]}
+                              onMouseOver={[Function]}
                               role="link"
+                              type="button"
                             >
-                              <button
-                                aria-describedby={42}
-                                aria-label="Search for specific values"
-                                className="btn-icon-only btn btn-link"
-                                disabled={false}
-                                id="search"
-                                onClick={[Function]}
-                                onMouseDown={[Function]}
-                                role="link"
-                                type="button"
+                              <Icon
+                                key="icon"
+                                name="talend-search"
                               >
-                                <Icon
-                                  key="icon"
+                                <svg
+                                  aria-hidden="true"
+                                  className="theme-tc-svg-icon tc-svg-icon"
+                                  focusable="false"
                                   name="talend-search"
+                                  title={null}
                                 >
-                                  <svg
-                                    aria-hidden="true"
-                                    className="theme-tc-svg-icon tc-svg-icon"
-                                    focusable="false"
-                                    name="talend-search"
-                                    title={null}
-                                  >
-                                    <use
-                                      xlinkHref="#talend-search"
-                                    />
-                                  </svg>
-                                </Icon>
-                              </button>
-                            </Button>
-                          </div>
+                                  <use
+                                    xlinkHref="#talend-search"
+                                  />
+                                </svg>
+                              </Icon>
+                            </button>
+                          </Button>
                         </TooltipTrigger>
                       </ActionButton>
                     </withI18nextTranslation(ActionButton)>
@@ -5286,61 +5273,60 @@ exports[`EnumerationWidget should delete an item 1`] = `
                           label="Add item"
                           tooltipPlacement="top"
                         >
-                          <div
+                          <Button
+                            active={false}
                             aria-describedby={42}
-                            className="theme-tc-tooltip"
+                            aria-label="Add item"
+                            block={false}
+                            bsClass="btn"
+                            bsStyle="link"
+                            className="btn-icon-only"
+                            disabled={false}
+                            id="add"
+                            key=".0"
                             onBlur={[Function]}
                             onClick={[Function]}
                             onFocus={[Function]}
                             onKeyPress={[Function]}
+                            onMouseDown={[Function]}
                             onMouseOut={[Function]}
                             onMouseOver={[Function]}
+                            role="link"
                           >
-                            <Button
-                              active={false}
+                            <button
                               aria-describedby={42}
                               aria-label="Add item"
-                              block={false}
-                              bsClass="btn"
-                              bsStyle="link"
-                              className="btn-icon-only"
+                              className="btn-icon-only btn btn-link"
                               disabled={false}
                               id="add"
-                              key=".0"
+                              onBlur={[Function]}
                               onClick={[Function]}
+                              onFocus={[Function]}
+                              onKeyPress={[Function]}
                               onMouseDown={[Function]}
+                              onMouseOut={[Function]}
+                              onMouseOver={[Function]}
                               role="link"
+                              type="button"
                             >
-                              <button
-                                aria-describedby={42}
-                                aria-label="Add item"
-                                className="btn-icon-only btn btn-link"
-                                disabled={false}
-                                id="add"
-                                onClick={[Function]}
-                                onMouseDown={[Function]}
-                                role="link"
-                                type="button"
+                              <Icon
+                                key="icon"
+                                name="talend-plus"
                               >
-                                <Icon
-                                  key="icon"
+                                <svg
+                                  aria-hidden="true"
+                                  className="theme-tc-svg-icon tc-svg-icon"
+                                  focusable="false"
                                   name="talend-plus"
+                                  title={null}
                                 >
-                                  <svg
-                                    aria-hidden="true"
-                                    className="theme-tc-svg-icon tc-svg-icon"
-                                    focusable="false"
-                                    name="talend-plus"
-                                    title={null}
-                                  >
-                                    <use
-                                      xlinkHref="#talend-plus"
-                                    />
-                                  </svg>
-                                </Icon>
-                              </button>
-                            </Button>
-                          </div>
+                                  <use
+                                    xlinkHref="#talend-plus"
+                                  />
+                                </svg>
+                              </Icon>
+                            </button>
+                          </Button>
                         </TooltipTrigger>
                       </ActionButton>
                     </withI18nextTranslation(ActionButton)>
@@ -5937,61 +5923,60 @@ exports[`EnumerationWidget should delete an item with callHandler 1`] = `
                           label="Search for specific values"
                           tooltipPlacement="top"
                         >
-                          <div
+                          <Button
+                            active={false}
                             aria-describedby={42}
-                            className="theme-tc-tooltip"
+                            aria-label="Search for specific values"
+                            block={false}
+                            bsClass="btn"
+                            bsStyle="link"
+                            className="btn-icon-only"
+                            disabled={false}
+                            id="search"
+                            key=".0"
                             onBlur={[Function]}
                             onClick={[Function]}
                             onFocus={[Function]}
                             onKeyPress={[Function]}
+                            onMouseDown={[Function]}
                             onMouseOut={[Function]}
                             onMouseOver={[Function]}
+                            role="link"
                           >
-                            <Button
-                              active={false}
+                            <button
                               aria-describedby={42}
                               aria-label="Search for specific values"
-                              block={false}
-                              bsClass="btn"
-                              bsStyle="link"
-                              className="btn-icon-only"
+                              className="btn-icon-only btn btn-link"
                               disabled={false}
                               id="search"
-                              key=".0"
+                              onBlur={[Function]}
                               onClick={[Function]}
+                              onFocus={[Function]}
+                              onKeyPress={[Function]}
                               onMouseDown={[Function]}
+                              onMouseOut={[Function]}
+                              onMouseOver={[Function]}
                               role="link"
+                              type="button"
                             >
-                              <button
-                                aria-describedby={42}
-                                aria-label="Search for specific values"
-                                className="btn-icon-only btn btn-link"
-                                disabled={false}
-                                id="search"
-                                onClick={[Function]}
-                                onMouseDown={[Function]}
-                                role="link"
-                                type="button"
+                              <Icon
+                                key="icon"
+                                name="talend-search"
                               >
-                                <Icon
-                                  key="icon"
+                                <svg
+                                  aria-hidden="true"
+                                  className="theme-tc-svg-icon tc-svg-icon"
+                                  focusable="false"
                                   name="talend-search"
+                                  title={null}
                                 >
-                                  <svg
-                                    aria-hidden="true"
-                                    className="theme-tc-svg-icon tc-svg-icon"
-                                    focusable="false"
-                                    name="talend-search"
-                                    title={null}
-                                  >
-                                    <use
-                                      xlinkHref="#talend-search"
-                                    />
-                                  </svg>
-                                </Icon>
-                              </button>
-                            </Button>
-                          </div>
+                                  <use
+                                    xlinkHref="#talend-search"
+                                  />
+                                </svg>
+                              </Icon>
+                            </button>
+                          </Button>
                         </TooltipTrigger>
                       </ActionButton>
                     </withI18nextTranslation(ActionButton)>
@@ -6039,61 +6024,60 @@ exports[`EnumerationWidget should delete an item with callHandler 1`] = `
                           label="Add item"
                           tooltipPlacement="top"
                         >
-                          <div
+                          <Button
+                            active={false}
                             aria-describedby={42}
-                            className="theme-tc-tooltip"
+                            aria-label="Add item"
+                            block={false}
+                            bsClass="btn"
+                            bsStyle="link"
+                            className="btn-icon-only"
+                            disabled={false}
+                            id="add"
+                            key=".0"
                             onBlur={[Function]}
                             onClick={[Function]}
                             onFocus={[Function]}
                             onKeyPress={[Function]}
+                            onMouseDown={[Function]}
                             onMouseOut={[Function]}
                             onMouseOver={[Function]}
+                            role="link"
                           >
-                            <Button
-                              active={false}
+                            <button
                               aria-describedby={42}
                               aria-label="Add item"
-                              block={false}
-                              bsClass="btn"
-                              bsStyle="link"
-                              className="btn-icon-only"
+                              className="btn-icon-only btn btn-link"
                               disabled={false}
                               id="add"
-                              key=".0"
+                              onBlur={[Function]}
                               onClick={[Function]}
+                              onFocus={[Function]}
+                              onKeyPress={[Function]}
                               onMouseDown={[Function]}
+                              onMouseOut={[Function]}
+                              onMouseOver={[Function]}
                               role="link"
+                              type="button"
                             >
-                              <button
-                                aria-describedby={42}
-                                aria-label="Add item"
-                                className="btn-icon-only btn btn-link"
-                                disabled={false}
-                                id="add"
-                                onClick={[Function]}
-                                onMouseDown={[Function]}
-                                role="link"
-                                type="button"
+                              <Icon
+                                key="icon"
+                                name="talend-plus"
                               >
-                                <Icon
-                                  key="icon"
+                                <svg
+                                  aria-hidden="true"
+                                  className="theme-tc-svg-icon tc-svg-icon"
+                                  focusable="false"
                                   name="talend-plus"
+                                  title={null}
                                 >
-                                  <svg
-                                    aria-hidden="true"
-                                    className="theme-tc-svg-icon tc-svg-icon"
-                                    focusable="false"
-                                    name="talend-plus"
-                                    title={null}
-                                  >
-                                    <use
-                                      xlinkHref="#talend-plus"
-                                    />
-                                  </svg>
-                                </Icon>
-                              </button>
-                            </Button>
-                          </div>
+                                  <use
+                                    xlinkHref="#talend-plus"
+                                  />
+                                </svg>
+                              </Icon>
+                            </button>
+                          </Button>
                         </TooltipTrigger>
                       </ActionButton>
                     </withI18nextTranslation(ActionButton)>
@@ -6591,9 +6575,10 @@ exports[`EnumerationWidget should delete an item with callHandler 1`] = `
                                             label="Loading"
                                             tooltipPlacement="bottom"
                                           >
-                                            <div
+                                            <span
                                               aria-describedby={42}
-                                              className="theme-tc-tooltip"
+                                              className="theme-tc-action-disabled-btn-container tc-action-disabled-btn-container"
+                                              key=".0"
                                               onBlur={[Function]}
                                               onClick={[Function]}
                                               onFocus={[Function]}
@@ -6601,69 +6586,63 @@ exports[`EnumerationWidget should delete an item with callHandler 1`] = `
                                               onMouseOut={[Function]}
                                               onMouseOver={[Function]}
                                             >
-                                              <span
-                                                aria-describedby={42}
-                                                className="theme-tc-action-disabled-btn-container tc-action-disabled-btn-container"
-                                                key=".0"
+                                              <Button
+                                                active={false}
+                                                aria-label="Loading (in progress)"
+                                                block={false}
+                                                bsClass="btn"
+                                                bsStyle="link"
+                                                className="btn-icon-only theme-btn-disabled"
+                                                disabled={true}
+                                                onClick={[Function]}
+                                                onMouseDown={[Function]}
+                                                role="link"
                                               >
-                                                <Button
-                                                  active={false}
+                                                <button
                                                   aria-label="Loading (in progress)"
-                                                  block={false}
-                                                  bsClass="btn"
-                                                  bsStyle="link"
-                                                  className="btn-icon-only theme-btn-disabled"
+                                                  className="btn-icon-only theme-btn-disabled btn btn-link"
                                                   disabled={true}
                                                   onClick={[Function]}
                                                   onMouseDown={[Function]}
                                                   role="link"
+                                                  type="button"
                                                 >
-                                                  <button
-                                                    aria-label="Loading (in progress)"
-                                                    className="btn-icon-only theme-btn-disabled btn btn-link"
-                                                    disabled={true}
-                                                    onClick={[Function]}
-                                                    onMouseDown={[Function]}
-                                                    role="link"
-                                                    type="button"
+                                                  <withI18nextTranslation(CircularProgress)
+                                                    key="icon"
+                                                    size="small"
                                                   >
-                                                    <withI18nextTranslation(CircularProgress)
-                                                      key="icon"
+                                                    <CircularProgress
+                                                      i18n={Object {}}
                                                       size="small"
+                                                      t={[Function]}
+                                                      tReady={true}
                                                     >
-                                                      <CircularProgress
-                                                        i18n={Object {}}
-                                                        size="small"
-                                                        t={[Function]}
-                                                        tReady={true}
+                                                      <svg
+                                                        aria-busy="true"
+                                                        aria-label="Loading "
+                                                        className="tc-circular-progress theme-loader theme-animate theme-small"
+                                                        focusable="false"
+                                                        viewBox="0 0 50 50"
                                                       >
-                                                        <svg
-                                                          aria-busy="true"
-                                                          aria-label="Loading "
-                                                          className="tc-circular-progress theme-loader theme-animate theme-small"
-                                                          focusable="false"
-                                                          viewBox="0 0 50 50"
-                                                        >
-                                                          <circle
-                                                            className="theme-path"
-                                                            cx={25}
-                                                            cy={25}
-                                                            fill="none"
-                                                            r={20}
-                                                            style={
-                                                              Object {
-                                                                "strokeDasharray": 12.566370614359172,
-                                                                "strokeDashoffset": 0,
-                                                              }
+                                                        <circle
+                                                          className="theme-path"
+                                                          cx={25}
+                                                          cy={25}
+                                                          fill="none"
+                                                          r={20}
+                                                          style={
+                                                            Object {
+                                                              "strokeDasharray": 12.566370614359172,
+                                                              "strokeDashoffset": 0,
                                                             }
-                                                          />
-                                                        </svg>
-                                                      </CircularProgress>
-                                                    </withI18nextTranslation(CircularProgress)>
-                                                  </button>
-                                                </Button>
-                                              </span>
-                                            </div>
+                                                          }
+                                                        />
+                                                      </svg>
+                                                    </CircularProgress>
+                                                  </withI18nextTranslation(CircularProgress)>
+                                                </button>
+                                              </Button>
+                                            </span>
                                           </TooltipTrigger>
                                         </ActionButton>
                                       </withI18nextTranslation(ActionButton)>
@@ -7136,59 +7115,58 @@ exports[`EnumerationWidget should select an item 1`] = `
                         label="Remove selected values"
                         tooltipPlacement="bottom"
                       >
-                        <div
+                        <Button
+                          active={false}
                           aria-describedby={42}
-                          className="theme-tc-tooltip"
+                          aria-label="Remove selected values"
+                          block={false}
+                          bsClass="btn"
+                          bsStyle="link"
+                          className="btn-icon-only"
+                          disabled={false}
+                          key=".0"
                           onBlur={[Function]}
                           onClick={[Function]}
                           onFocus={[Function]}
                           onKeyPress={[Function]}
+                          onMouseDown={[Function]}
                           onMouseOut={[Function]}
                           onMouseOver={[Function]}
+                          role="link"
                         >
-                          <Button
-                            active={false}
+                          <button
                             aria-describedby={42}
                             aria-label="Remove selected values"
-                            block={false}
-                            bsClass="btn"
-                            bsStyle="link"
-                            className="btn-icon-only"
+                            className="btn-icon-only btn btn-link"
                             disabled={false}
-                            key=".0"
+                            onBlur={[Function]}
                             onClick={[Function]}
+                            onFocus={[Function]}
+                            onKeyPress={[Function]}
                             onMouseDown={[Function]}
+                            onMouseOut={[Function]}
+                            onMouseOver={[Function]}
                             role="link"
+                            type="button"
                           >
-                            <button
-                              aria-describedby={42}
-                              aria-label="Remove selected values"
-                              className="btn-icon-only btn btn-link"
-                              disabled={false}
-                              onClick={[Function]}
-                              onMouseDown={[Function]}
-                              role="link"
-                              type="button"
+                            <Icon
+                              key="icon"
+                              name="talend-trash"
                             >
-                              <Icon
-                                key="icon"
+                              <svg
+                                aria-hidden="true"
+                                className="theme-tc-svg-icon tc-svg-icon"
+                                focusable="false"
                                 name="talend-trash"
+                                title={null}
                               >
-                                <svg
-                                  aria-hidden="true"
-                                  className="theme-tc-svg-icon tc-svg-icon"
-                                  focusable="false"
-                                  name="talend-trash"
-                                  title={null}
-                                >
-                                  <use
-                                    xlinkHref="#talend-trash"
-                                  />
-                                </svg>
-                              </Icon>
-                            </button>
-                          </Button>
-                        </div>
+                                <use
+                                  xlinkHref="#talend-trash"
+                                />
+                              </svg>
+                            </Icon>
+                          </button>
+                        </Button>
                       </TooltipTrigger>
                     </ActionButton>
                   </withI18nextTranslation(ActionButton)>
@@ -7759,59 +7737,58 @@ exports[`EnumerationWidget should select an item 1`] = `
                                             label="Edit"
                                             tooltipPlacement="bottom"
                                           >
-                                            <div
+                                            <Button
+                                              active={false}
                                               aria-describedby={42}
-                                              className="theme-tc-tooltip"
+                                              aria-label="Edit"
+                                              block={false}
+                                              bsClass="btn"
+                                              bsStyle="link"
+                                              className="btn-icon-only"
+                                              disabled={false}
+                                              key=".0"
                                               onBlur={[Function]}
                                               onClick={[Function]}
                                               onFocus={[Function]}
                                               onKeyPress={[Function]}
+                                              onMouseDown={[Function]}
                                               onMouseOut={[Function]}
                                               onMouseOver={[Function]}
+                                              role="link"
                                             >
-                                              <Button
-                                                active={false}
+                                              <button
                                                 aria-describedby={42}
                                                 aria-label="Edit"
-                                                block={false}
-                                                bsClass="btn"
-                                                bsStyle="link"
-                                                className="btn-icon-only"
+                                                className="btn-icon-only btn btn-link"
                                                 disabled={false}
-                                                key=".0"
+                                                onBlur={[Function]}
                                                 onClick={[Function]}
+                                                onFocus={[Function]}
+                                                onKeyPress={[Function]}
                                                 onMouseDown={[Function]}
+                                                onMouseOut={[Function]}
+                                                onMouseOver={[Function]}
                                                 role="link"
+                                                type="button"
                                               >
-                                                <button
-                                                  aria-describedby={42}
-                                                  aria-label="Edit"
-                                                  className="btn-icon-only btn btn-link"
-                                                  disabled={false}
-                                                  onClick={[Function]}
-                                                  onMouseDown={[Function]}
-                                                  role="link"
-                                                  type="button"
+                                                <Icon
+                                                  key="icon"
+                                                  name="talend-pencil"
                                                 >
-                                                  <Icon
-                                                    key="icon"
+                                                  <svg
+                                                    aria-hidden="true"
+                                                    className="theme-tc-svg-icon tc-svg-icon"
+                                                    focusable="false"
                                                     name="talend-pencil"
+                                                    title={null}
                                                   >
-                                                    <svg
-                                                      aria-hidden="true"
-                                                      className="theme-tc-svg-icon tc-svg-icon"
-                                                      focusable="false"
-                                                      name="talend-pencil"
-                                                      title={null}
-                                                    >
-                                                      <use
-                                                        xlinkHref="#talend-pencil"
-                                                      />
-                                                    </svg>
-                                                  </Icon>
-                                                </button>
-                                              </Button>
-                                            </div>
+                                                    <use
+                                                      xlinkHref="#talend-pencil"
+                                                    />
+                                                  </svg>
+                                                </Icon>
+                                              </button>
+                                            </Button>
                                           </TooltipTrigger>
                                         </ActionButton>
                                       </withI18nextTranslation(ActionButton)>
@@ -7853,59 +7830,58 @@ exports[`EnumerationWidget should select an item 1`] = `
                                             label="Remove value"
                                             tooltipPlacement="bottom"
                                           >
-                                            <div
+                                            <Button
+                                              active={false}
                                               aria-describedby={42}
-                                              className="theme-tc-tooltip"
+                                              aria-label="Remove value"
+                                              block={false}
+                                              bsClass="btn"
+                                              bsStyle="link"
+                                              className="btn-icon-only"
+                                              disabled={false}
+                                              key=".0"
                                               onBlur={[Function]}
                                               onClick={[Function]}
                                               onFocus={[Function]}
                                               onKeyPress={[Function]}
+                                              onMouseDown={[Function]}
                                               onMouseOut={[Function]}
                                               onMouseOver={[Function]}
+                                              role="link"
                                             >
-                                              <Button
-                                                active={false}
+                                              <button
                                                 aria-describedby={42}
                                                 aria-label="Remove value"
-                                                block={false}
-                                                bsClass="btn"
-                                                bsStyle="link"
-                                                className="btn-icon-only"
+                                                className="btn-icon-only btn btn-link"
                                                 disabled={false}
-                                                key=".0"
+                                                onBlur={[Function]}
                                                 onClick={[Function]}
+                                                onFocus={[Function]}
+                                                onKeyPress={[Function]}
                                                 onMouseDown={[Function]}
+                                                onMouseOut={[Function]}
+                                                onMouseOver={[Function]}
                                                 role="link"
+                                                type="button"
                                               >
-                                                <button
-                                                  aria-describedby={42}
-                                                  aria-label="Remove value"
-                                                  className="btn-icon-only btn btn-link"
-                                                  disabled={false}
-                                                  onClick={[Function]}
-                                                  onMouseDown={[Function]}
-                                                  role="link"
-                                                  type="button"
+                                                <Icon
+                                                  key="icon"
+                                                  name="talend-trash"
                                                 >
-                                                  <Icon
-                                                    key="icon"
+                                                  <svg
+                                                    aria-hidden="true"
+                                                    className="theme-tc-svg-icon tc-svg-icon"
+                                                    focusable="false"
                                                     name="talend-trash"
+                                                    title={null}
                                                   >
-                                                    <svg
-                                                      aria-hidden="true"
-                                                      className="theme-tc-svg-icon tc-svg-icon"
-                                                      focusable="false"
-                                                      name="talend-trash"
-                                                      title={null}
-                                                    >
-                                                      <use
-                                                        xlinkHref="#talend-trash"
-                                                      />
-                                                    </svg>
-                                                  </Icon>
-                                                </button>
-                                              </Button>
-                                            </div>
+                                                    <use
+                                                      xlinkHref="#talend-trash"
+                                                    />
+                                                  </svg>
+                                                </Icon>
+                                              </button>
+                                            </Button>
                                           </TooltipTrigger>
                                         </ActionButton>
                                       </withI18nextTranslation(ActionButton)>
@@ -8427,61 +8403,60 @@ exports[`EnumerationWidget should select multiple  items 1`] = `
                           label="Search for specific values"
                           tooltipPlacement="top"
                         >
-                          <div
+                          <Button
+                            active={false}
                             aria-describedby={42}
-                            className="theme-tc-tooltip"
+                            aria-label="Search for specific values"
+                            block={false}
+                            bsClass="btn"
+                            bsStyle="link"
+                            className="btn-icon-only"
+                            disabled={false}
+                            id="search"
+                            key=".0"
                             onBlur={[Function]}
                             onClick={[Function]}
                             onFocus={[Function]}
                             onKeyPress={[Function]}
+                            onMouseDown={[Function]}
                             onMouseOut={[Function]}
                             onMouseOver={[Function]}
+                            role="link"
                           >
-                            <Button
-                              active={false}
+                            <button
                               aria-describedby={42}
                               aria-label="Search for specific values"
-                              block={false}
-                              bsClass="btn"
-                              bsStyle="link"
-                              className="btn-icon-only"
+                              className="btn-icon-only btn btn-link"
                               disabled={false}
                               id="search"
-                              key=".0"
+                              onBlur={[Function]}
                               onClick={[Function]}
+                              onFocus={[Function]}
+                              onKeyPress={[Function]}
                               onMouseDown={[Function]}
+                              onMouseOut={[Function]}
+                              onMouseOver={[Function]}
                               role="link"
+                              type="button"
                             >
-                              <button
-                                aria-describedby={42}
-                                aria-label="Search for specific values"
-                                className="btn-icon-only btn btn-link"
-                                disabled={false}
-                                id="search"
-                                onClick={[Function]}
-                                onMouseDown={[Function]}
-                                role="link"
-                                type="button"
+                              <Icon
+                                key="icon"
+                                name="talend-search"
                               >
-                                <Icon
-                                  key="icon"
+                                <svg
+                                  aria-hidden="true"
+                                  className="theme-tc-svg-icon tc-svg-icon"
+                                  focusable="false"
                                   name="talend-search"
+                                  title={null}
                                 >
-                                  <svg
-                                    aria-hidden="true"
-                                    className="theme-tc-svg-icon tc-svg-icon"
-                                    focusable="false"
-                                    name="talend-search"
-                                    title={null}
-                                  >
-                                    <use
-                                      xlinkHref="#talend-search"
-                                    />
-                                  </svg>
-                                </Icon>
-                              </button>
-                            </Button>
-                          </div>
+                                  <use
+                                    xlinkHref="#talend-search"
+                                  />
+                                </svg>
+                              </Icon>
+                            </button>
+                          </Button>
                         </TooltipTrigger>
                       </ActionButton>
                     </withI18nextTranslation(ActionButton)>
@@ -8529,61 +8504,60 @@ exports[`EnumerationWidget should select multiple  items 1`] = `
                           label="Add item"
                           tooltipPlacement="top"
                         >
-                          <div
+                          <Button
+                            active={false}
                             aria-describedby={42}
-                            className="theme-tc-tooltip"
+                            aria-label="Add item"
+                            block={false}
+                            bsClass="btn"
+                            bsStyle="link"
+                            className="btn-icon-only"
+                            disabled={false}
+                            id="add"
+                            key=".0"
                             onBlur={[Function]}
                             onClick={[Function]}
                             onFocus={[Function]}
                             onKeyPress={[Function]}
+                            onMouseDown={[Function]}
                             onMouseOut={[Function]}
                             onMouseOver={[Function]}
+                            role="link"
                           >
-                            <Button
-                              active={false}
+                            <button
                               aria-describedby={42}
                               aria-label="Add item"
-                              block={false}
-                              bsClass="btn"
-                              bsStyle="link"
-                              className="btn-icon-only"
+                              className="btn-icon-only btn btn-link"
                               disabled={false}
                               id="add"
-                              key=".0"
+                              onBlur={[Function]}
                               onClick={[Function]}
+                              onFocus={[Function]}
+                              onKeyPress={[Function]}
                               onMouseDown={[Function]}
+                              onMouseOut={[Function]}
+                              onMouseOver={[Function]}
                               role="link"
+                              type="button"
                             >
-                              <button
-                                aria-describedby={42}
-                                aria-label="Add item"
-                                className="btn-icon-only btn btn-link"
-                                disabled={false}
-                                id="add"
-                                onClick={[Function]}
-                                onMouseDown={[Function]}
-                                role="link"
-                                type="button"
+                              <Icon
+                                key="icon"
+                                name="talend-plus"
                               >
-                                <Icon
-                                  key="icon"
+                                <svg
+                                  aria-hidden="true"
+                                  className="theme-tc-svg-icon tc-svg-icon"
+                                  focusable="false"
                                   name="talend-plus"
+                                  title={null}
                                 >
-                                  <svg
-                                    aria-hidden="true"
-                                    className="theme-tc-svg-icon tc-svg-icon"
-                                    focusable="false"
-                                    name="talend-plus"
-                                    title={null}
-                                  >
-                                    <use
-                                      xlinkHref="#talend-plus"
-                                    />
-                                  </svg>
-                                </Icon>
-                              </button>
-                            </Button>
-                          </div>
+                                  <use
+                                    xlinkHref="#talend-plus"
+                                  />
+                                </svg>
+                              </Icon>
+                            </button>
+                          </Button>
                         </TooltipTrigger>
                       </ActionButton>
                     </withI18nextTranslation(ActionButton)>
@@ -9191,59 +9165,58 @@ exports[`EnumerationWidget should select multiple  items 1`] = `
                                             label="Edit"
                                             tooltipPlacement="bottom"
                                           >
-                                            <div
+                                            <Button
+                                              active={false}
                                               aria-describedby={42}
-                                              className="theme-tc-tooltip"
+                                              aria-label="Edit"
+                                              block={false}
+                                              bsClass="btn"
+                                              bsStyle="link"
+                                              className="btn-icon-only"
+                                              disabled={false}
+                                              key=".0"
                                               onBlur={[Function]}
                                               onClick={[Function]}
                                               onFocus={[Function]}
                                               onKeyPress={[Function]}
+                                              onMouseDown={[Function]}
                                               onMouseOut={[Function]}
                                               onMouseOver={[Function]}
+                                              role="link"
                                             >
-                                              <Button
-                                                active={false}
+                                              <button
                                                 aria-describedby={42}
                                                 aria-label="Edit"
-                                                block={false}
-                                                bsClass="btn"
-                                                bsStyle="link"
-                                                className="btn-icon-only"
+                                                className="btn-icon-only btn btn-link"
                                                 disabled={false}
-                                                key=".0"
+                                                onBlur={[Function]}
                                                 onClick={[Function]}
+                                                onFocus={[Function]}
+                                                onKeyPress={[Function]}
                                                 onMouseDown={[Function]}
+                                                onMouseOut={[Function]}
+                                                onMouseOver={[Function]}
                                                 role="link"
+                                                type="button"
                                               >
-                                                <button
-                                                  aria-describedby={42}
-                                                  aria-label="Edit"
-                                                  className="btn-icon-only btn btn-link"
-                                                  disabled={false}
-                                                  onClick={[Function]}
-                                                  onMouseDown={[Function]}
-                                                  role="link"
-                                                  type="button"
+                                                <Icon
+                                                  key="icon"
+                                                  name="talend-pencil"
                                                 >
-                                                  <Icon
-                                                    key="icon"
+                                                  <svg
+                                                    aria-hidden="true"
+                                                    className="theme-tc-svg-icon tc-svg-icon"
+                                                    focusable="false"
                                                     name="talend-pencil"
+                                                    title={null}
                                                   >
-                                                    <svg
-                                                      aria-hidden="true"
-                                                      className="theme-tc-svg-icon tc-svg-icon"
-                                                      focusable="false"
-                                                      name="talend-pencil"
-                                                      title={null}
-                                                    >
-                                                      <use
-                                                        xlinkHref="#talend-pencil"
-                                                      />
-                                                    </svg>
-                                                  </Icon>
-                                                </button>
-                                              </Button>
-                                            </div>
+                                                    <use
+                                                      xlinkHref="#talend-pencil"
+                                                    />
+                                                  </svg>
+                                                </Icon>
+                                              </button>
+                                            </Button>
                                           </TooltipTrigger>
                                         </ActionButton>
                                       </withI18nextTranslation(ActionButton)>
@@ -9285,59 +9258,58 @@ exports[`EnumerationWidget should select multiple  items 1`] = `
                                             label="Remove value"
                                             tooltipPlacement="bottom"
                                           >
-                                            <div
+                                            <Button
+                                              active={false}
                                               aria-describedby={42}
-                                              className="theme-tc-tooltip"
+                                              aria-label="Remove value"
+                                              block={false}
+                                              bsClass="btn"
+                                              bsStyle="link"
+                                              className="btn-icon-only"
+                                              disabled={false}
+                                              key=".0"
                                               onBlur={[Function]}
                                               onClick={[Function]}
                                               onFocus={[Function]}
                                               onKeyPress={[Function]}
+                                              onMouseDown={[Function]}
                                               onMouseOut={[Function]}
                                               onMouseOver={[Function]}
+                                              role="link"
                                             >
-                                              <Button
-                                                active={false}
+                                              <button
                                                 aria-describedby={42}
                                                 aria-label="Remove value"
-                                                block={false}
-                                                bsClass="btn"
-                                                bsStyle="link"
-                                                className="btn-icon-only"
+                                                className="btn-icon-only btn btn-link"
                                                 disabled={false}
-                                                key=".0"
+                                                onBlur={[Function]}
                                                 onClick={[Function]}
+                                                onFocus={[Function]}
+                                                onKeyPress={[Function]}
                                                 onMouseDown={[Function]}
+                                                onMouseOut={[Function]}
+                                                onMouseOver={[Function]}
                                                 role="link"
+                                                type="button"
                                               >
-                                                <button
-                                                  aria-describedby={42}
-                                                  aria-label="Remove value"
-                                                  className="btn-icon-only btn btn-link"
-                                                  disabled={false}
-                                                  onClick={[Function]}
-                                                  onMouseDown={[Function]}
-                                                  role="link"
-                                                  type="button"
+                                                <Icon
+                                                  key="icon"
+                                                  name="talend-trash"
                                                 >
-                                                  <Icon
-                                                    key="icon"
+                                                  <svg
+                                                    aria-hidden="true"
+                                                    className="theme-tc-svg-icon tc-svg-icon"
+                                                    focusable="false"
                                                     name="talend-trash"
+                                                    title={null}
                                                   >
-                                                    <svg
-                                                      aria-hidden="true"
-                                                      className="theme-tc-svg-icon tc-svg-icon"
-                                                      focusable="false"
-                                                      name="talend-trash"
-                                                      title={null}
-                                                    >
-                                                      <use
-                                                        xlinkHref="#talend-trash"
-                                                      />
-                                                    </svg>
-                                                  </Icon>
-                                                </button>
-                                              </Button>
-                                            </div>
+                                                    <use
+                                                      xlinkHref="#talend-trash"
+                                                    />
+                                                  </svg>
+                                                </Icon>
+                                              </button>
+                                            </Button>
                                           </TooltipTrigger>
                                         </ActionButton>
                                       </withI18nextTranslation(ActionButton)>
@@ -9562,59 +9534,58 @@ exports[`EnumerationWidget should select multiple  items 1`] = `
                                             label="Edit"
                                             tooltipPlacement="bottom"
                                           >
-                                            <div
+                                            <Button
+                                              active={false}
                                               aria-describedby={42}
-                                              className="theme-tc-tooltip"
+                                              aria-label="Edit"
+                                              block={false}
+                                              bsClass="btn"
+                                              bsStyle="link"
+                                              className="btn-icon-only"
+                                              disabled={false}
+                                              key=".0"
                                               onBlur={[Function]}
                                               onClick={[Function]}
                                               onFocus={[Function]}
                                               onKeyPress={[Function]}
+                                              onMouseDown={[Function]}
                                               onMouseOut={[Function]}
                                               onMouseOver={[Function]}
+                                              role="link"
                                             >
-                                              <Button
-                                                active={false}
+                                              <button
                                                 aria-describedby={42}
                                                 aria-label="Edit"
-                                                block={false}
-                                                bsClass="btn"
-                                                bsStyle="link"
-                                                className="btn-icon-only"
+                                                className="btn-icon-only btn btn-link"
                                                 disabled={false}
-                                                key=".0"
+                                                onBlur={[Function]}
                                                 onClick={[Function]}
+                                                onFocus={[Function]}
+                                                onKeyPress={[Function]}
                                                 onMouseDown={[Function]}
+                                                onMouseOut={[Function]}
+                                                onMouseOver={[Function]}
                                                 role="link"
+                                                type="button"
                                               >
-                                                <button
-                                                  aria-describedby={42}
-                                                  aria-label="Edit"
-                                                  className="btn-icon-only btn btn-link"
-                                                  disabled={false}
-                                                  onClick={[Function]}
-                                                  onMouseDown={[Function]}
-                                                  role="link"
-                                                  type="button"
+                                                <Icon
+                                                  key="icon"
+                                                  name="talend-pencil"
                                                 >
-                                                  <Icon
-                                                    key="icon"
+                                                  <svg
+                                                    aria-hidden="true"
+                                                    className="theme-tc-svg-icon tc-svg-icon"
+                                                    focusable="false"
                                                     name="talend-pencil"
+                                                    title={null}
                                                   >
-                                                    <svg
-                                                      aria-hidden="true"
-                                                      className="theme-tc-svg-icon tc-svg-icon"
-                                                      focusable="false"
-                                                      name="talend-pencil"
-                                                      title={null}
-                                                    >
-                                                      <use
-                                                        xlinkHref="#talend-pencil"
-                                                      />
-                                                    </svg>
-                                                  </Icon>
-                                                </button>
-                                              </Button>
-                                            </div>
+                                                    <use
+                                                      xlinkHref="#talend-pencil"
+                                                    />
+                                                  </svg>
+                                                </Icon>
+                                              </button>
+                                            </Button>
                                           </TooltipTrigger>
                                         </ActionButton>
                                       </withI18nextTranslation(ActionButton)>
@@ -9656,59 +9627,58 @@ exports[`EnumerationWidget should select multiple  items 1`] = `
                                             label="Remove value"
                                             tooltipPlacement="bottom"
                                           >
-                                            <div
+                                            <Button
+                                              active={false}
                                               aria-describedby={42}
-                                              className="theme-tc-tooltip"
+                                              aria-label="Remove value"
+                                              block={false}
+                                              bsClass="btn"
+                                              bsStyle="link"
+                                              className="btn-icon-only"
+                                              disabled={false}
+                                              key=".0"
                                               onBlur={[Function]}
                                               onClick={[Function]}
                                               onFocus={[Function]}
                                               onKeyPress={[Function]}
+                                              onMouseDown={[Function]}
                                               onMouseOut={[Function]}
                                               onMouseOver={[Function]}
+                                              role="link"
                                             >
-                                              <Button
-                                                active={false}
+                                              <button
                                                 aria-describedby={42}
                                                 aria-label="Remove value"
-                                                block={false}
-                                                bsClass="btn"
-                                                bsStyle="link"
-                                                className="btn-icon-only"
+                                                className="btn-icon-only btn btn-link"
                                                 disabled={false}
-                                                key=".0"
+                                                onBlur={[Function]}
                                                 onClick={[Function]}
+                                                onFocus={[Function]}
+                                                onKeyPress={[Function]}
                                                 onMouseDown={[Function]}
+                                                onMouseOut={[Function]}
+                                                onMouseOver={[Function]}
                                                 role="link"
+                                                type="button"
                                               >
-                                                <button
-                                                  aria-describedby={42}
-                                                  aria-label="Remove value"
-                                                  className="btn-icon-only btn btn-link"
-                                                  disabled={false}
-                                                  onClick={[Function]}
-                                                  onMouseDown={[Function]}
-                                                  role="link"
-                                                  type="button"
+                                                <Icon
+                                                  key="icon"
+                                                  name="talend-trash"
                                                 >
-                                                  <Icon
-                                                    key="icon"
+                                                  <svg
+                                                    aria-hidden="true"
+                                                    className="theme-tc-svg-icon tc-svg-icon"
+                                                    focusable="false"
                                                     name="talend-trash"
+                                                    title={null}
                                                   >
-                                                    <svg
-                                                      aria-hidden="true"
-                                                      className="theme-tc-svg-icon tc-svg-icon"
-                                                      focusable="false"
-                                                      name="talend-trash"
-                                                      title={null}
-                                                    >
-                                                      <use
-                                                        xlinkHref="#talend-trash"
-                                                      />
-                                                    </svg>
-                                                  </Icon>
-                                                </button>
-                                              </Button>
-                                            </div>
+                                                    <use
+                                                      xlinkHref="#talend-trash"
+                                                    />
+                                                  </svg>
+                                                </Icon>
+                                              </button>
+                                            </Button>
                                           </TooltipTrigger>
                                         </ActionButton>
                                       </withI18nextTranslation(ActionButton)>
@@ -10151,61 +10121,60 @@ exports[`EnumerationWidget should wrapped in Translate component 1`] = `
                             label="Search for specific values"
                             tooltipPlacement="top"
                           >
-                            <div
+                            <Button
+                              active={false}
                               aria-describedby={42}
-                              className="theme-tc-tooltip"
+                              aria-label="Search for specific values"
+                              block={false}
+                              bsClass="btn"
+                              bsStyle="link"
+                              className="btn-icon-only"
+                              disabled={false}
+                              id="search"
+                              key=".0"
                               onBlur={[Function]}
                               onClick={[Function]}
                               onFocus={[Function]}
                               onKeyPress={[Function]}
+                              onMouseDown={[Function]}
                               onMouseOut={[Function]}
                               onMouseOver={[Function]}
+                              role="link"
                             >
-                              <Button
-                                active={false}
+                              <button
                                 aria-describedby={42}
                                 aria-label="Search for specific values"
-                                block={false}
-                                bsClass="btn"
-                                bsStyle="link"
-                                className="btn-icon-only"
+                                className="btn-icon-only btn btn-link"
                                 disabled={false}
                                 id="search"
-                                key=".0"
+                                onBlur={[Function]}
                                 onClick={[Function]}
+                                onFocus={[Function]}
+                                onKeyPress={[Function]}
                                 onMouseDown={[Function]}
+                                onMouseOut={[Function]}
+                                onMouseOver={[Function]}
                                 role="link"
+                                type="button"
                               >
-                                <button
-                                  aria-describedby={42}
-                                  aria-label="Search for specific values"
-                                  className="btn-icon-only btn btn-link"
-                                  disabled={false}
-                                  id="search"
-                                  onClick={[Function]}
-                                  onMouseDown={[Function]}
-                                  role="link"
-                                  type="button"
+                                <Icon
+                                  key="icon"
+                                  name="talend-search"
                                 >
-                                  <Icon
-                                    key="icon"
+                                  <svg
+                                    aria-hidden="true"
+                                    className="theme-tc-svg-icon tc-svg-icon"
+                                    focusable="false"
                                     name="talend-search"
+                                    title={null}
                                   >
-                                    <svg
-                                      aria-hidden="true"
-                                      className="theme-tc-svg-icon tc-svg-icon"
-                                      focusable="false"
-                                      name="talend-search"
-                                      title={null}
-                                    >
-                                      <use
-                                        xlinkHref="#talend-search"
-                                      />
-                                    </svg>
-                                  </Icon>
-                                </button>
-                              </Button>
-                            </div>
+                                    <use
+                                      xlinkHref="#talend-search"
+                                    />
+                                  </svg>
+                                </Icon>
+                              </button>
+                            </Button>
                           </TooltipTrigger>
                         </ActionButton>
                       </withI18nextTranslation(ActionButton)>
@@ -10253,61 +10222,60 @@ exports[`EnumerationWidget should wrapped in Translate component 1`] = `
                             label="Add item"
                             tooltipPlacement="top"
                           >
-                            <div
+                            <Button
+                              active={false}
                               aria-describedby={42}
-                              className="theme-tc-tooltip"
+                              aria-label="Add item"
+                              block={false}
+                              bsClass="btn"
+                              bsStyle="link"
+                              className="btn-icon-only"
+                              disabled={false}
+                              id="add"
+                              key=".0"
                               onBlur={[Function]}
                               onClick={[Function]}
                               onFocus={[Function]}
                               onKeyPress={[Function]}
+                              onMouseDown={[Function]}
                               onMouseOut={[Function]}
                               onMouseOver={[Function]}
+                              role="link"
                             >
-                              <Button
-                                active={false}
+                              <button
                                 aria-describedby={42}
                                 aria-label="Add item"
-                                block={false}
-                                bsClass="btn"
-                                bsStyle="link"
-                                className="btn-icon-only"
+                                className="btn-icon-only btn btn-link"
                                 disabled={false}
                                 id="add"
-                                key=".0"
+                                onBlur={[Function]}
                                 onClick={[Function]}
+                                onFocus={[Function]}
+                                onKeyPress={[Function]}
                                 onMouseDown={[Function]}
+                                onMouseOut={[Function]}
+                                onMouseOver={[Function]}
                                 role="link"
+                                type="button"
                               >
-                                <button
-                                  aria-describedby={42}
-                                  aria-label="Add item"
-                                  className="btn-icon-only btn btn-link"
-                                  disabled={false}
-                                  id="add"
-                                  onClick={[Function]}
-                                  onMouseDown={[Function]}
-                                  role="link"
-                                  type="button"
+                                <Icon
+                                  key="icon"
+                                  name="talend-plus"
                                 >
-                                  <Icon
-                                    key="icon"
+                                  <svg
+                                    aria-hidden="true"
+                                    className="theme-tc-svg-icon tc-svg-icon"
+                                    focusable="false"
                                     name="talend-plus"
-                                  >
-                                    <svg
-                                      aria-hidden="true"
-                                      className="theme-tc-svg-icon tc-svg-icon"
-                                      focusable="false"
-                                      name="talend-plus"
-                                      title={null}
-                                    >
-                                      <use
-                                        xlinkHref="#talend-plus"
-                                      />
-                                    </svg>
-                                  </Icon>
-                                </button>
-                              </Button>
-                            </div>
+                                    title={null}
+                                  >
+                                    <use
+                                      xlinkHref="#talend-plus"
+                                    />
+                                  </svg>
+                                </Icon>
+                              </button>
+                            </Button>
                           </TooltipTrigger>
                         </ActionButton>
                       </withI18nextTranslation(ActionButton)>
@@ -10973,61 +10941,60 @@ exports[`EnumerationWidget upload file should add a upload icon and set data-fea
                           label="Search for specific values"
                           tooltipPlacement="top"
                         >
-                          <div
+                          <Button
+                            active={false}
                             aria-describedby={42}
-                            className="theme-tc-tooltip"
+                            aria-label="Search for specific values"
+                            block={false}
+                            bsClass="btn"
+                            bsStyle="link"
+                            className="btn-icon-only"
+                            disabled={false}
+                            id="search"
+                            key=".0"
                             onBlur={[Function]}
                             onClick={[Function]}
                             onFocus={[Function]}
                             onKeyPress={[Function]}
+                            onMouseDown={[Function]}
                             onMouseOut={[Function]}
                             onMouseOver={[Function]}
+                            role="link"
                           >
-                            <Button
-                              active={false}
+                            <button
                               aria-describedby={42}
                               aria-label="Search for specific values"
-                              block={false}
-                              bsClass="btn"
-                              bsStyle="link"
-                              className="btn-icon-only"
+                              className="btn-icon-only btn btn-link"
                               disabled={false}
                               id="search"
-                              key=".0"
+                              onBlur={[Function]}
                               onClick={[Function]}
+                              onFocus={[Function]}
+                              onKeyPress={[Function]}
                               onMouseDown={[Function]}
+                              onMouseOut={[Function]}
+                              onMouseOver={[Function]}
                               role="link"
+                              type="button"
                             >
-                              <button
-                                aria-describedby={42}
-                                aria-label="Search for specific values"
-                                className="btn-icon-only btn btn-link"
-                                disabled={false}
-                                id="search"
-                                onClick={[Function]}
-                                onMouseDown={[Function]}
-                                role="link"
-                                type="button"
+                              <Icon
+                                key="icon"
+                                name="talend-search"
                               >
-                                <Icon
-                                  key="icon"
+                                <svg
+                                  aria-hidden="true"
+                                  className="theme-tc-svg-icon tc-svg-icon"
+                                  focusable="false"
                                   name="talend-search"
+                                  title={null}
                                 >
-                                  <svg
-                                    aria-hidden="true"
-                                    className="theme-tc-svg-icon tc-svg-icon"
-                                    focusable="false"
-                                    name="talend-search"
-                                    title={null}
-                                  >
-                                    <use
-                                      xlinkHref="#talend-search"
-                                    />
-                                  </svg>
-                                </Icon>
-                              </button>
-                            </Button>
-                          </div>
+                                  <use
+                                    xlinkHref="#talend-search"
+                                  />
+                                </svg>
+                              </Icon>
+                            </button>
+                          </Button>
                         </TooltipTrigger>
                       </ActionButton>
                     </withI18nextTranslation(ActionButton)>
@@ -11100,196 +11067,217 @@ exports[`EnumerationWidget upload file should add a upload icon and set data-fea
                         label="Import values from a file"
                         tooltipPlacement="top"
                       >
-                        <div
+                        <DropdownButton
                           aria-describedby={42}
-                          className="theme-tc-tooltip"
+                          aria-label="Import values from a file"
+                          bsStyle="link"
+                          btooltipPlacement="bottom"
+                          className="theme-tc-dropdown-button tc-dropdown-button"
+                          data-feature="file.import"
+                          displayMode="dropdown"
+                          i18n={Object {}}
+                          id="upload"
+                          key=".0"
+                          noCaret={true}
                           onBlur={[Function]}
                           onClick={[Function]}
                           onFocus={[Function]}
                           onKeyPress={[Function]}
                           onMouseOut={[Function]}
                           onMouseOver={[Function]}
+                          onSelect={[Function]}
+                          onToggle={[Function]}
+                          pullRight={true}
+                          role="button"
+                          title={
+                            Array [
+                              <Icon
+                                name="talend-download"
+                              />,
+                              null,
+                            ]
+                          }
                         >
-                          <DropdownButton
-                            aria-describedby={42}
-                            aria-label="Import values from a file"
+                          <Uncontrolled(Dropdown)
                             bsStyle="link"
-                            btooltipPlacement="bottom"
-                            className="theme-tc-dropdown-button tc-dropdown-button"
-                            data-feature="file.import"
-                            displayMode="dropdown"
-                            i18n={Object {}}
                             id="upload"
-                            key=".0"
-                            noCaret={true}
-                            onClick={[Function]}
                             onSelect={[Function]}
                             onToggle={[Function]}
                             pullRight={true}
                             role="button"
-                            title={
-                              Array [
-                                <Icon
-                                  name="talend-download"
-                                />,
-                                null,
-                              ]
-                            }
                           >
-                            <Uncontrolled(Dropdown)
+                            <Dropdown
+                              bsClass="dropdown"
                               bsStyle="link"
+                              componentClass={[Function]}
                               id="upload"
                               onSelect={[Function]}
                               onToggle={[Function]}
                               pullRight={true}
                               role="button"
                             >
-                              <Dropdown
-                                bsClass="dropdown"
+                              <ButtonGroup
+                                block={false}
+                                bsClass="btn-group"
                                 bsStyle="link"
-                                componentClass={[Function]}
-                                id="upload"
-                                onSelect={[Function]}
-                                onToggle={[Function]}
-                                pullRight={true}
-                                role="button"
+                                className="dropdown"
+                                justified={false}
+                                vertical={false}
                               >
-                                <ButtonGroup
-                                  block={false}
-                                  bsClass="btn-group"
-                                  bsStyle="link"
-                                  className="dropdown"
-                                  justified={false}
-                                  vertical={false}
+                                <div
+                                  className="dropdown btn-group btn-group-link"
                                 >
-                                  <div
-                                    className="dropdown btn-group btn-group-link"
+                                  <DropdownToggle
+                                    aria-describedby={42}
+                                    aria-label="Import values from a file"
+                                    bsClass="dropdown-toggle"
+                                    bsRole="toggle"
+                                    bsStyle="link"
+                                    btooltipPlacement="bottom"
+                                    className="theme-tc-dropdown-button tc-dropdown-button"
+                                    data-feature="file.import"
+                                    displayMode="dropdown"
+                                    i18n={Object {}}
+                                    id="upload"
+                                    key=".0"
+                                    noCaret={true}
+                                    onBlur={[Function]}
+                                    onClick={[Function]}
+                                    onFocus={[Function]}
+                                    onKeyDown={[Function]}
+                                    onKeyPress={[Function]}
+                                    onMouseOut={[Function]}
+                                    onMouseOver={[Function]}
+                                    open={false}
+                                    role="button"
+                                    useAnchor={false}
                                   >
-                                    <DropdownToggle
+                                    <Button
+                                      active={false}
                                       aria-describedby={42}
+                                      aria-expanded={false}
+                                      aria-haspopup={true}
                                       aria-label="Import values from a file"
-                                      bsClass="dropdown-toggle"
-                                      bsRole="toggle"
+                                      block={false}
+                                      bsClass="btn"
                                       bsStyle="link"
                                       btooltipPlacement="bottom"
-                                      className="theme-tc-dropdown-button tc-dropdown-button"
+                                      className="theme-tc-dropdown-button tc-dropdown-button dropdown-toggle"
                                       data-feature="file.import"
+                                      disabled={false}
                                       displayMode="dropdown"
                                       i18n={Object {}}
                                       id="upload"
-                                      key=".0"
-                                      noCaret={true}
+                                      onBlur={[Function]}
                                       onClick={[Function]}
+                                      onFocus={[Function]}
                                       onKeyDown={[Function]}
-                                      open={false}
+                                      onKeyPress={[Function]}
+                                      onMouseOut={[Function]}
+                                      onMouseOver={[Function]}
                                       role="button"
-                                      useAnchor={false}
                                     >
-                                      <Button
-                                        active={false}
+                                      <button
                                         aria-describedby={42}
                                         aria-expanded={false}
                                         aria-haspopup={true}
                                         aria-label="Import values from a file"
-                                        block={false}
-                                        bsClass="btn"
-                                        bsStyle="link"
                                         btooltipPlacement="bottom"
-                                        className="theme-tc-dropdown-button tc-dropdown-button dropdown-toggle"
+                                        className="theme-tc-dropdown-button tc-dropdown-button dropdown-toggle btn btn-link"
                                         data-feature="file.import"
                                         disabled={false}
                                         displayMode="dropdown"
                                         i18n={Object {}}
                                         id="upload"
+                                        onBlur={[Function]}
                                         onClick={[Function]}
+                                        onFocus={[Function]}
                                         onKeyDown={[Function]}
+                                        onKeyPress={[Function]}
+                                        onMouseOut={[Function]}
+                                        onMouseOver={[Function]}
                                         role="button"
+                                        type="button"
                                       >
-                                        <button
-                                          aria-describedby={42}
-                                          aria-expanded={false}
-                                          aria-haspopup={true}
-                                          aria-label="Import values from a file"
-                                          btooltipPlacement="bottom"
-                                          className="theme-tc-dropdown-button tc-dropdown-button dropdown-toggle btn btn-link"
-                                          data-feature="file.import"
-                                          disabled={false}
-                                          displayMode="dropdown"
-                                          i18n={Object {}}
-                                          id="upload"
-                                          onClick={[Function]}
-                                          onKeyDown={[Function]}
-                                          role="button"
-                                          type="button"
+                                        <Icon
+                                          key="icon"
+                                          name="talend-download"
                                         >
-                                          <Icon
-                                            key="icon"
+                                          <svg
+                                            aria-hidden="true"
+                                            className="theme-tc-svg-icon tc-svg-icon"
+                                            focusable="false"
                                             name="talend-download"
+                                            title={null}
                                           >
-                                            <svg
-                                              aria-hidden="true"
-                                              className="theme-tc-svg-icon tc-svg-icon"
-                                              focusable="false"
-                                              name="talend-download"
-                                              title={null}
-                                            >
-                                              <use
-                                                xlinkHref="#talend-download"
-                                              />
-                                            </svg>
-                                          </Icon>
-                                        </button>
-                                      </Button>
-                                    </DropdownToggle>
-                                    <DropdownMenu
-                                      bsClass="dropdown-menu"
-                                      bsRole="menu"
-                                      key=".1"
-                                      labelledBy="upload"
-                                      onClose={[Function]}
-                                      onSelect={[Function]}
-                                      pullRight={true}
+                                            <use
+                                              xlinkHref="#talend-download"
+                                            />
+                                          </svg>
+                                        </Icon>
+                                      </button>
+                                    </Button>
+                                  </DropdownToggle>
+                                  <DropdownMenu
+                                    bsClass="dropdown-menu"
+                                    bsRole="menu"
+                                    key=".1"
+                                    labelledBy="upload"
+                                    onClose={[Function]}
+                                    onSelect={[Function]}
+                                    pullRight={true}
+                                  >
+                                    <RootCloseWrapper
+                                      disabled={true}
+                                      event="click"
+                                      onRootClose={[Function]}
                                     >
-                                      <RootCloseWrapper
-                                        disabled={true}
-                                        event="click"
-                                        onRootClose={[Function]}
+                                      <ul
+                                        aria-labelledby="upload"
+                                        className="dropdown-menu dropdown-menu-right"
+                                        role="menu"
                                       >
-                                        <ul
-                                          aria-labelledby="upload"
-                                          className="dropdown-menu dropdown-menu-right"
-                                          role="menu"
+                                        <MenuItem
+                                          bsClass="dropdown"
+                                          className="theme-tc-dropdown-item tc-dropdown-item"
+                                          data-feature="file.add"
+                                          disabled={false}
+                                          divider={false}
+                                          eventKey={
+                                            Object {
+                                              "data-feature": "file.add",
+                                              "id": "append-uploding",
+                                              "label": "Add values from a file",
+                                              "onClick": [Function],
+                                            }
+                                          }
+                                          header={false}
+                                          id="append-uploding"
+                                          key=".2:$0"
+                                          label="Add values from a file"
+                                          onClick={[Function]}
+                                          onKeyDown={[Function]}
+                                          onSelect={[Function]}
+                                          title="Add values from a file"
                                         >
-                                          <MenuItem
-                                            bsClass="dropdown"
+                                          <li
                                             className="theme-tc-dropdown-item tc-dropdown-item"
-                                            data-feature="file.add"
-                                            disabled={false}
-                                            divider={false}
-                                            eventKey={
-                                              Object {
-                                                "data-feature": "file.add",
-                                                "id": "append-uploding",
-                                                "label": "Add values from a file",
-                                                "onClick": [Function],
-                                              }
-                                            }
-                                            header={false}
-                                            id="append-uploding"
-                                            key=".2:$0"
-                                            label="Add values from a file"
-                                            onClick={[Function]}
-                                            onKeyDown={[Function]}
-                                            onSelect={[Function]}
-                                            title="Add values from a file"
+                                            role="presentation"
                                           >
-                                            <li
-                                              className="theme-tc-dropdown-item tc-dropdown-item"
-                                              role="presentation"
+                                            <SafeAnchor
+                                              componentClass="a"
+                                              data-feature="file.add"
+                                              id="append-uploding"
+                                              label="Add values from a file"
+                                              onClick={[Function]}
+                                              onKeyDown={[Function]}
+                                              role="menuitem"
+                                              tabIndex="-1"
+                                              title="Add values from a file"
                                             >
-                                              <SafeAnchor
-                                                componentClass="a"
+                                              <a
                                                 data-feature="file.add"
+                                                href="#"
                                                 id="append-uploding"
                                                 label="Add values from a file"
                                                 onClick={[Function]}
@@ -11298,52 +11286,52 @@ exports[`EnumerationWidget upload file should add a upload icon and set data-fea
                                                 tabIndex="-1"
                                                 title="Add values from a file"
                                               >
-                                                <a
-                                                  data-feature="file.add"
-                                                  href="#"
-                                                  id="append-uploding"
-                                                  label="Add values from a file"
-                                                  onClick={[Function]}
-                                                  onKeyDown={[Function]}
-                                                  role="menuitem"
-                                                  tabIndex="-1"
-                                                  title="Add values from a file"
-                                                >
-                                                  Add values from a file
-                                                </a>
-                                              </SafeAnchor>
-                                            </li>
-                                          </MenuItem>
-                                          <MenuItem
-                                            bsClass="dropdown"
-                                            className="theme-tc-dropdown-item tc-dropdown-item"
-                                            data-feature="file.overwrite"
-                                            disabled={false}
-                                            divider={false}
-                                            eventKey={
-                                              Object {
-                                                "data-feature": "file.overwrite",
-                                                "id": "append-uploding",
-                                                "label": "Overwrite existing values",
-                                                "onClick": [Function],
-                                              }
+                                                Add values from a file
+                                              </a>
+                                            </SafeAnchor>
+                                          </li>
+                                        </MenuItem>
+                                        <MenuItem
+                                          bsClass="dropdown"
+                                          className="theme-tc-dropdown-item tc-dropdown-item"
+                                          data-feature="file.overwrite"
+                                          disabled={false}
+                                          divider={false}
+                                          eventKey={
+                                            Object {
+                                              "data-feature": "file.overwrite",
+                                              "id": "append-uploding",
+                                              "label": "Overwrite existing values",
+                                              "onClick": [Function],
                                             }
-                                            header={false}
-                                            id="append-uploding"
-                                            key=".2:$1"
-                                            label="Overwrite existing values"
-                                            onClick={[Function]}
-                                            onKeyDown={[Function]}
-                                            onSelect={[Function]}
-                                            title="Overwrite existing values"
+                                          }
+                                          header={false}
+                                          id="append-uploding"
+                                          key=".2:$1"
+                                          label="Overwrite existing values"
+                                          onClick={[Function]}
+                                          onKeyDown={[Function]}
+                                          onSelect={[Function]}
+                                          title="Overwrite existing values"
+                                        >
+                                          <li
+                                            className="theme-tc-dropdown-item tc-dropdown-item"
+                                            role="presentation"
                                           >
-                                            <li
-                                              className="theme-tc-dropdown-item tc-dropdown-item"
-                                              role="presentation"
+                                            <SafeAnchor
+                                              componentClass="a"
+                                              data-feature="file.overwrite"
+                                              id="append-uploding"
+                                              label="Overwrite existing values"
+                                              onClick={[Function]}
+                                              onKeyDown={[Function]}
+                                              role="menuitem"
+                                              tabIndex="-1"
+                                              title="Overwrite existing values"
                                             >
-                                              <SafeAnchor
-                                                componentClass="a"
+                                              <a
                                                 data-feature="file.overwrite"
+                                                href="#"
                                                 id="append-uploding"
                                                 label="Overwrite existing values"
                                                 onClick={[Function]}
@@ -11352,31 +11340,19 @@ exports[`EnumerationWidget upload file should add a upload icon and set data-fea
                                                 tabIndex="-1"
                                                 title="Overwrite existing values"
                                               >
-                                                <a
-                                                  data-feature="file.overwrite"
-                                                  href="#"
-                                                  id="append-uploding"
-                                                  label="Overwrite existing values"
-                                                  onClick={[Function]}
-                                                  onKeyDown={[Function]}
-                                                  role="menuitem"
-                                                  tabIndex="-1"
-                                                  title="Overwrite existing values"
-                                                >
-                                                  Overwrite existing values
-                                                </a>
-                                              </SafeAnchor>
-                                            </li>
-                                          </MenuItem>
-                                        </ul>
-                                      </RootCloseWrapper>
-                                    </DropdownMenu>
-                                  </div>
-                                </ButtonGroup>
-                              </Dropdown>
-                            </Uncontrolled(Dropdown)>
-                          </DropdownButton>
-                        </div>
+                                                Overwrite existing values
+                                              </a>
+                                            </SafeAnchor>
+                                          </li>
+                                        </MenuItem>
+                                      </ul>
+                                    </RootCloseWrapper>
+                                  </DropdownMenu>
+                                </div>
+                              </ButtonGroup>
+                            </Dropdown>
+                          </Uncontrolled(Dropdown)>
+                        </DropdownButton>
                       </TooltipTrigger>
                     </ActionDropdown>
                   </withI18nextTranslation(ActionDropdown)>
@@ -11421,61 +11397,60 @@ exports[`EnumerationWidget upload file should add a upload icon and set data-fea
                           label="Add item"
                           tooltipPlacement="top"
                         >
-                          <div
+                          <Button
+                            active={false}
                             aria-describedby={42}
-                            className="theme-tc-tooltip"
+                            aria-label="Add item"
+                            block={false}
+                            bsClass="btn"
+                            bsStyle="link"
+                            className="btn-icon-only"
+                            disabled={false}
+                            id="add"
+                            key=".0"
                             onBlur={[Function]}
                             onClick={[Function]}
                             onFocus={[Function]}
                             onKeyPress={[Function]}
+                            onMouseDown={[Function]}
                             onMouseOut={[Function]}
                             onMouseOver={[Function]}
+                            role="link"
                           >
-                            <Button
-                              active={false}
+                            <button
                               aria-describedby={42}
                               aria-label="Add item"
-                              block={false}
-                              bsClass="btn"
-                              bsStyle="link"
-                              className="btn-icon-only"
+                              className="btn-icon-only btn btn-link"
                               disabled={false}
                               id="add"
-                              key=".0"
+                              onBlur={[Function]}
                               onClick={[Function]}
+                              onFocus={[Function]}
+                              onKeyPress={[Function]}
                               onMouseDown={[Function]}
+                              onMouseOut={[Function]}
+                              onMouseOver={[Function]}
                               role="link"
+                              type="button"
                             >
-                              <button
-                                aria-describedby={42}
-                                aria-label="Add item"
-                                className="btn-icon-only btn btn-link"
-                                disabled={false}
-                                id="add"
-                                onClick={[Function]}
-                                onMouseDown={[Function]}
-                                role="link"
-                                type="button"
+                              <Icon
+                                key="icon"
+                                name="talend-plus"
                               >
-                                <Icon
-                                  key="icon"
+                                <svg
+                                  aria-hidden="true"
+                                  className="theme-tc-svg-icon tc-svg-icon"
+                                  focusable="false"
                                   name="talend-plus"
+                                  title={null}
                                 >
-                                  <svg
-                                    aria-hidden="true"
-                                    className="theme-tc-svg-icon tc-svg-icon"
-                                    focusable="false"
-                                    name="talend-plus"
-                                    title={null}
-                                  >
-                                    <use
-                                      xlinkHref="#talend-plus"
-                                    />
-                                  </svg>
-                                </Icon>
-                              </button>
-                            </Button>
-                          </div>
+                                  <use
+                                    xlinkHref="#talend-plus"
+                                  />
+                                </svg>
+                              </Icon>
+                            </button>
+                          </Button>
                         </TooltipTrigger>
                       </ActionButton>
                     </withI18nextTranslation(ActionButton)>
@@ -12108,9 +12083,10 @@ exports[`EnumerationWidget upload file should trigger a event when the user clic
                           label="Loading"
                           tooltipPlacement="top"
                         >
-                          <div
+                          <span
                             aria-describedby={42}
-                            className="theme-tc-tooltip"
+                            className="theme-tc-action-disabled-btn-container tc-action-disabled-btn-container"
+                            key=".0"
                             onBlur={[Function]}
                             onClick={[Function]}
                             onFocus={[Function]}
@@ -12118,71 +12094,65 @@ exports[`EnumerationWidget upload file should trigger a event when the user clic
                             onMouseOut={[Function]}
                             onMouseOver={[Function]}
                           >
-                            <span
-                              aria-describedby={42}
-                              className="theme-tc-action-disabled-btn-container tc-action-disabled-btn-container"
-                              key=".0"
+                            <Button
+                              active={false}
+                              aria-label="Loading (in progress)"
+                              block={false}
+                              bsClass="btn"
+                              bsStyle="link"
+                              className="btn-icon-only theme-btn-disabled"
+                              disabled={true}
+                              id="loading"
+                              onClick={[Function]}
+                              onMouseDown={[Function]}
+                              role="link"
                             >
-                              <Button
-                                active={false}
+                              <button
                                 aria-label="Loading (in progress)"
-                                block={false}
-                                bsClass="btn"
-                                bsStyle="link"
-                                className="btn-icon-only theme-btn-disabled"
+                                className="btn-icon-only theme-btn-disabled btn btn-link"
                                 disabled={true}
                                 id="loading"
                                 onClick={[Function]}
                                 onMouseDown={[Function]}
                                 role="link"
+                                type="button"
                               >
-                                <button
-                                  aria-label="Loading (in progress)"
-                                  className="btn-icon-only theme-btn-disabled btn btn-link"
-                                  disabled={true}
-                                  id="loading"
-                                  onClick={[Function]}
-                                  onMouseDown={[Function]}
-                                  role="link"
-                                  type="button"
+                                <withI18nextTranslation(CircularProgress)
+                                  key="icon"
+                                  size="small"
                                 >
-                                  <withI18nextTranslation(CircularProgress)
-                                    key="icon"
+                                  <CircularProgress
+                                    i18n={Object {}}
                                     size="small"
+                                    t={[Function]}
+                                    tReady={true}
                                   >
-                                    <CircularProgress
-                                      i18n={Object {}}
-                                      size="small"
-                                      t={[Function]}
-                                      tReady={true}
+                                    <svg
+                                      aria-busy="true"
+                                      aria-label="Loading "
+                                      className="tc-circular-progress theme-loader theme-animate theme-small"
+                                      focusable="false"
+                                      viewBox="0 0 50 50"
                                     >
-                                      <svg
-                                        aria-busy="true"
-                                        aria-label="Loading "
-                                        className="tc-circular-progress theme-loader theme-animate theme-small"
-                                        focusable="false"
-                                        viewBox="0 0 50 50"
-                                      >
-                                        <circle
-                                          className="theme-path"
-                                          cx={25}
-                                          cy={25}
-                                          fill="none"
-                                          r={20}
-                                          style={
-                                            Object {
-                                              "strokeDasharray": 12.566370614359172,
-                                              "strokeDashoffset": 0,
-                                            }
+                                      <circle
+                                        className="theme-path"
+                                        cx={25}
+                                        cy={25}
+                                        fill="none"
+                                        r={20}
+                                        style={
+                                          Object {
+                                            "strokeDasharray": 12.566370614359172,
+                                            "strokeDashoffset": 0,
                                           }
-                                        />
-                                      </svg>
-                                    </CircularProgress>
-                                  </withI18nextTranslation(CircularProgress)>
-                                </button>
-                              </Button>
-                            </span>
-                          </div>
+                                        }
+                                      />
+                                    </svg>
+                                  </CircularProgress>
+                                </withI18nextTranslation(CircularProgress)>
+                              </button>
+                            </Button>
+                          </span>
                         </TooltipTrigger>
                       </ActionButton>
                     </withI18nextTranslation(ActionButton)>
@@ -12762,59 +12732,58 @@ exports[`EnumerationWidget upload file should trigger a event when the user clic
                                             label="Edit"
                                             tooltipPlacement="bottom"
                                           >
-                                            <div
+                                            <Button
+                                              active={false}
                                               aria-describedby={42}
-                                              className="theme-tc-tooltip"
+                                              aria-label="Edit"
+                                              block={false}
+                                              bsClass="btn"
+                                              bsStyle="link"
+                                              className="btn-icon-only"
+                                              disabled={false}
+                                              key=".0"
                                               onBlur={[Function]}
                                               onClick={[Function]}
                                               onFocus={[Function]}
                                               onKeyPress={[Function]}
+                                              onMouseDown={[Function]}
                                               onMouseOut={[Function]}
                                               onMouseOver={[Function]}
+                                              role="link"
                                             >
-                                              <Button
-                                                active={false}
+                                              <button
                                                 aria-describedby={42}
                                                 aria-label="Edit"
-                                                block={false}
-                                                bsClass="btn"
-                                                bsStyle="link"
-                                                className="btn-icon-only"
+                                                className="btn-icon-only btn btn-link"
                                                 disabled={false}
-                                                key=".0"
+                                                onBlur={[Function]}
                                                 onClick={[Function]}
+                                                onFocus={[Function]}
+                                                onKeyPress={[Function]}
                                                 onMouseDown={[Function]}
+                                                onMouseOut={[Function]}
+                                                onMouseOver={[Function]}
                                                 role="link"
+                                                type="button"
                                               >
-                                                <button
-                                                  aria-describedby={42}
-                                                  aria-label="Edit"
-                                                  className="btn-icon-only btn btn-link"
-                                                  disabled={false}
-                                                  onClick={[Function]}
-                                                  onMouseDown={[Function]}
-                                                  role="link"
-                                                  type="button"
+                                                <Icon
+                                                  key="icon"
+                                                  name="talend-pencil"
                                                 >
-                                                  <Icon
-                                                    key="icon"
+                                                  <svg
+                                                    aria-hidden="true"
+                                                    className="theme-tc-svg-icon tc-svg-icon"
+                                                    focusable="false"
                                                     name="talend-pencil"
+                                                    title={null}
                                                   >
-                                                    <svg
-                                                      aria-hidden="true"
-                                                      className="theme-tc-svg-icon tc-svg-icon"
-                                                      focusable="false"
-                                                      name="talend-pencil"
-                                                      title={null}
-                                                    >
-                                                      <use
-                                                        xlinkHref="#talend-pencil"
-                                                      />
-                                                    </svg>
-                                                  </Icon>
-                                                </button>
-                                              </Button>
-                                            </div>
+                                                    <use
+                                                      xlinkHref="#talend-pencil"
+                                                    />
+                                                  </svg>
+                                                </Icon>
+                                              </button>
+                                            </Button>
                                           </TooltipTrigger>
                                         </ActionButton>
                                       </withI18nextTranslation(ActionButton)>
@@ -12856,59 +12825,58 @@ exports[`EnumerationWidget upload file should trigger a event when the user clic
                                             label="Remove value"
                                             tooltipPlacement="bottom"
                                           >
-                                            <div
+                                            <Button
+                                              active={false}
                                               aria-describedby={42}
-                                              className="theme-tc-tooltip"
+                                              aria-label="Remove value"
+                                              block={false}
+                                              bsClass="btn"
+                                              bsStyle="link"
+                                              className="btn-icon-only"
+                                              disabled={false}
+                                              key=".0"
                                               onBlur={[Function]}
                                               onClick={[Function]}
                                               onFocus={[Function]}
                                               onKeyPress={[Function]}
+                                              onMouseDown={[Function]}
                                               onMouseOut={[Function]}
                                               onMouseOver={[Function]}
+                                              role="link"
                                             >
-                                              <Button
-                                                active={false}
+                                              <button
                                                 aria-describedby={42}
                                                 aria-label="Remove value"
-                                                block={false}
-                                                bsClass="btn"
-                                                bsStyle="link"
-                                                className="btn-icon-only"
+                                                className="btn-icon-only btn btn-link"
                                                 disabled={false}
-                                                key=".0"
+                                                onBlur={[Function]}
                                                 onClick={[Function]}
+                                                onFocus={[Function]}
+                                                onKeyPress={[Function]}
                                                 onMouseDown={[Function]}
+                                                onMouseOut={[Function]}
+                                                onMouseOver={[Function]}
                                                 role="link"
+                                                type="button"
                                               >
-                                                <button
-                                                  aria-describedby={42}
-                                                  aria-label="Remove value"
-                                                  className="btn-icon-only btn btn-link"
-                                                  disabled={false}
-                                                  onClick={[Function]}
-                                                  onMouseDown={[Function]}
-                                                  role="link"
-                                                  type="button"
+                                                <Icon
+                                                  key="icon"
+                                                  name="talend-trash"
                                                 >
-                                                  <Icon
-                                                    key="icon"
+                                                  <svg
+                                                    aria-hidden="true"
+                                                    className="theme-tc-svg-icon tc-svg-icon"
+                                                    focusable="false"
                                                     name="talend-trash"
+                                                    title={null}
                                                   >
-                                                    <svg
-                                                      aria-hidden="true"
-                                                      className="theme-tc-svg-icon tc-svg-icon"
-                                                      focusable="false"
-                                                      name="talend-trash"
-                                                      title={null}
-                                                    >
-                                                      <use
-                                                        xlinkHref="#talend-trash"
-                                                      />
-                                                    </svg>
-                                                  </Icon>
-                                                </button>
-                                              </Button>
-                                            </div>
+                                                    <use
+                                                      xlinkHref="#talend-trash"
+                                                    />
+                                                  </svg>
+                                                </Icon>
+                                              </button>
+                                            </Button>
                                           </TooltipTrigger>
                                         </ActionButton>
                                       </withI18nextTranslation(ActionButton)>
@@ -13129,59 +13097,58 @@ exports[`EnumerationWidget upload file should trigger a event when the user clic
                                             label="Edit"
                                             tooltipPlacement="bottom"
                                           >
-                                            <div
+                                            <Button
+                                              active={false}
                                               aria-describedby={42}
-                                              className="theme-tc-tooltip"
+                                              aria-label="Edit"
+                                              block={false}
+                                              bsClass="btn"
+                                              bsStyle="link"
+                                              className="btn-icon-only"
+                                              disabled={false}
+                                              key=".0"
                                               onBlur={[Function]}
                                               onClick={[Function]}
                                               onFocus={[Function]}
                                               onKeyPress={[Function]}
+                                              onMouseDown={[Function]}
                                               onMouseOut={[Function]}
                                               onMouseOver={[Function]}
+                                              role="link"
                                             >
-                                              <Button
-                                                active={false}
+                                              <button
                                                 aria-describedby={42}
                                                 aria-label="Edit"
-                                                block={false}
-                                                bsClass="btn"
-                                                bsStyle="link"
-                                                className="btn-icon-only"
+                                                className="btn-icon-only btn btn-link"
                                                 disabled={false}
-                                                key=".0"
+                                                onBlur={[Function]}
                                                 onClick={[Function]}
-                                                onMouseDown={[Function]}
-                                                role="link"
-                                              >
-                                                <button
-                                                  aria-describedby={42}
-                                                  aria-label="Edit"
-                                                  className="btn-icon-only btn btn-link"
-                                                  disabled={false}
-                                                  onClick={[Function]}
-                                                  onMouseDown={[Function]}
-                                                  role="link"
-                                                  type="button"
+                                                onFocus={[Function]}
+                                                onKeyPress={[Function]}
+                                                onMouseDown={[Function]}
+                                                onMouseOut={[Function]}
+                                                onMouseOver={[Function]}
+                                                role="link"
+                                                type="button"
+                                              >
+                                                <Icon
+                                                  key="icon"
+                                                  name="talend-pencil"
                                                 >
-                                                  <Icon
-                                                    key="icon"
+                                                  <svg
+                                                    aria-hidden="true"
+                                                    className="theme-tc-svg-icon tc-svg-icon"
+                                                    focusable="false"
                                                     name="talend-pencil"
+                                                    title={null}
                                                   >
-                                                    <svg
-                                                      aria-hidden="true"
-                                                      className="theme-tc-svg-icon tc-svg-icon"
-                                                      focusable="false"
-                                                      name="talend-pencil"
-                                                      title={null}
-                                                    >
-                                                      <use
-                                                        xlinkHref="#talend-pencil"
-                                                      />
-                                                    </svg>
-                                                  </Icon>
-                                                </button>
-                                              </Button>
-                                            </div>
+                                                    <use
+                                                      xlinkHref="#talend-pencil"
+                                                    />
+                                                  </svg>
+                                                </Icon>
+                                              </button>
+                                            </Button>
                                           </TooltipTrigger>
                                         </ActionButton>
                                       </withI18nextTranslation(ActionButton)>
@@ -13223,59 +13190,58 @@ exports[`EnumerationWidget upload file should trigger a event when the user clic
                                             label="Remove value"
                                             tooltipPlacement="bottom"
                                           >
-                                            <div
+                                            <Button
+                                              active={false}
                                               aria-describedby={42}
-                                              className="theme-tc-tooltip"
+                                              aria-label="Remove value"
+                                              block={false}
+                                              bsClass="btn"
+                                              bsStyle="link"
+                                              className="btn-icon-only"
+                                              disabled={false}
+                                              key=".0"
                                               onBlur={[Function]}
                                               onClick={[Function]}
                                               onFocus={[Function]}
                                               onKeyPress={[Function]}
+                                              onMouseDown={[Function]}
                                               onMouseOut={[Function]}
                                               onMouseOver={[Function]}
+                                              role="link"
                                             >
-                                              <Button
-                                                active={false}
+                                              <button
                                                 aria-describedby={42}
                                                 aria-label="Remove value"
-                                                block={false}
-                                                bsClass="btn"
-                                                bsStyle="link"
-                                                className="btn-icon-only"
+                                                className="btn-icon-only btn btn-link"
                                                 disabled={false}
-                                                key=".0"
+                                                onBlur={[Function]}
                                                 onClick={[Function]}
+                                                onFocus={[Function]}
+                                                onKeyPress={[Function]}
                                                 onMouseDown={[Function]}
+                                                onMouseOut={[Function]}
+                                                onMouseOver={[Function]}
                                                 role="link"
+                                                type="button"
                                               >
-                                                <button
-                                                  aria-describedby={42}
-                                                  aria-label="Remove value"
-                                                  className="btn-icon-only btn btn-link"
-                                                  disabled={false}
-                                                  onClick={[Function]}
-                                                  onMouseDown={[Function]}
-                                                  role="link"
-                                                  type="button"
+                                                <Icon
+                                                  key="icon"
+                                                  name="talend-trash"
                                                 >
-                                                  <Icon
-                                                    key="icon"
+                                                  <svg
+                                                    aria-hidden="true"
+                                                    className="theme-tc-svg-icon tc-svg-icon"
+                                                    focusable="false"
                                                     name="talend-trash"
+                                                    title={null}
                                                   >
-                                                    <svg
-                                                      aria-hidden="true"
-                                                      className="theme-tc-svg-icon tc-svg-icon"
-                                                      focusable="false"
-                                                      name="talend-trash"
-                                                      title={null}
-                                                    >
-                                                      <use
-                                                        xlinkHref="#talend-trash"
-                                                      />
-                                                    </svg>
-                                                  </Icon>
-                                                </button>
-                                              </Button>
-                                            </div>
+                                                    <use
+                                                      xlinkHref="#talend-trash"
+                                                    />
+                                                  </svg>
+                                                </Icon>
+                                              </button>
+                                            </Button>
                                           </TooltipTrigger>
                                         </ActionButton>
                                       </withI18nextTranslation(ActionButton)>
@@ -13895,61 +13861,60 @@ exports[`EnumerationWidget upload file should trigger a event when the user clic
                           label="Search for specific values"
                           tooltipPlacement="top"
                         >
-                          <div
+                          <Button
+                            active={false}
                             aria-describedby={42}
-                            className="theme-tc-tooltip"
+                            aria-label="Search for specific values"
+                            block={false}
+                            bsClass="btn"
+                            bsStyle="link"
+                            className="btn-icon-only"
+                            disabled={false}
+                            id="search"
+                            key=".0"
                             onBlur={[Function]}
                             onClick={[Function]}
                             onFocus={[Function]}
                             onKeyPress={[Function]}
+                            onMouseDown={[Function]}
                             onMouseOut={[Function]}
                             onMouseOver={[Function]}
+                            role="link"
                           >
-                            <Button
-                              active={false}
+                            <button
                               aria-describedby={42}
                               aria-label="Search for specific values"
-                              block={false}
-                              bsClass="btn"
-                              bsStyle="link"
-                              className="btn-icon-only"
+                              className="btn-icon-only btn btn-link"
                               disabled={false}
                               id="search"
-                              key=".0"
+                              onBlur={[Function]}
                               onClick={[Function]}
+                              onFocus={[Function]}
+                              onKeyPress={[Function]}
                               onMouseDown={[Function]}
+                              onMouseOut={[Function]}
+                              onMouseOver={[Function]}
                               role="link"
+                              type="button"
                             >
-                              <button
-                                aria-describedby={42}
-                                aria-label="Search for specific values"
-                                className="btn-icon-only btn btn-link"
-                                disabled={false}
-                                id="search"
-                                onClick={[Function]}
-                                onMouseDown={[Function]}
-                                role="link"
-                                type="button"
+                              <Icon
+                                key="icon"
+                                name="talend-search"
                               >
-                                <Icon
-                                  key="icon"
+                                <svg
+                                  aria-hidden="true"
+                                  className="theme-tc-svg-icon tc-svg-icon"
+                                  focusable="false"
                                   name="talend-search"
+                                  title={null}
                                 >
-                                  <svg
-                                    aria-hidden="true"
-                                    className="theme-tc-svg-icon tc-svg-icon"
-                                    focusable="false"
-                                    name="talend-search"
-                                    title={null}
-                                  >
-                                    <use
-                                      xlinkHref="#talend-search"
-                                    />
-                                  </svg>
-                                </Icon>
-                              </button>
-                            </Button>
-                          </div>
+                                  <use
+                                    xlinkHref="#talend-search"
+                                  />
+                                </svg>
+                              </Icon>
+                            </button>
+                          </Button>
                         </TooltipTrigger>
                       </ActionButton>
                     </withI18nextTranslation(ActionButton)>
@@ -14020,190 +13985,210 @@ exports[`EnumerationWidget upload file should trigger a event when the user clic
                         label="Import values from a file"
                         tooltipPlacement="top"
                       >
-                        <div
+                        <DropdownButton
                           aria-describedby={42}
-                          className="theme-tc-tooltip"
+                          aria-label="Import values from a file"
+                          bsStyle="link"
+                          btooltipPlacement="bottom"
+                          className="theme-tc-dropdown-button tc-dropdown-button"
+                          displayMode="dropdown"
+                          i18n={Object {}}
+                          id="upload"
+                          key=".0"
+                          noCaret={true}
                           onBlur={[Function]}
                           onClick={[Function]}
                           onFocus={[Function]}
                           onKeyPress={[Function]}
                           onMouseOut={[Function]}
                           onMouseOver={[Function]}
+                          onSelect={[Function]}
+                          onToggle={[Function]}
+                          pullRight={true}
+                          role="button"
+                          title={
+                            Array [
+                              <Icon
+                                name="talend-download"
+                              />,
+                              null,
+                            ]
+                          }
                         >
-                          <DropdownButton
-                            aria-describedby={42}
-                            aria-label="Import values from a file"
+                          <Uncontrolled(Dropdown)
                             bsStyle="link"
-                            btooltipPlacement="bottom"
-                            className="theme-tc-dropdown-button tc-dropdown-button"
-                            displayMode="dropdown"
-                            i18n={Object {}}
                             id="upload"
-                            key=".0"
-                            noCaret={true}
-                            onClick={[Function]}
                             onSelect={[Function]}
                             onToggle={[Function]}
                             pullRight={true}
                             role="button"
-                            title={
-                              Array [
-                                <Icon
-                                  name="talend-download"
-                                />,
-                                null,
-                              ]
-                            }
                           >
-                            <Uncontrolled(Dropdown)
+                            <Dropdown
+                              bsClass="dropdown"
                               bsStyle="link"
+                              componentClass={[Function]}
                               id="upload"
                               onSelect={[Function]}
                               onToggle={[Function]}
                               pullRight={true}
                               role="button"
                             >
-                              <Dropdown
-                                bsClass="dropdown"
+                              <ButtonGroup
+                                block={false}
+                                bsClass="btn-group"
                                 bsStyle="link"
-                                componentClass={[Function]}
-                                id="upload"
-                                onSelect={[Function]}
-                                onToggle={[Function]}
-                                pullRight={true}
-                                role="button"
+                                className="dropdown"
+                                justified={false}
+                                vertical={false}
                               >
-                                <ButtonGroup
-                                  block={false}
-                                  bsClass="btn-group"
-                                  bsStyle="link"
-                                  className="dropdown"
-                                  justified={false}
-                                  vertical={false}
+                                <div
+                                  className="dropdown btn-group btn-group-link"
                                 >
-                                  <div
-                                    className="dropdown btn-group btn-group-link"
+                                  <DropdownToggle
+                                    aria-describedby={42}
+                                    aria-label="Import values from a file"
+                                    bsClass="dropdown-toggle"
+                                    bsRole="toggle"
+                                    bsStyle="link"
+                                    btooltipPlacement="bottom"
+                                    className="theme-tc-dropdown-button tc-dropdown-button"
+                                    displayMode="dropdown"
+                                    i18n={Object {}}
+                                    id="upload"
+                                    key=".0"
+                                    noCaret={true}
+                                    onBlur={[Function]}
+                                    onClick={[Function]}
+                                    onFocus={[Function]}
+                                    onKeyDown={[Function]}
+                                    onKeyPress={[Function]}
+                                    onMouseOut={[Function]}
+                                    onMouseOver={[Function]}
+                                    open={false}
+                                    role="button"
+                                    useAnchor={false}
                                   >
-                                    <DropdownToggle
+                                    <Button
+                                      active={false}
                                       aria-describedby={42}
+                                      aria-expanded={false}
+                                      aria-haspopup={true}
                                       aria-label="Import values from a file"
-                                      bsClass="dropdown-toggle"
-                                      bsRole="toggle"
+                                      block={false}
+                                      bsClass="btn"
                                       bsStyle="link"
                                       btooltipPlacement="bottom"
-                                      className="theme-tc-dropdown-button tc-dropdown-button"
+                                      className="theme-tc-dropdown-button tc-dropdown-button dropdown-toggle"
+                                      disabled={false}
                                       displayMode="dropdown"
                                       i18n={Object {}}
                                       id="upload"
-                                      key=".0"
-                                      noCaret={true}
+                                      onBlur={[Function]}
                                       onClick={[Function]}
+                                      onFocus={[Function]}
                                       onKeyDown={[Function]}
-                                      open={false}
+                                      onKeyPress={[Function]}
+                                      onMouseOut={[Function]}
+                                      onMouseOver={[Function]}
                                       role="button"
-                                      useAnchor={false}
                                     >
-                                      <Button
-                                        active={false}
+                                      <button
                                         aria-describedby={42}
                                         aria-expanded={false}
                                         aria-haspopup={true}
                                         aria-label="Import values from a file"
-                                        block={false}
-                                        bsClass="btn"
-                                        bsStyle="link"
                                         btooltipPlacement="bottom"
-                                        className="theme-tc-dropdown-button tc-dropdown-button dropdown-toggle"
+                                        className="theme-tc-dropdown-button tc-dropdown-button dropdown-toggle btn btn-link"
                                         disabled={false}
                                         displayMode="dropdown"
                                         i18n={Object {}}
                                         id="upload"
+                                        onBlur={[Function]}
                                         onClick={[Function]}
+                                        onFocus={[Function]}
                                         onKeyDown={[Function]}
+                                        onKeyPress={[Function]}
+                                        onMouseOut={[Function]}
+                                        onMouseOver={[Function]}
                                         role="button"
+                                        type="button"
                                       >
-                                        <button
-                                          aria-describedby={42}
-                                          aria-expanded={false}
-                                          aria-haspopup={true}
-                                          aria-label="Import values from a file"
-                                          btooltipPlacement="bottom"
-                                          className="theme-tc-dropdown-button tc-dropdown-button dropdown-toggle btn btn-link"
-                                          disabled={false}
-                                          displayMode="dropdown"
-                                          i18n={Object {}}
-                                          id="upload"
-                                          onClick={[Function]}
-                                          onKeyDown={[Function]}
-                                          role="button"
-                                          type="button"
+                                        <Icon
+                                          key="icon"
+                                          name="talend-download"
                                         >
-                                          <Icon
-                                            key="icon"
+                                          <svg
+                                            aria-hidden="true"
+                                            className="theme-tc-svg-icon tc-svg-icon"
+                                            focusable="false"
                                             name="talend-download"
+                                            title={null}
                                           >
-                                            <svg
-                                              aria-hidden="true"
-                                              className="theme-tc-svg-icon tc-svg-icon"
-                                              focusable="false"
-                                              name="talend-download"
-                                              title={null}
-                                            >
-                                              <use
-                                                xlinkHref="#talend-download"
-                                              />
-                                            </svg>
-                                          </Icon>
-                                        </button>
-                                      </Button>
-                                    </DropdownToggle>
-                                    <DropdownMenu
-                                      bsClass="dropdown-menu"
-                                      bsRole="menu"
-                                      key=".1"
-                                      labelledBy="upload"
-                                      onClose={[Function]}
-                                      onSelect={[Function]}
-                                      pullRight={true}
+                                            <use
+                                              xlinkHref="#talend-download"
+                                            />
+                                          </svg>
+                                        </Icon>
+                                      </button>
+                                    </Button>
+                                  </DropdownToggle>
+                                  <DropdownMenu
+                                    bsClass="dropdown-menu"
+                                    bsRole="menu"
+                                    key=".1"
+                                    labelledBy="upload"
+                                    onClose={[Function]}
+                                    onSelect={[Function]}
+                                    pullRight={true}
+                                  >
+                                    <RootCloseWrapper
+                                      disabled={true}
+                                      event="click"
+                                      onRootClose={[Function]}
                                     >
-                                      <RootCloseWrapper
-                                        disabled={true}
-                                        event="click"
-                                        onRootClose={[Function]}
+                                      <ul
+                                        aria-labelledby="upload"
+                                        className="dropdown-menu dropdown-menu-right"
+                                        role="menu"
                                       >
-                                        <ul
-                                          aria-labelledby="upload"
-                                          className="dropdown-menu dropdown-menu-right"
-                                          role="menu"
+                                        <MenuItem
+                                          bsClass="dropdown"
+                                          className="theme-tc-dropdown-item tc-dropdown-item"
+                                          disabled={false}
+                                          divider={false}
+                                          eventKey={
+                                            Object {
+                                              "data-feature": undefined,
+                                              "id": "append-uploding",
+                                              "label": "Add values from a file",
+                                              "onClick": [Function],
+                                            }
+                                          }
+                                          header={false}
+                                          id="append-uploding"
+                                          key=".2:$0"
+                                          label="Add values from a file"
+                                          onClick={[Function]}
+                                          onKeyDown={[Function]}
+                                          onSelect={[Function]}
+                                          title="Add values from a file"
                                         >
-                                          <MenuItem
-                                            bsClass="dropdown"
+                                          <li
                                             className="theme-tc-dropdown-item tc-dropdown-item"
-                                            disabled={false}
-                                            divider={false}
-                                            eventKey={
-                                              Object {
-                                                "data-feature": undefined,
-                                                "id": "append-uploding",
-                                                "label": "Add values from a file",
-                                                "onClick": [Function],
-                                              }
-                                            }
-                                            header={false}
-                                            id="append-uploding"
-                                            key=".2:$0"
-                                            label="Add values from a file"
-                                            onClick={[Function]}
-                                            onKeyDown={[Function]}
-                                            onSelect={[Function]}
-                                            title="Add values from a file"
+                                            role="presentation"
                                           >
-                                            <li
-                                              className="theme-tc-dropdown-item tc-dropdown-item"
-                                              role="presentation"
+                                            <SafeAnchor
+                                              componentClass="a"
+                                              id="append-uploding"
+                                              label="Add values from a file"
+                                              onClick={[Function]}
+                                              onKeyDown={[Function]}
+                                              role="menuitem"
+                                              tabIndex="-1"
+                                              title="Add values from a file"
                                             >
-                                              <SafeAnchor
-                                                componentClass="a"
+                                              <a
+                                                href="#"
                                                 id="append-uploding"
                                                 label="Add values from a file"
                                                 onClick={[Function]}
@@ -14212,49 +14197,49 @@ exports[`EnumerationWidget upload file should trigger a event when the user clic
                                                 tabIndex="-1"
                                                 title="Add values from a file"
                                               >
-                                                <a
-                                                  href="#"
-                                                  id="append-uploding"
-                                                  label="Add values from a file"
-                                                  onClick={[Function]}
-                                                  onKeyDown={[Function]}
-                                                  role="menuitem"
-                                                  tabIndex="-1"
-                                                  title="Add values from a file"
-                                                >
-                                                  Add values from a file
-                                                </a>
-                                              </SafeAnchor>
-                                            </li>
-                                          </MenuItem>
-                                          <MenuItem
-                                            bsClass="dropdown"
-                                            className="theme-tc-dropdown-item tc-dropdown-item"
-                                            disabled={false}
-                                            divider={false}
-                                            eventKey={
-                                              Object {
-                                                "data-feature": undefined,
-                                                "id": "append-uploding",
-                                                "label": "Overwrite existing values",
-                                                "onClick": [Function],
-                                              }
+                                                Add values from a file
+                                              </a>
+                                            </SafeAnchor>
+                                          </li>
+                                        </MenuItem>
+                                        <MenuItem
+                                          bsClass="dropdown"
+                                          className="theme-tc-dropdown-item tc-dropdown-item"
+                                          disabled={false}
+                                          divider={false}
+                                          eventKey={
+                                            Object {
+                                              "data-feature": undefined,
+                                              "id": "append-uploding",
+                                              "label": "Overwrite existing values",
+                                              "onClick": [Function],
                                             }
-                                            header={false}
-                                            id="append-uploding"
-                                            key=".2:$1"
-                                            label="Overwrite existing values"
-                                            onClick={[Function]}
-                                            onKeyDown={[Function]}
-                                            onSelect={[Function]}
-                                            title="Overwrite existing values"
+                                          }
+                                          header={false}
+                                          id="append-uploding"
+                                          key=".2:$1"
+                                          label="Overwrite existing values"
+                                          onClick={[Function]}
+                                          onKeyDown={[Function]}
+                                          onSelect={[Function]}
+                                          title="Overwrite existing values"
+                                        >
+                                          <li
+                                            className="theme-tc-dropdown-item tc-dropdown-item"
+                                            role="presentation"
                                           >
-                                            <li
-                                              className="theme-tc-dropdown-item tc-dropdown-item"
-                                              role="presentation"
+                                            <SafeAnchor
+                                              componentClass="a"
+                                              id="append-uploding"
+                                              label="Overwrite existing values"
+                                              onClick={[Function]}
+                                              onKeyDown={[Function]}
+                                              role="menuitem"
+                                              tabIndex="-1"
+                                              title="Overwrite existing values"
                                             >
-                                              <SafeAnchor
-                                                componentClass="a"
+                                              <a
+                                                href="#"
                                                 id="append-uploding"
                                                 label="Overwrite existing values"
                                                 onClick={[Function]}
@@ -14263,30 +14248,19 @@ exports[`EnumerationWidget upload file should trigger a event when the user clic
                                                 tabIndex="-1"
                                                 title="Overwrite existing values"
                                               >
-                                                <a
-                                                  href="#"
-                                                  id="append-uploding"
-                                                  label="Overwrite existing values"
-                                                  onClick={[Function]}
-                                                  onKeyDown={[Function]}
-                                                  role="menuitem"
-                                                  tabIndex="-1"
-                                                  title="Overwrite existing values"
-                                                >
-                                                  Overwrite existing values
-                                                </a>
-                                              </SafeAnchor>
-                                            </li>
-                                          </MenuItem>
-                                        </ul>
-                                      </RootCloseWrapper>
-                                    </DropdownMenu>
-                                  </div>
-                                </ButtonGroup>
-                              </Dropdown>
-                            </Uncontrolled(Dropdown)>
-                          </DropdownButton>
-                        </div>
+                                                Overwrite existing values
+                                              </a>
+                                            </SafeAnchor>
+                                          </li>
+                                        </MenuItem>
+                                      </ul>
+                                    </RootCloseWrapper>
+                                  </DropdownMenu>
+                                </div>
+                              </ButtonGroup>
+                            </Dropdown>
+                          </Uncontrolled(Dropdown)>
+                        </DropdownButton>
                       </TooltipTrigger>
                     </ActionDropdown>
                   </withI18nextTranslation(ActionDropdown)>
@@ -14331,61 +14305,60 @@ exports[`EnumerationWidget upload file should trigger a event when the user clic
                           label="Add item"
                           tooltipPlacement="top"
                         >
-                          <div
+                          <Button
+                            active={false}
                             aria-describedby={42}
-                            className="theme-tc-tooltip"
+                            aria-label="Add item"
+                            block={false}
+                            bsClass="btn"
+                            bsStyle="link"
+                            className="btn-icon-only"
+                            disabled={false}
+                            id="add"
+                            key=".0"
                             onBlur={[Function]}
                             onClick={[Function]}
                             onFocus={[Function]}
                             onKeyPress={[Function]}
+                            onMouseDown={[Function]}
                             onMouseOut={[Function]}
                             onMouseOver={[Function]}
+                            role="link"
                           >
-                            <Button
-                              active={false}
+                            <button
                               aria-describedby={42}
                               aria-label="Add item"
-                              block={false}
-                              bsClass="btn"
-                              bsStyle="link"
-                              className="btn-icon-only"
+                              className="btn-icon-only btn btn-link"
                               disabled={false}
                               id="add"
-                              key=".0"
+                              onBlur={[Function]}
                               onClick={[Function]}
+                              onFocus={[Function]}
+                              onKeyPress={[Function]}
                               onMouseDown={[Function]}
+                              onMouseOut={[Function]}
+                              onMouseOver={[Function]}
                               role="link"
+                              type="button"
                             >
-                              <button
-                                aria-describedby={42}
-                                aria-label="Add item"
-                                className="btn-icon-only btn btn-link"
-                                disabled={false}
-                                id="add"
-                                onClick={[Function]}
-                                onMouseDown={[Function]}
-                                role="link"
-                                type="button"
+                              <Icon
+                                key="icon"
+                                name="talend-plus"
                               >
-                                <Icon
-                                  key="icon"
+                                <svg
+                                  aria-hidden="true"
+                                  className="theme-tc-svg-icon tc-svg-icon"
+                                  focusable="false"
                                   name="talend-plus"
+                                  title={null}
                                 >
-                                  <svg
-                                    aria-hidden="true"
-                                    className="theme-tc-svg-icon tc-svg-icon"
-                                    focusable="false"
-                                    name="talend-plus"
-                                    title={null}
-                                  >
-                                    <use
-                                      xlinkHref="#talend-plus"
-                                    />
-                                  </svg>
-                                </Icon>
-                              </button>
-                            </Button>
-                          </div>
+                                  <use
+                                    xlinkHref="#talend-plus"
+                                  />
+                                </svg>
+                              </Icon>
+                            </button>
+                          </Button>
                         </TooltipTrigger>
                       </ActionButton>
                     </withI18nextTranslation(ActionButton)>
@@ -14996,59 +14969,58 @@ exports[`EnumerationWidget upload file should trigger a event when the user clic
                                             label="Edit"
                                             tooltipPlacement="bottom"
                                           >
-                                            <div
+                                            <Button
+                                              active={false}
                                               aria-describedby={42}
-                                              className="theme-tc-tooltip"
+                                              aria-label="Edit"
+                                              block={false}
+                                              bsClass="btn"
+                                              bsStyle="link"
+                                              className="btn-icon-only"
+                                              disabled={false}
+                                              key=".0"
                                               onBlur={[Function]}
                                               onClick={[Function]}
                                               onFocus={[Function]}
                                               onKeyPress={[Function]}
+                                              onMouseDown={[Function]}
                                               onMouseOut={[Function]}
                                               onMouseOver={[Function]}
+                                              role="link"
                                             >
-                                              <Button
-                                                active={false}
+                                              <button
                                                 aria-describedby={42}
                                                 aria-label="Edit"
-                                                block={false}
-                                                bsClass="btn"
-                                                bsStyle="link"
-                                                className="btn-icon-only"
+                                                className="btn-icon-only btn btn-link"
                                                 disabled={false}
-                                                key=".0"
+                                                onBlur={[Function]}
                                                 onClick={[Function]}
+                                                onFocus={[Function]}
+                                                onKeyPress={[Function]}
                                                 onMouseDown={[Function]}
+                                                onMouseOut={[Function]}
+                                                onMouseOver={[Function]}
                                                 role="link"
+                                                type="button"
                                               >
-                                                <button
-                                                  aria-describedby={42}
-                                                  aria-label="Edit"
-                                                  className="btn-icon-only btn btn-link"
-                                                  disabled={false}
-                                                  onClick={[Function]}
-                                                  onMouseDown={[Function]}
-                                                  role="link"
-                                                  type="button"
+                                                <Icon
+                                                  key="icon"
+                                                  name="talend-pencil"
                                                 >
-                                                  <Icon
-                                                    key="icon"
+                                                  <svg
+                                                    aria-hidden="true"
+                                                    className="theme-tc-svg-icon tc-svg-icon"
+                                                    focusable="false"
                                                     name="talend-pencil"
+                                                    title={null}
                                                   >
-                                                    <svg
-                                                      aria-hidden="true"
-                                                      className="theme-tc-svg-icon tc-svg-icon"
-                                                      focusable="false"
-                                                      name="talend-pencil"
-                                                      title={null}
-                                                    >
-                                                      <use
-                                                        xlinkHref="#talend-pencil"
-                                                      />
-                                                    </svg>
-                                                  </Icon>
-                                                </button>
-                                              </Button>
-                                            </div>
+                                                    <use
+                                                      xlinkHref="#talend-pencil"
+                                                    />
+                                                  </svg>
+                                                </Icon>
+                                              </button>
+                                            </Button>
                                           </TooltipTrigger>
                                         </ActionButton>
                                       </withI18nextTranslation(ActionButton)>
@@ -15090,59 +15062,58 @@ exports[`EnumerationWidget upload file should trigger a event when the user clic
                                             label="Remove value"
                                             tooltipPlacement="bottom"
                                           >
-                                            <div
+                                            <Button
+                                              active={false}
                                               aria-describedby={42}
-                                              className="theme-tc-tooltip"
+                                              aria-label="Remove value"
+                                              block={false}
+                                              bsClass="btn"
+                                              bsStyle="link"
+                                              className="btn-icon-only"
+                                              disabled={false}
+                                              key=".0"
                                               onBlur={[Function]}
                                               onClick={[Function]}
                                               onFocus={[Function]}
                                               onKeyPress={[Function]}
+                                              onMouseDown={[Function]}
                                               onMouseOut={[Function]}
                                               onMouseOver={[Function]}
+                                              role="link"
                                             >
-                                              <Button
-                                                active={false}
+                                              <button
                                                 aria-describedby={42}
                                                 aria-label="Remove value"
-                                                block={false}
-                                                bsClass="btn"
-                                                bsStyle="link"
-                                                className="btn-icon-only"
+                                                className="btn-icon-only btn btn-link"
                                                 disabled={false}
-                                                key=".0"
+                                                onBlur={[Function]}
                                                 onClick={[Function]}
+                                                onFocus={[Function]}
+                                                onKeyPress={[Function]}
                                                 onMouseDown={[Function]}
+                                                onMouseOut={[Function]}
+                                                onMouseOver={[Function]}
                                                 role="link"
+                                                type="button"
                                               >
-                                                <button
-                                                  aria-describedby={42}
-                                                  aria-label="Remove value"
-                                                  className="btn-icon-only btn btn-link"
-                                                  disabled={false}
-                                                  onClick={[Function]}
-                                                  onMouseDown={[Function]}
-                                                  role="link"
-                                                  type="button"
+                                                <Icon
+                                                  key="icon"
+                                                  name="talend-trash"
                                                 >
-                                                  <Icon
-                                                    key="icon"
+                                                  <svg
+                                                    aria-hidden="true"
+                                                    className="theme-tc-svg-icon tc-svg-icon"
+                                                    focusable="false"
                                                     name="talend-trash"
+                                                    title={null}
                                                   >
-                                                    <svg
-                                                      aria-hidden="true"
-                                                      className="theme-tc-svg-icon tc-svg-icon"
-                                                      focusable="false"
-                                                      name="talend-trash"
-                                                      title={null}
-                                                    >
-                                                      <use
-                                                        xlinkHref="#talend-trash"
-                                                      />
-                                                    </svg>
-                                                  </Icon>
-                                                </button>
-                                              </Button>
-                                            </div>
+                                                    <use
+                                                      xlinkHref="#talend-trash"
+                                                    />
+                                                  </svg>
+                                                </Icon>
+                                              </button>
+                                            </Button>
                                           </TooltipTrigger>
                                         </ActionButton>
                                       </withI18nextTranslation(ActionButton)>
@@ -15363,59 +15334,58 @@ exports[`EnumerationWidget upload file should trigger a event when the user clic
                                             label="Edit"
                                             tooltipPlacement="bottom"
                                           >
-                                            <div
+                                            <Button
+                                              active={false}
                                               aria-describedby={42}
-                                              className="theme-tc-tooltip"
+                                              aria-label="Edit"
+                                              block={false}
+                                              bsClass="btn"
+                                              bsStyle="link"
+                                              className="btn-icon-only"
+                                              disabled={false}
+                                              key=".0"
                                               onBlur={[Function]}
                                               onClick={[Function]}
                                               onFocus={[Function]}
                                               onKeyPress={[Function]}
+                                              onMouseDown={[Function]}
                                               onMouseOut={[Function]}
                                               onMouseOver={[Function]}
+                                              role="link"
                                             >
-                                              <Button
-                                                active={false}
+                                              <button
                                                 aria-describedby={42}
                                                 aria-label="Edit"
-                                                block={false}
-                                                bsClass="btn"
-                                                bsStyle="link"
-                                                className="btn-icon-only"
+                                                className="btn-icon-only btn btn-link"
                                                 disabled={false}
-                                                key=".0"
+                                                onBlur={[Function]}
                                                 onClick={[Function]}
+                                                onFocus={[Function]}
+                                                onKeyPress={[Function]}
                                                 onMouseDown={[Function]}
+                                                onMouseOut={[Function]}
+                                                onMouseOver={[Function]}
                                                 role="link"
+                                                type="button"
                                               >
-                                                <button
-                                                  aria-describedby={42}
-                                                  aria-label="Edit"
-                                                  className="btn-icon-only btn btn-link"
-                                                  disabled={false}
-                                                  onClick={[Function]}
-                                                  onMouseDown={[Function]}
-                                                  role="link"
-                                                  type="button"
+                                                <Icon
+                                                  key="icon"
+                                                  name="talend-pencil"
                                                 >
-                                                  <Icon
-                                                    key="icon"
+                                                  <svg
+                                                    aria-hidden="true"
+                                                    className="theme-tc-svg-icon tc-svg-icon"
+                                                    focusable="false"
                                                     name="talend-pencil"
+                                                    title={null}
                                                   >
-                                                    <svg
-                                                      aria-hidden="true"
-                                                      className="theme-tc-svg-icon tc-svg-icon"
-                                                      focusable="false"
-                                                      name="talend-pencil"
-                                                      title={null}
-                                                    >
-                                                      <use
-                                                        xlinkHref="#talend-pencil"
-                                                      />
-                                                    </svg>
-                                                  </Icon>
-                                                </button>
-                                              </Button>
-                                            </div>
+                                                    <use
+                                                      xlinkHref="#talend-pencil"
+                                                    />
+                                                  </svg>
+                                                </Icon>
+                                              </button>
+                                            </Button>
                                           </TooltipTrigger>
                                         </ActionButton>
                                       </withI18nextTranslation(ActionButton)>
@@ -15457,59 +15427,58 @@ exports[`EnumerationWidget upload file should trigger a event when the user clic
                                             label="Remove value"
                                             tooltipPlacement="bottom"
                                           >
-                                            <div
+                                            <Button
+                                              active={false}
                                               aria-describedby={42}
-                                              className="theme-tc-tooltip"
+                                              aria-label="Remove value"
+                                              block={false}
+                                              bsClass="btn"
+                                              bsStyle="link"
+                                              className="btn-icon-only"
+                                              disabled={false}
+                                              key=".0"
                                               onBlur={[Function]}
                                               onClick={[Function]}
                                               onFocus={[Function]}
                                               onKeyPress={[Function]}
+                                              onMouseDown={[Function]}
                                               onMouseOut={[Function]}
                                               onMouseOver={[Function]}
+                                              role="link"
                                             >
-                                              <Button
-                                                active={false}
+                                              <button
                                                 aria-describedby={42}
                                                 aria-label="Remove value"
-                                                block={false}
-                                                bsClass="btn"
-                                                bsStyle="link"
-                                                className="btn-icon-only"
+                                                className="btn-icon-only btn btn-link"
                                                 disabled={false}
-                                                key=".0"
+                                                onBlur={[Function]}
                                                 onClick={[Function]}
+                                                onFocus={[Function]}
+                                                onKeyPress={[Function]}
                                                 onMouseDown={[Function]}
+                                                onMouseOut={[Function]}
+                                                onMouseOver={[Function]}
                                                 role="link"
+                                                type="button"
                                               >
-                                                <button
-                                                  aria-describedby={42}
-                                                  aria-label="Remove value"
-                                                  className="btn-icon-only btn btn-link"
-                                                  disabled={false}
-                                                  onClick={[Function]}
-                                                  onMouseDown={[Function]}
-                                                  role="link"
-                                                  type="button"
+                                                <Icon
+                                                  key="icon"
+                                                  name="talend-trash"
                                                 >
-                                                  <Icon
-                                                    key="icon"
+                                                  <svg
+                                                    aria-hidden="true"
+                                                    className="theme-tc-svg-icon tc-svg-icon"
+                                                    focusable="false"
                                                     name="talend-trash"
+                                                    title={null}
                                                   >
-                                                    <svg
-                                                      aria-hidden="true"
-                                                      className="theme-tc-svg-icon tc-svg-icon"
-                                                      focusable="false"
-                                                      name="talend-trash"
-                                                      title={null}
-                                                    >
-                                                      <use
-                                                        xlinkHref="#talend-trash"
-                                                      />
-                                                    </svg>
-                                                  </Icon>
-                                                </button>
-                                              </Button>
-                                            </div>
+                                                    <use
+                                                      xlinkHref="#talend-trash"
+                                                    />
+                                                  </svg>
+                                                </Icon>
+                                              </button>
+                                            </Button>
                                           </TooltipTrigger>
                                         </ActionButton>
                                       </withI18nextTranslation(ActionButton)>