Improved icon tapped response at single page