Refactored edittoolbar options

Change-Id: Ie702c08b8f313f7fbbc03d93b456fdcad8453eba