The shape mappings are added when not already present, performing a more
precise control that considers each molecule type.
The shape legend is now better centered