merged from protocol 3 branch; fixed regression, buttons in debug mode don't have an image
merged from protocol 3 branch; fixed regression, buttons in debug mode don't have an image

runeh/dragonfly-stp-1,runeh/dragonfly-stp-1,runeh/dragonfly-stp-1