Merge "Add themed icons." into qt-r1-dev
am: 4ef09fd470

Change-Id: I1e9ca89a634860a32c02abeb80628724167112d9