Controls - Custom icon/color issues

1. Icon tint colors were not being reset, and improperly reused
2. Routines were using the default icon and not the app icon

Fixes: 168012518
Test: Use controls with custom icons, plus enough controls to scroll
the recyclerview in editing/favoriting activities

Change-Id: I5501139f895739bb414fb4cfa471597254ddaa03
(cherry picked from commit 2fedcb61)