Redesign settings on tablets am: 86f2a86b99 am: ae23161a0e am: 2543113
am: bf49f79

* commit 'bf49f794da16b62488de4f15e1cd7f87ce9d20e2':