Ok, the symptoms I mentioned were with your original file , NOT the one you attached today... the one you attached today, has second row alignment problems so delete it from consideration completely.
Here is the SS of my original problem with the UI and the overflow on row 1. It has 22 icons shown. The 23rd will properly wrap down to start a row 2 but need the 21st to do that in order to avoid the overflow:
|