Fhr toolbox changes

r? @mreid-moz