Revert "Merge branch '163-cleanup-toolbar' into...

Revert "Merge branch '163-cleanup-toolbar' into '164-implement-rename-skill-and-change-description'"

This reverts merge request !119 (merged)