Switched wrench icon to gear icon.
New submenu icon.

Change-Id: I490ace7b32aaf683d62a534addd2670f586d015a