Revert "image and borders"

This reverts commit 0522c32d00e20b043f04957163e4a224088a6543.