plugin rewriten

plugin rewriten for easier maintance
added new icons