Any of the 600 series momentary switch modules should work, like the 681M16PBP or 681MT10PB. The 681MT10PB looks really nice, but the Dimmer 2 doesn't have a non-dimming output so you can only wire LED on the switch to be continuously on as a switch-finder. Also the 681MT10PB is quite deep in the wall box.
The Fibaro specs don't give the voltage on the switch terminals so you should stick to 230V switches, don't use the 24V 680TMPB module.
Turns out the flickering is due to my own stupidity... I totally forgot to replace the halogen drivers with LED drivers...!
This is what it looks like, this one is for the Kitchen/Dining, don't think I'll put them in the bedrooms though the bright light would do my head in.
The middle one isn't hooked up yet, but plan is to use that to turn on the gas fireplace...
For the bedrooms, if you're using a switch module rather than a dimmer then you can switch the LED with the light.
Where did you position the modules?