Code cleanup

Some code cleanup and icons replacements