Cleaned up script locations, updated icon display