Add comments and constants, remove redundant icons