Use built in icons in combined remote layout.
Couple fixes.