Re-org android icon placement