Make stock commands work more like stock icons