(android) Added new icon, cleaned up navigation drawer code