am c86584b4: am 06a1ff74: am 2fce90c3: Cleaning up icon resizing code

* commit 'c86584b440448f51c35416e872e1f59f132fa0bb':