fixed icon loading issues
moved variables to their respective classes