Equipped item switching is not intuitive

Switching items from inventory to the equipped slot with right click does not swap the equipped item back into the inventory slot that was clicked.  It seems like the game attempts to place it back into it's original slot unless it's occupied then it just picks the first one, i'm guessing.  This is not intuitive but perhaps some people have gotten used to this.  Suggest to add an option to implement a new swapping and it can be turned on/off.  New swapping is the equipped item will swap with the inventory item that was clicked (or pressed/hotkey).  This is much more intuitive and it works like this is almost every other game.

This is especially problematic since the new character-specific tools have been added because those tools are essential.  Such as Willow's lighter.  You will need to keep swapping it with tools like axe, pickaxe, spears.  And then all your items are mixed up and you can longer swap your lighter back into your equipped using the hotkey (since it's mixed now).  It's fine if you are only swapping between 2 items.   But once you have 3 or more items.  It messes up everything.