icons fix and window.location instead of query