Finished Android; portrait and landscape work; replaced icons.