FLOE-198: Adjusted the floating of icons

The icons now float as a set for the preference icons and the control icons.