Merge branch 'MLAB-582' into 'testing'

Optimize card appearance

See merge request !80
1 job for testing in 25 seconds (queued for 6 seconds)