Rename icons to more generic names

Change-Id: Idb07cde4aafc8d7adf949d9c8ab8155131d9b4e1
Merge "Rename icons to more generic names"