Revert "Ä†leanup and added Icon."

This reverts commit cc1726911b3d27f6dffae4fcc656ad863ff9b200.