Add target destionaion/ruler/current location
Delete large icons
Fix icons and layouts