Theme Engine: let theme service handle saving icons

Change-Id: Iaeef72242d9a043b6da62cb1f0ff2081058f556b