CleanUp and Add Active Display Icon