Scrolling Error & Icon Loading Bug Fix