Automatic icon reorder
CSP violation fix