Remove file extension from OEControllerImageKey and OEControllerImageMaskKey values again.
Always limit width of OEControlsButtonSetupView to visible size to disable horizontal scrolling.