Lifecycle handled. Icons updated
Merge branch 'menu_layouts' of https://github.com/NC2903/Tortoise into menu_layouts