DockAppIcon: clean up and modernize [#8834]