cleanup inspector icon styles.
resolve conflict
Merge branch 'new_branch_name'