cleanup and use our old theme icon

Change-Id: Id4c559ecde9b720dc2a0e34bcc238657e3f301dc
Merge "cleanup and use our old theme icon" into kk44