Use this one.
The layout got pretty complex, but it works.
I did not get you. Use which one? Did you attach any file to the message. I do not see it. If you dont mind can you attach it again.

May I suggest that instead of using two columns of buttons use only one and select with a combo box or a check box whether you're modifying the stroke or fill color?
Thanks for the suggestion. But I still would like it this way.