20130926 update icons.
20130926 fix conflict and change min api level to 8(android 2.2)
21030926 fix conflicts.