Improved position of toggler icon

Change-Id: I5c12e4be5ec0dba6e0748215082fbff9767c7286
Merge "Improved position of toggler icon"