Remove extension from icon
Labels improved