separate tools and /usr/bin shortcuts
Merge pull request #5365 from Mailaender/tools-shortcuts

Separated tools and /usr/bin shortcuts