Revert "Revert "Add icon support for options in preference setting screen.""

This reverts commit 7af25641ec401d9f669497bd401020f2cb5933ef.

Change-Id: I03381ffeee4aca787ea376bcd5fe150ff0f97dbf
7 files changed