This avoids needing to duplicate some logic, in particular icon
source and name changes triggering icon updates.

Change-Id: Id8b34fa365db6d31eb6855f690c13073fd589a2c
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>