[ANDROID] Fix some bugs, add better icons