Icon Scroll bug fix