and the add more button is on the right This fix moves the settings button back to the right and the add more button back to the left.
This will move the settings button back to the right, like known from older versions. For this, the overflow-menu was changed when a setting button is available. If no settings button is available, the behavior will not change. Fixes #3301