Fix app icon to open info drawer, code cleanup.