Fix wrapping for borders, other kinds of wrapping
Add resource icons