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