Fix some styles to adapt new code
Fix type element icons