Fix buttons (Use new icons)