Added launcher icons. Also cleaned up code and preparing for rebase with API branch.