Fixes for the last 2 commits and add missing Reset Icon.

Change-Id: Ia01d1fd5fdffd8021d5e9fc2e07fe6dbb26434b7