I think this method needs some changes, too, now that there is only one ImageButton left. The clever thing to do here would be to check for the drawable set as an image source instead of visibility. This might imply further changes in this class. I'd rather not have useless checks for visibility, since now, the ImageButton is always visible.