remove flavor image borders
add workaround against UI flicker bug