Android: Fixed remove buttons