Inconsistency between toolbar feature and single image viewer workflow

When image viewer is showing an image, the default 'Add image' feature shows a dialog which allow the user to add or replace the image.
Adding an image only works in expanded mode but this is not the expected workflow from Gator..
The image search dialog should only accept replace image option.
The presence of the 'lock images' button doesn't make sense either in this workflow of single image viewer and should be removed from the toolbar or controlled by option to be disabled.

If options exists and are exposed in the API already, please, update Gator to do so.