Merge commit 'ae5dd1d19a6b7f9453daf03deb1907eb039d1ef6' into eclair-plus-aosp * commit 'ae5dd1d19a6b7f9453daf03deb1907eb039d1ef6': More icons