Moved icons to top level