Merge "Remove more unused icons." into klp-dev