cleanups/improved icons