coverity#1187810 Uncaught exception

Change-Id: Icfd867bbe24ca738ad409001115d1b0470041de4
tweak things to allow switching between small and large toolbar icons

Change-Id: Ife4da4c6f4acc3b3f9fde18cdfc09635cf9b6776