icons, language consistency

client/src/components/categorical/category/annoMenuCategory.js

@@ -89,7 +89,7 @@ class AnnoMenuCategory extends React.PureComponent {
                     text={editText}
                   />
                   <MenuItem
-                    icon="delete"
+                    icon="trash"
                     intent="danger"
                     data-testclass="handleDeleteCategory"
                     data-testid={`${metadataField}:delete-category`}

client/src/components/categorical/value/index.js

@@ -731,7 +731,7 @@ class CategoryValue extends React.Component {
                       ) : null}
                       {displayString !== globals.unassignedCategoryLabel ? (
                         <MenuItem
-                          icon="delete"
+                          icon="trash"
                           intent="danger"
                           data-testclass="handleDeleteValue"
                           data-testid={`${metadataField}:${displayString}:delete-label`}

client/src/components/geneExpression/gene.js

@@ -134,7 +134,7 @@ class Gene extends React.Component {
                 small
                 data-testid={`delete-from-geneset-${gene}`}
                 onClick={this.handleDeleteGeneFromSet}
-                intent="danger"
+                intent="none"
                 style={{ fontWeight: 700, marginRight: 2 }}
                 icon={<Icon icon="trash" iconSize={10} />}
               />

client/src/components/geneExpression/menus/genesetMenus.js

@@ -84,7 +84,7 @@ class GenesetMenus extends React.PureComponent {
                     text="Edit gene set name"
                   />
                   <MenuItem
-                    icon="delete"
+                    icon="trash"
                     intent="danger"
                     data-testclass="handleDeleteCategory"
                     data-testid={`${geneset}:delete-category`}
@@ -103,6 +103,12 @@ class GenesetMenus extends React.PureComponent {
                 minimal
               />
             </Popover>
+            <Button
+              style={{ marginLeft: 0 }}
+              data-testclass="colorby-entire-geneset"
+              data-testid={`${geneset}:colorby-entire-geneset`}
+              icon={<Icon icon="tint" iconSize={16} />}
+            />
           </>
         ) : null}
       </>