Fix settings titles and underlines

Change-Id: I8602fcaf20fb0b84ab26fe981e295dc595ad3fc4
Closes-bug: #1301298
Merge "Fix settings titles and underlines"