[Bug 1110] - Redraw of buttons