Merge "Update tool that fill screen with icons" into tm-dev