Optimize use of wpf controls

One less Grid control and one less Path control in the WindowButtonCommands' default template, the same behavior holds. Optimizing for less WPF controls is always good.