Merge "Adjust tool bar tab dimension (1/2)" into main