So far there is no good solution to replace them.
The official workaround for pictured menu items would add an ugly left
padding.
So we will keep the current code as long as there is no other option.