Icons moved/code refinement