As of now (Patch 7) we still have 2 icons for each of Battle Master's manoeuvres that involve weapons' usage: one for Melee, and another one for Ranged.
By itself, it adds an extra layer of complexity to find the right one: because the pictures are not easy to read and are too messy / similar to each other, I for example have to rely on tooltips, while means that the current design of the pictograms is a failure. If that wasn't enough, even if I arrange them on the hotbar in an order that makes sense to me, every time I load from save they are reshuffled again in a seemingly random order.
Now, Larian, I'm not going to ask for impossible things, such as to redesign the icons so they would make some kind of sense, or to persist customised hotbars in save files and respect that data on load. However, how about we would have just a single button for each manoeuvre, and when selected, that said manoeuvre would be executed with the currently equipped weapon? That should simplify things, if anything.
P.S. By the way, the same approach would be valid for Rogue's Sneak Attack, as well.