Reset support for themed icons (2/3).

Fix: 267804366
Test: unit tests
Test: manually verified starting with themed icons on or off, reset
button shows when different from original value, button hides when the
same as the original value, resetting and confirming returns to the
original value

Change-Id: I6c6610265e2a279b6a8732d35e128482ac35396f