Manual merge for #196 #199 thanks @ppv1979
Cleanup and enhance icon replacements, further improving #200
Clearly mark delete icons