controls icon update and code cleanup