UI-3266: Gadget - close icons are not aligned.
Merge commit 'abc4315bbc376ac2921060d67f8bc120537fe962' into HEAD
Merge commit 'b632cd4fe10a337ef4b9abc4970889047e3570f9' into HEAD