[FIX] Alignment on gateway discovery pages and trust pages (RT-2708)