Fix icons issue, fix regexp issue