Fixes spacing on all devices (DT-1314)