Bug: 36497538 Test: Manual - visually checked icons. Change-Id: I1d5dd1b80bd32667e47dfc4a1c355a5106271d72 (cherry picked from commit d49d28a8)