Compessate border by margin in icon showing (refs #4117)
Merge pull request #24 from thingthing/3.2-I4117

Compensate border by margin in icon showing (closes #4117)