This border code needs to be updated for the Diamond glyph.  Right now, it's drawing a rectangular border.