Brush Tool : Move the "Fill" option from the top of the screen back to the texture window

I like the new UI a lot. It's more compact and more intuitive but for one thing : it took me ages to find the "Fill" option up there. I think it would be more intuitive to either put it in the shapes list. There is space for it too. Or add it as a button to the left of the Advanced setting button.