move to context menu approach w/updated icons