Refactor Editor. Added File and Edit functions + icon support