UI-2913  CLONE - Incorrect UI of some gadgets