Per app icon support / UI improvements