Update icon pointers and remove obsolete preference class. Bug: 17762712 Change-Id: Ia4b96c5b38f2a73a7a339b2ab3abfcd433f4403d
Bug: 16900054 Change-Id: If94a18a7cac596c0f4c33421b642f96dcf0280fd