settings: Fix margins

Change-Id: I3ad652b05d990377c6a01a0abb8091f1ff2443c7
Merge "settings: Fix margins"