I think with a simple moving around of some of the components it makes it easier to work with.
This is similar to what I use, and the small icons option was great! So ive made some other changes now too 
Something like this layout would be great to see as default…
