Fix type attribute with data-type attribute
Fix unsupported icons