MenuIcons to Buttons (Refactor)