Gallery - media buttons are not clearly recognizable to which media item they belong

Currently if you have a list of media for the gallery paragraph it is not clearly determinable which buttons belong to which media item. This needs to be improved by the design.
There already has been an improvement with the most recent code in the thunder distribution (see attached picture), however this can be much improved.