diff --git a/CHANGES.rst b/CHANGES.rst
index 149c26d8ad..eaf88d0608 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -20,7 +20,7 @@ Imviz
 
 - Orientation plugin API now exposes create_north_up_east_left and create_north_up_east_right methods. [#3308]
 
-- Add Roman WFI and CGI footprints to the Footprints plugin. [#3322]
+- Add Roman WFI and CGI footprints to the Footprints plugin. [#3322, #3345]
 
 - Catalog Search plugin now exposes a maximum sources limit for all catalogs and resolves an edge case
   when loading a catalog from a file that only contains one source. [#3337]
diff --git a/jdaviz/components/plugin_file_import_select.vue b/jdaviz/components/plugin_file_import_select.vue
index d037d025c0..941bc476e6 100644
--- a/jdaviz/components/plugin_file_import_select.vue
+++ b/jdaviz/components/plugin_file_import_select.vue
@@ -4,7 +4,9 @@
       <v-select
         :menu-props="{ left: true }"
         attach
-        :items="items.map(i => i.label)"
+        :items="items"
+        item-text="label"
+        item-value="label"
         v-model="selected"
         @change="$emit('update:selected', $event)"
         :label="api_hints_enabled && api_hint ? api_hint : label"
@@ -12,15 +14,26 @@
         :hint="hint"
         persistent-hint
       >
-        <template v-slot:selection="{ item }">
-          <span :class="api_hints_enabled ? 'api-hint' : null">
-            {{ api_hints_enabled ?
-              '\'' + item + '\''
-              :
-              item
-            }}
+        <template v-slot:selection="{ item, index }">
+          <div class="single-line" style="width: 100%">
+            <span v-if="api_hints_enabled" class="api-hint" :style="index > 0 ? 'display: none' : null">
+              {{'\'' + selected + '\''}}
+            </span>
+            <span v-else>
+              <v-icon v-if="item.icon && item.icon.length < 50" small>{{ item.icon }}</v-icon>
+              <img v-else-if="item.icon" :src="item.icon" width="16" class="invert-if-dark" style="opacity: 1.0; margin-bottom: -2px"/>
+              {{ selected }}
+            </span>
+          </div>
+        </template>
+        <template v-slot:item="{ item }">
+          <span style="margin-top: 8px; margin-bottom: 0px">
+            <v-icon v-if="item.icon && item.icon.length < 50" small>{{ item.icon }}</v-icon>
+            <img v-else-if="item.icon" :src="item.icon" width="16" class="invert-if-dark" style="opacity: 1.0; margin-bottom: -2px"/>
+            {{ item.label }}
           </span>
         </template>
+    
       </v-select>
       <v-chip v-if="selected === 'From File...'"
         close
diff --git a/jdaviz/configs/default/plugins/data_menu/data_menu.py b/jdaviz/configs/default/plugins/data_menu/data_menu.py
index 8a0fab6e22..d1a2abcb5f 100644
--- a/jdaviz/configs/default/plugins/data_menu/data_menu.py
+++ b/jdaviz/configs/default/plugins/data_menu/data_menu.py
@@ -247,7 +247,7 @@ def _layers_changed(self, event={}):
         if event.get('name') == 'layer_items':
             # changing the layers in the viewer needs to trigger an update to dataset_items
             # through the set filters
-            self.dataset._on_data_changed()
+            self.dataset._update_items()
             self.loaded_n_data = len([lyr for lyr in self.layer.choices
                                       if lyr not in subset_labels])
             return
diff --git a/jdaviz/configs/default/plugins/data_quality/data_quality.py b/jdaviz/configs/default/plugins/data_quality/data_quality.py
index e432e7b133..10ad8619f6 100644
--- a/jdaviz/configs/default/plugins/data_quality/data_quality.py
+++ b/jdaviz/configs/default/plugins/data_quality/data_quality.py
@@ -142,7 +142,7 @@ def update_dq_layer(self, *args):
             return
 
         self.dq_layer.filter_is_child_of = self.science_layer_selected
-        self.dq_layer._update_layer_items()
+        self.dq_layer._update_items()
 
         # listen for changes on the image opacity, and update the
         # data quality layer opacity on changes to the science layer opacity
diff --git a/jdaviz/configs/default/plugins/export/export.py b/jdaviz/configs/default/plugins/export/export.py
index c7cbeb8b75..9360d075f6 100644
--- a/jdaviz/configs/default/plugins/export/export.py
+++ b/jdaviz/configs/default/plugins/export/export.py
@@ -290,7 +290,12 @@ def _is_filename_changed(self, event):
     def _update_subset_format_disabled(self):
         new_items = []
         if self.subset.selected is not None:
-            subset = self.app.get_subsets(self.subset.selected)
+            try:
+                subset = self.app.get_subsets(self.subset.selected)
+            except Exception:
+                # subset invalid message will already be set,
+                # no need to set valid/invalid formats.
+                return
             if self.app._is_subset_spectral(subset[0]):
                 good_formats = ["ecsv"]
             else:
@@ -333,16 +338,20 @@ def _set_subset_not_supported_msg(self, msg=None):
         disable Export button until these are supported.
         """
 
-        if self.subset.selected is not None:
-            subset = self.app.get_subsets(self.subset.selected)
-            if self.subset.selected == '':
-                self.subset_invalid_msg = ''
-            elif self.app._is_subset_spectral(subset[0]):
-                self.subset_invalid_msg = ''
-            elif len(subset) > 1:
-                self.subset_invalid_msg = 'Export for composite subsets not yet supported.'
+        if self.subset.selected not in [None, '']:
+            try:
+                subset = self.app.get_subsets(self.subset.selected)
+            except Exception as e:
+                self.subset_invalid_msg = f"Export for subset not supported: {e}"
             else:
-                self.subset_invalid_msg = ''
+                if self.subset.selected == '':
+                    self.subset_invalid_msg = ''
+                elif self.app._is_subset_spectral(subset[0]):
+                    self.subset_invalid_msg = ''
+                elif len(subset) > 1:
+                    self.subset_invalid_msg = 'Export for composite subsets not yet supported.'
+                else:
+                    self.subset_invalid_msg = ''
         else:  # no subset selected (can be '' instead of None if previous selection made)
             self.subset_invalid_msg = ''
 
diff --git a/jdaviz/configs/default/plugins/subset_tools/subset_tools.py b/jdaviz/configs/default/plugins/subset_tools/subset_tools.py
index 930eb5444f..4e9dc5290a 100644
--- a/jdaviz/configs/default/plugins/subset_tools/subset_tools.py
+++ b/jdaviz/configs/default/plugins/subset_tools/subset_tools.py
@@ -116,8 +116,8 @@ class SubsetTools(PluginTemplateMixin):
     icon_radialtocheck = Unicode(read_icon(os.path.join(ICON_DIR, 'radialtocheck.svg'), 'svg+xml')).tag(sync=True)  # noqa
     icon_checktoradial = Unicode(read_icon(os.path.join(ICON_DIR, 'checktoradial.svg'), 'svg+xml')).tag(sync=True)  # noqa
 
-    combination_items = List([]).tag(sync=True)
-    combination_selected = Any().tag(sync=True)
+    combination_mode_items = List([]).tag(sync=True)
+    combination_mode_selected = Any().tag(sync=True)
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -160,8 +160,8 @@ def __init__(self, *args, **kwargs):
                                               multiselect=None)
 
         self.combination_mode = SelectPluginComponent(self,
-                                                      items='combination_items',
-                                                      selected='combination_selected',
+                                                      items='combination_mode_items',
+                                                      selected='combination_mode_selected',
                                                       manual_options=COMBO_OPTIONS)
 
     @property
@@ -1125,11 +1125,11 @@ def _load_regions(self, regions, combination_mode=None, max_num_regions=None,
         if return_bad_regions:
             return bad_regions
 
-    @observe('combination_selected')
-    def _combination_selected_updated(self, change):
+    @observe('combination_mode_selected')
+    def _combination_mode_selected_updated(self, change):
         self.app.session.edit_subset_mode.mode = SUBSET_MODES_PRETTY[change['new']]
 
     def _update_combination_mode(self):
         if self.app.session.edit_subset_mode.mode in SUBSET_TO_PRETTY.keys():
-            self.combination_mode.selected = SUBSET_TO_PRETTY[
+            self.combination_mode_selected = SUBSET_TO_PRETTY[
                 self.app.session.edit_subset_mode.mode]
diff --git a/jdaviz/configs/default/plugins/subset_tools/subset_tools.vue b/jdaviz/configs/default/plugins/subset_tools/subset_tools.vue
index 7055a0b45a..d6c16dd72d 100644
--- a/jdaviz/configs/default/plugins/subset_tools/subset_tools.vue
+++ b/jdaviz/configs/default/plugins/subset_tools/subset_tools.vue
@@ -52,7 +52,7 @@
 
     <v-row v-if="api_hints_enabled" style="margin-top: -32px">
       <span class="api-hint">
-        plg.combination_mode = '{{ combination_selected }}'
+        plg.combination_mode = '{{ combination_mode_selected }}'
       </span>
     </v-row>
 
diff --git a/jdaviz/configs/imviz/plugins/footprints/footprints.py b/jdaviz/configs/imviz/plugins/footprints/footprints.py
index 862b58b9c9..4ba333b604 100644
--- a/jdaviz/configs/imviz/plugins/footprints/footprints.py
+++ b/jdaviz/configs/imviz/plugins/footprints/footprints.py
@@ -1,8 +1,10 @@
 from traitlets import Bool, List, Unicode, observe
 import numpy as np
+import os
 import regions
 
 from glue.core.message import DataCollectionAddMessage, DataCollectionDeleteMessage
+from glue_jupyter.common.toolbar_vuetify import read_icon
 
 from jdaviz.core.custom_traitlets import FloatHandleEmpty
 from jdaviz.core.events import LinkUpdatedMessage, ChangeRefDataMessage
@@ -10,8 +12,9 @@
 from jdaviz.core.region_translators import regions2roi
 from jdaviz.core.registries import tray_registry
 from jdaviz.core.template_mixin import (PluginTemplateMixin, ViewerSelectMixin,
-                                        EditableSelectPluginComponent,
+                                        EditableSelectPluginComponent, SelectPluginComponent,
                                         FileImportSelectPluginComponent, HasFileImportSelect)
+from jdaviz.core.tools import ICON_DIR
 from jdaviz.core.user_api import PluginUserApi
 
 from jdaviz.configs.imviz.plugins.footprints import preset_regions
@@ -20,13 +23,6 @@
 __all__ = ['Footprints']
 
 
-_available_instruments = {
-    display_name: {'label': display_name, 'siaf_name': siaf_name, 'observatory': observatory}
-    for observatory, instruments in preset_regions._instruments.items()
-    for display_name, siaf_name in instruments.items()
-}
-
-
 @tray_registry('imviz-footprints', label="Footprints")
 class Footprints(PluginTemplateMixin, ViewerSelectMixin, HasFileImportSelect):
     """
@@ -54,6 +50,8 @@ class Footprints(PluginTemplateMixin, ViewerSelectMixin, HasFileImportSelect):
         color of the currently selected overlay
     * ``fill_opacity``
         opacity of the filled region of the currently selected overlay
+    * ``preset_obs`` (:class:`~jdaviz.core.template_mixin.SelectPluginComponent`):
+        selected observatories to filter ``preset`` choices.
     * ``preset`` (:class:`~jdaviz.core.template_mixin.SelectPluginComponent`):
         selected overlay preset
     * :meth:`import_region`
@@ -92,6 +90,8 @@ class Footprints(PluginTemplateMixin, ViewerSelectMixin, HasFileImportSelect):
 
     # PRESET OVERLAYS AND OPTIONS
     has_pysiaf = Bool(preset_regions._has_pysiaf).tag(sync=True)
+    preset_obs_items = List().tag(sync=True)
+    preset_obs_selected = Unicode().tag(sync=True)
     preset_items = List().tag(sync=True)
     preset_selected = Unicode().tag(sync=True)
 
@@ -126,17 +126,31 @@ def __init__(self, *args, **kwargs):
                                                      on_remove=self._on_overlay_remove)
 
         if self.has_pysiaf:
-            preset_options = list(_available_instruments.keys())
+            obs_icons = {'JWST': read_icon(os.path.join(ICON_DIR, 'jwst_solid.svg'), 'svg+xml'),
+                         'Roman': read_icon(os.path.join(ICON_DIR, 'roman_solid.svg'), 'svg+xml')}
+            preset_options = [{'label': display_name,
+                               'siaf_name': siaf_name,
+                               'observatory': observatory,
+                               'icon': obs_icons.get(observatory, None)}
+                              for observatory, instruments in preset_regions._instruments.items()
+                              for display_name, siaf_name in instruments.items()]
+            preset_obs_options = ['Any'] + [{'label': obs, 'icon': obs_icons.get(obs)}
+                                            for obs in preset_regions._instruments.keys()]
         else:
             preset_options = ['None']
+            preset_obs_options = []
 
-        if not self.app.state.settings.get('server_is_remote', False):
-            preset_options.append('From File...')
+        self.preset_obs = SelectPluginComponent(self,
+                                                items='preset_obs_items',
+                                                selected='preset_obs_selected',
+                                                manual_options=preset_obs_options)
 
         self.preset = FileImportSelectPluginComponent(self,
                                                       items='preset_items',
                                                       selected='preset_selected',
-                                                      manual_options=preset_options)
+                                                      manual_options=preset_options,
+                                                      apply_filters_to_manual_options=True,
+                                                      server_is_remote=self.app.state.settings.get('server_is_remote', False))  # noqa
 
         # set the custom file parser for importing catalogs
         self.preset._file_parser = self._file_parser
@@ -153,7 +167,7 @@ def user_api(self):
         return PluginUserApi(self, expose=('overlay',
                                            'rename_overlay', 'add_overlay', 'remove_overlay',
                                            'viewer', 'visible', 'color', 'fill_opacity',
-                                           'preset', 'import_region',
+                                           'preset_obs', 'preset', 'import_region',
                                            'center_on_viewer', 'ra', 'dec', 'pa',
                                            'v2_offset', 'v3_offset',
                                            'overlay_regions'))
@@ -489,15 +503,34 @@ def overlay_regions(self):
                     regs = [regs]
                 overlay['regions'] = regs
             regs = overlay.get('regions', [])
-        elif self.has_pysiaf and self.preset_selected in _available_instruments.keys():
+        elif self.has_pysiaf:
             regs = preset_regions.instrument_footprint(
-                _available_instruments[self.preset_selected]['observatory'],
+                self.preset.selected_item['observatory'],
                 self.preset_selected, **callable_kwargs
             )
         else:  # pragma: no cover
             regs = []
         return regs
 
+    @observe('preset_obs_selected')
+    def _update_preset_filters(self, event={}):
+        if not hasattr(self, 'preset'):
+            # during plugin init
+            return
+
+        def only_jwst(item):
+            return item['label'] == 'From File...' or item.get('observatory') == 'JWST'
+
+        def only_roman(item):
+            return item['label'] == 'From File...' or item.get('observatory') == 'Roman'
+
+        if self.preset_obs_selected == 'JWST':
+            self.preset.filters = [only_jwst]
+        elif self.preset_obs_selected == 'Roman':
+            self.preset.filters = [only_roman]
+        else:
+            self.preset.filters = []
+
     @observe('preset_selected', 'from_file', 'ra', 'dec', 'pa', 'v2_offset', 'v3_offset')
     def _preset_args_changed(self, msg={}, overlay_selected=None):
         if self._ignore_traitlet_change:
diff --git a/jdaviz/configs/imviz/plugins/footprints/footprints.vue b/jdaviz/configs/imviz/plugins/footprints/footprints.vue
index 39ba1d4f09..23289de8be 100644
--- a/jdaviz/configs/imviz/plugins/footprints/footprints.vue
+++ b/jdaviz/configs/imviz/plugins/footprints/footprints.vue
@@ -95,6 +95,26 @@
         and running `pip install pysiaf` and then launching Jdaviz.
       </v-alert>
 
+      <v-row justify="end" class="row-no-outside-padding" style="margin-bottom: -6px !important">
+        <div v-for="preset_obs_item in preset_obs_items">
+          <j-tooltip v-if="preset_obs_item.label !== 'Any'" :tooltipcontent="'Show only '+preset_obs_item.label+' footprints in preset list'">
+            <v-btn
+              tile
+              :elevation=0
+              x-small
+              dense 
+              :color="preset_obs_selected === preset_obs_item.label ? 'turquoise' : 'transparent'"
+              :dark="preset_obs_selected === preset_obs_item.label"
+              style="padding-left: 8px; padding-right: 6px;"
+              @click="() => {if (preset_obs_selected === preset_obs_item.label) {preset_obs_selected = 'Any'} else {preset_obs_selected = preset_obs_item.label}}"
+            >
+              <img :src="preset_obs_item.icon" width="16" class="invert-if-dark" style="margin-right: 2px"/>
+              {{ preset_obs_item.label }}
+            </v-btn>
+          </j-tooltip>
+        </div>
+      </v-row>
+
       <plugin-file-import-select
         :items="preset_items"
         :selected.sync="preset_selected"
diff --git a/jdaviz/configs/mosviz/helper.py b/jdaviz/configs/mosviz/helper.py
index 2ded2d0624..bd3cf23e1e 100644
--- a/jdaviz/configs/mosviz/helper.py
+++ b/jdaviz/configs/mosviz/helper.py
@@ -163,7 +163,7 @@ def _row_click_message_handler(self, msg):
         # update data filters in each viewer's data_menu
         for viewer in self.viewers.values():
             if data_menu := getattr(viewer._obj, '_data_menu', None):
-                data_menu.dataset._on_data_changed()
+                data_menu.dataset._update_items()
 
     def _handle_image_zoom(self, msg):
         mos_data = self.app.data_collection['MOS Table']
diff --git a/jdaviz/core/template_mixin.py b/jdaviz/core/template_mixin.py
index 09fced569c..478d89f32e 100644
--- a/jdaviz/core/template_mixin.py
+++ b/jdaviz/core/template_mixin.py
@@ -779,6 +779,7 @@ def __init__(self, *args, **kwargs):
         # we'll pop from kwargs now to avoid passing to the super.__init__, but need to
         # wait for everything else to be set before setting to the traitlet
         filters = kwargs.pop('filters', [])[:]  # [:] needed to force copy from kwarg default
+        self._apply_filters_to_manual_options = kwargs.pop('apply_filters_to_manual_options', False)
 
         super().__init__(*args, **kwargs)
         self._selected_previous = None
@@ -790,7 +791,7 @@ def __init__(self, *args, **kwargs):
             manual_options = [default_text] + manual_options
         self._manual_options = manual_options
 
-        self.items = [{"label": opt} if isinstance(opt, str) else opt for opt in manual_options]
+        self.items = [self._to_item(opt) for opt in manual_options]
         # set default values for traitlets
         if default_text is not None:
             self.selected = default_text
@@ -807,6 +808,12 @@ def __init__(self, *args, **kwargs):
         if default_mode != 'empty' and self.selected == '':
             self._apply_default_selection()
 
+    @staticmethod
+    def _to_item(item):
+        if isinstance(item, dict):
+            return item
+        return {'label': item}
+
     def __repr__(self):
         if hasattr(self, 'multiselect'):
             # NOTE: selected is a list here so should not be wrapped with quotes
@@ -907,6 +914,23 @@ def remove_filter(self, *filters):
         self.filters = [f for f in self.filters
                         if (f not in filters and getattr(f, '__name__', '') not in filters)]
 
+    @observe('filters')
+    def _update_items(self, msg={}):
+        manual_options = [self._to_item(opt) for opt in self.manual_options]
+        non_manual_options = [item for item in self.items if item not in manual_options]
+        if self._apply_filters_to_manual_options:
+            self.items = [item for item in non_manual_options + manual_options
+                          if self._is_valid_item(item)]
+        else:
+            filtered_items = [item for item in non_manual_options
+                              if self._is_valid_item(item)]
+            self.items = filtered_items + manual_options
+
+        try:
+            self._apply_default_selection()
+        except ValueError:
+            pass
+
     @property
     def viewer_dicts(self):
         all_viewer_dicts = super().viewer_dicts
@@ -1092,7 +1116,8 @@ class FileImportSelectPluginComponent(SelectPluginComponent):
     def __init__(self, plugin, **kwargs):
         self._cached_obj = {}
 
-        if "From File..." not in kwargs['manual_options']:
+        if (not kwargs.get('server_is_remote', False)
+                and "From File..." not in kwargs['manual_options']):
             kwargs['manual_options'] += ['From File...']
 
         if not isinstance(plugin, HasFileImportSelect):  # pragma: no cover
@@ -1494,19 +1519,19 @@ def __init__(self, plugin, items, selected, viewer,
         self.hub.subscribe(self, AddDataMessage,
                            handler=self._on_data_added)
         self.hub.subscribe(self, RemoveDataMessage,
-                           handler=lambda _: self._update_layer_items())
+                           handler=lambda _: self._update_items())
         self.hub.subscribe(self, SubsetCreateMessage,
                            handler=lambda _: self._on_subset_created())
         self.hub.subscribe(self, SubsetUpdateMessage,
-                           handler=lambda _: self._update_layer_items())
+                           handler=lambda _: self._update_items())
         self.hub.subscribe(self, SubsetDeleteMessage,
-                           handler=lambda _: self._update_layer_items())
+                           handler=lambda _: self._update_items())
 
         self.sort_by = sort_by
-        self.app.state.add_callback('layer_icons', self._update_layer_items)
+        self.app.state.add_callback('layer_icons', self._update_items)
         self.add_observe(viewer, self._on_viewer_selected_changed)
-        self.add_observe(selected, self._update_layer_items)
-        self._update_layer_items()
+        self.add_observe(selected, self._update_items)
+        self._update_items()
         self.update_wcs_only_filter(only_wcs_layers)
 
         # TODO: all of these add_filter commands should be refactored to pass filters directly
@@ -1633,7 +1658,7 @@ def _on_viewer_selected_changed(self, msg=None):
             new = [new]
         if new != old:
             self._clear_cache()
-            self._update_layer_items()
+            self._update_items()
             added_viewers = list(set(new) - set(old))
             removed_viewers = list(set(old) - set(new))
             for old_viewer in removed_viewers:
@@ -1641,38 +1666,38 @@ def _on_viewer_selected_changed(self, msg=None):
                 if old_viewer is None:
                     continue
                 # NOTE: color_mode callback must be conflicting with something else, so instead
-                # we call _update_layer_items in the PlotOptionsSyncState for color_mode
-                # old_viewer.state.remove_callback('color_mode', self._update_layer_items)
+                # we call _update_items in the PlotOptionsSyncState for color_mode
+                # old_viewer.state.remove_callback('color_mode', self._update_items)
                 for layer in old_viewer.state.layers:
                     if is_wcs_only(layer.layer):
                         continue
-                    layer.remove_callback('color', self._update_layer_items)
-                    layer.remove_callback('zorder', self._update_layer_items)
+                    layer.remove_callback('color', self._update_items)
+                    layer.remove_callback('zorder', self._update_items)
                     if hasattr(layer, 'cmap'):
-                        layer.remove_callback('cmap', self._update_layer_items)
+                        layer.remove_callback('cmap', self._update_items)
                     if hasattr(layer, 'bitmap_visible'):
-                        layer.remove_callback('bitmap_visible', self._update_layer_items)
+                        layer.remove_callback('bitmap_visible', self._update_items)
                     elif hasattr(layer, 'visible'):
-                        layer.remove_callback('visible', self._update_layer_items)
+                        layer.remove_callback('visible', self._update_items)
 
             for new_viewer in added_viewers:
                 new_viewer = self._get_viewer(new_viewer)
                 if new_viewer is None:
                     continue
                 # NOTE: color_mode callback must be conflicting with something else, so instead
-                # we call _update_layer_items in the PlotOptionsSyncState for color_mode
-                # new_viewer.state.add_callback('color_mode', self._update_layer_items)
+                # we call _update_items in the PlotOptionsSyncState for color_mode
+                # new_viewer.state.add_callback('color_mode', self._update_items)
                 for layer in new_viewer.state.layers:
                     if is_wcs_only(layer.layer):
                         continue
-                    layer.add_callback('color', self._update_layer_items)
-                    layer.add_callback('zorder', self._update_layer_items)
+                    layer.add_callback('color', self._update_items)
+                    layer.add_callback('zorder', self._update_items)
                     if hasattr(layer, 'cmap'):
-                        layer.add_callback('cmap', self._update_layer_items)
+                        layer.add_callback('cmap', self._update_items)
                     if hasattr(layer, 'bitmap_visible'):
-                        layer.add_callback('bitmap_visible', self._update_layer_items)
+                        layer.add_callback('bitmap_visible', self._update_items)
                     if hasattr(layer, 'visible'):
-                        layer.add_callback('visible', self._update_layer_items)
+                        layer.add_callback('visible', self._update_items)
 
     def _on_subset_created(self, msg=None):
         new_subset_label = self.app.data_collection.subset_groups[-1].label
@@ -1680,10 +1705,10 @@ def _on_subset_created(self, msg=None):
         for current_viewer in viewer:
             for layer in self._get_viewer(current_viewer).state.layers:
                 if layer.layer.label == new_subset_label and is_not_wcs_only(layer.layer):
-                    layer.add_callback('color', self._update_layer_items)
-                    layer.add_callback('visible', self._update_layer_items)
+                    layer.add_callback('color', self._update_items)
+                    layer.add_callback('visible', self._update_items)
                     # TODO: Add ability to add new item to self.items instead of recompiling
-        self._update_layer_items({'source': 'subset_added'})
+        self._update_items({'source': 'subset_added'})
 
     def _on_data_added(self, msg=None):
         if msg is None or not hasattr(msg, 'data') or msg.data is None:
@@ -1701,18 +1726,18 @@ def _on_data_added(self, msg=None):
                     # _on_layers_changed whenever the color changes
                     # TODO: find out if this conflicts with another color change event
                     #  and is causing the lag in the color picker
-                    layer.add_callback('color', self._update_layer_items)
+                    layer.add_callback('color', self._update_items)
                     if hasattr(layer, 'cmap'):
-                        layer.add_callback('cmap', self._update_layer_items)
+                        layer.add_callback('cmap', self._update_items)
                     if hasattr(layer, 'bitmap_visible'):
-                        layer.add_callback('bitmap_visible', self._update_layer_items)
+                        layer.add_callback('bitmap_visible', self._update_items)
                     if hasattr(layer, 'visible'):
-                        layer.add_callback('visible', self._update_layer_items)
+                        layer.add_callback('visible', self._update_items)
 
-        self._update_layer_items({'source': 'data_added'})
+        self._update_items({'source': 'data_added'})
 
     @observe('filters', 'sort_by')
-    def _update_layer_items(self, msg={}):
+    def _update_items(self, msg={}):
         # NOTE: _on_layers_changed is passed without a msg object during init
         # TODO: if the message is a SubsetUpdateMessage, only act on those that require
         # an update
@@ -2717,12 +2742,12 @@ def __init__(self, plugin, items, selected,
                          multiselect=multiselect, filters=filters,
                          default_text=default_text, manual_options=manual_options,
                          default_mode=default_mode)
-        self.hub.subscribe(self, PluginTableAddedMessage, handler=self._on_tables_changed)
-        self.hub.subscribe(self, PluginTableModifiedMessage, handler=self._on_tables_changed)
-        self._on_tables_changed()
+        self.hub.subscribe(self, PluginTableAddedMessage, handler=self._update_items)
+        self.hub.subscribe(self, PluginTableModifiedMessage, handler=self._update_items)
+        self._update_items()
 
     @observe('filters')
-    def _on_tables_changed(self, *args):
+    def _update_items(self, *args):
         manual_items = [{'label': label} for label in self.manual_options]
         self.items = manual_items + [{'label': k} for k, v in self.plugin.app._plugin_tables.items()
                                      if self._is_valid_item(v._obj)]
@@ -2830,12 +2855,12 @@ def __init__(self, plugin, items, selected,
                          multiselect=multiselect, filters=filters,
                          default_text=default_text, manual_options=manual_options,
                          default_mode=default_mode)
-        self.hub.subscribe(self, PluginPlotAddedMessage, handler=self._on_plots_changed)
-        self.hub.subscribe(self, PluginPlotModifiedMessage, handler=self._on_plots_changed)
-        self._on_plots_changed()
+        self.hub.subscribe(self, PluginPlotAddedMessage, handler=self._update_items)
+        self.hub.subscribe(self, PluginPlotModifiedMessage, handler=self._update_items)
+        self._update_items()
 
     @observe('filters')
-    def _on_plots_changed(self, *args):
+    def _update_items(self, *args):
         manual_items = [{'label': label} for label in self.manual_options]
         self.items = manual_items + [{'label': k} for k, v in self.plugin.app._plugin_plots.items()
                                      if self._is_valid_item(v._obj)]
@@ -3252,12 +3277,12 @@ def __init__(self, plugin, items, selected,
                          default_text=default_text, manual_options=manual_options,
                          default_mode=default_mode)
 
-        self.hub.subscribe(self, ViewerAddedMessage, handler=self._on_viewers_changed)
-        self.hub.subscribe(self, ViewerRemovedMessage, handler=self._on_viewers_changed)
-        self.hub.subscribe(self, ViewerRenamedMessage, handler=self._on_viewers_changed)
+        self.hub.subscribe(self, ViewerAddedMessage, handler=self._update_items)
+        self.hub.subscribe(self, ViewerRemovedMessage, handler=self._update_items)
+        self.hub.subscribe(self, ViewerRenamedMessage, handler=self._update_items)
 
         # initialize viewer_items from original viewers
-        self._on_viewers_changed()
+        self._update_items()
 
     @property
     def ids(self):
@@ -3329,8 +3354,8 @@ def add_filter(self, *filters):
         super().add_filter(*filters)
         if 'reference_has_wcs' in filters:
             # reference data can change whenever data is added OR removed from a viewer
-            self.hub.subscribe(self, AddDataMessage, handler=self._on_viewers_changed)
-            self.hub.subscribe(self, RemoveDataMessage, handler=self._on_viewers_changed)
+            self.hub.subscribe(self, AddDataMessage, handler=self._update_items)
+            self.hub.subscribe(self, RemoveDataMessage, handler=self._update_items)
 
     def _is_valid_item(self, viewer):
         def is_spectrum_viewer(viewer):
@@ -3351,8 +3376,8 @@ def reference_has_wcs(viewer):
         return super()._is_valid_item(viewer, locals())
 
     @observe('filters')
-    def _on_viewers_changed(self, msg=None):
-        # NOTE: _on_viewers_changed is passed without a msg object during init
+    def _update_items(self, msg=None):
+        # NOTE: _update_items is passed without a msg object during init
         # list of dictionaries with id, ref, ref_or_id
         was_empty = len(self.items) == 0
         manual_items = [{'label': label} for label in self.manual_options]
@@ -3478,16 +3503,16 @@ def __init__(self, plugin, items, selected,
         # override this for how to access on-the-fly spectral extraction of a cube
         self._spectral_extraction_function = 'sum'
         # Add/Remove Data are triggered when checked/unchecked from viewers
-        self.hub.subscribe(self, AddDataMessage, handler=self._on_data_changed)
-        self.hub.subscribe(self, RemoveDataMessage, handler=self._on_data_changed)
-        self.hub.subscribe(self, DataCollectionAddMessage, handler=self._on_data_changed)
-        self.hub.subscribe(self, DataCollectionDeleteMessage, handler=self._on_data_changed)
+        self.hub.subscribe(self, AddDataMessage, handler=self._update_items)
+        self.hub.subscribe(self, RemoveDataMessage, handler=self._update_items)
+        self.hub.subscribe(self, DataCollectionAddMessage, handler=self._update_items)
+        self.hub.subscribe(self, DataCollectionDeleteMessage, handler=self._update_items)
         self.hub.subscribe(self, GlobalDisplayUnitChanged,
                            handler=self._on_global_display_unit_changed)
 
-        self.app.state.add_callback('layer_icons', lambda _: self._on_data_changed())
+        self.app.state.add_callback('layer_icons', lambda _: self._update_items())
         # initialize items from original viewers
-        self._on_data_changed()
+        self._update_items()
 
     @property
     def default_data_cls(self):
@@ -3640,7 +3665,7 @@ def not_child_layer(data):
             return self.app._get_assoc_data_parent(data.label) is None
 
         def same_mosviz_row(data):
-            # NOTE: requires calling _on_data_changed on a change to row
+            # NOTE: requires calling _update_items on a change to row
             # currently handled by mosviz helper _row_click_message_handler
             meta = getattr(data, 'meta', None)
             if meta is None:
@@ -3657,8 +3682,8 @@ def same_mosviz_row(data):
         return super()._is_valid_item(data, locals())
 
     @observe('filters')
-    def _on_data_changed(self, msg=None):
-        # NOTE: _on_data_changed is passed without a msg object during init
+    def _update_items(self, msg=None):
+        # NOTE: _update_items is passed without a msg object during init
         # future improvement: don't recreate the entire list when msg is passed
         def _dc_to_dict(data):
             d = {'label': data.label,
@@ -4486,10 +4511,10 @@ def _on_glue_value_changed(self, value, update_mixed_state=True):
             # currently in subscribed states will be ignored.
             for viewer in self.subscribed_viewers:
                 viewer._update_layer_icons()
-                viewer.data_menu.layer._update_layer_items()
+                viewer.data_menu.layer._update_items()
             # callbacks from the viewer state also do not trigger an update to the
             # layer items (tabs), so we'll force those to update from here as well.
-            self.plugin.layer._update_layer_items()
+            self.plugin.layer._update_items()
 
         if self._processing_change_to_glue:
             return
diff --git a/jdaviz/data/icons/jwst.svg b/jdaviz/data/icons/jwst.svg
new file mode 100644
index 0000000000..a3104d68d2
--- /dev/null
+++ b/jdaviz/data/icons/jwst.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" width=".29in" height=".29in" viewBox="0 0 21.09 21.09">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #231f20;
+        stroke: #231f20;
+        stroke-miterlimit: 10;
+      }
+    </style>
+  </defs>
+  <g>
+    <polygon class="cls-1" points="4.48 7.58 4.99 6.7 4.48 5.83 3.47 5.83 2.97 6.7 3.47 7.58 4.48 7.58"/>
+    <polygon class="cls-1" points="4.48 11.54 4.99 10.67 4.48 9.79 3.47 9.79 2.97 10.67 3.47 11.54 4.48 11.54"/>
+    <polygon class="cls-1" points="4.48 15.51 4.99 14.63 4.48 13.75 3.47 13.75 2.97 14.63 3.47 15.51 4.48 15.51"/>
+  </g>
+  <g>
+    <polygon class="cls-1" points="18.24 7.58 18.75 6.7 18.24 5.83 17.23 5.83 16.73 6.7 17.23 7.58 18.24 7.58"/>
+    <polygon class="cls-1" points="18.24 11.54 18.75 10.67 18.24 9.79 17.23 9.79 16.73 10.67 17.23 11.54 18.24 11.54"/>
+    <polygon class="cls-1" points="18.24 15.51 18.75 14.63 18.24 13.75 17.23 13.75 16.73 14.63 17.23 15.51 18.24 15.51"/>
+  </g>
+  <g>
+    <polygon class="cls-1" points="7.86 9.58 8.37 8.7 7.86 7.82 6.85 7.82 6.35 8.7 6.85 9.58 7.86 9.58"/>
+    <polygon class="cls-1" points="7.86 5.58 8.37 4.7 7.86 3.83 6.85 3.83 6.35 4.7 6.85 5.58 7.86 5.58"/>
+    <polygon class="cls-1" points="7.86 17.44 8.37 16.56 7.86 15.69 6.85 15.69 6.35 16.56 6.85 17.44 7.86 17.44"/>
+    <polygon class="cls-1" points="7.86 13.44 8.37 12.57 7.86 11.69 6.85 11.69 6.35 12.57 6.85 13.44 7.86 13.44"/>
+  </g>
+  <g>
+    <polygon class="cls-1" points="14.79 9.58 15.3 8.7 14.79 7.82 13.78 7.82 13.28 8.7 13.78 9.58 14.79 9.58"/>
+    <polygon class="cls-1" points="14.79 5.58 15.3 4.7 14.79 3.83 13.78 3.83 13.28 4.7 13.78 5.58 14.79 5.58"/>
+    <polygon class="cls-1" points="14.79 17.44 15.3 16.56 14.79 15.69 13.78 15.69 13.28 16.56 13.78 17.44 14.79 17.44"/>
+    <polygon class="cls-1" points="14.79 13.44 15.3 12.57 14.79 11.69 13.78 11.69 13.28 12.57 13.78 13.44 14.79 13.44"/>
+  </g>
+  <g>
+    <polygon class="cls-1" points="11.28 7.58 11.79 6.7 11.28 5.83 10.27 5.83 9.77 6.7 10.27 7.58 11.28 7.58"/>
+    <polygon class="cls-1" points="11.28 3.65 11.79 2.77 11.28 1.89 10.27 1.89 9.77 2.77 10.27 3.65 11.28 3.65"/>
+    <polygon class="cls-1" points="11.28 15.47 11.79 14.6 11.28 13.72 10.27 13.72 9.77 14.6 10.27 15.47 11.28 15.47"/>
+    <polygon class="cls-1" points="11.28 19.4 11.79 18.53 11.28 17.65 10.27 17.65 9.77 18.53 10.27 19.4 11.28 19.4"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/jdaviz/data/icons/jwst_solid.svg b/jdaviz/data/icons/jwst_solid.svg
new file mode 100644
index 0000000000..36d5ce20e4
--- /dev/null
+++ b/jdaviz/data/icons/jwst_solid.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" width=".29in" height=".29in" viewBox="0 0 21.09 21.09">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #231f20;
+      }
+    </style>
+  </defs>
+  <path class="cls-1" d="M18.41,12.46l-.04-.36,1.05-1.82-1.05-1.82v-.32l1.05-1.82-1.05-1.82h-2.42s-1.08-1.92-1.08-1.92h-2.37s-1.04-1.77-1.04-1.77h-2.1l-1.04,1.81h-2.37s-1.17,2.01-1.17,2.01h-2.25s-1.05,1.81-1.05,1.81l1.04,1.81v.36l-1.04,1.8,1.04,1.8v.36l-1.04,1.8,1.04,1.83,2.38.1,1.05,1.82,2.4.06,1.05,1.82h2.1l1.05-1.82,2.37-.06,1.05-1.91,2.44-.1,1.05-1.82-1.05-1.82ZM11.86,12.82h-2.7l-1.34-2.33,1.36-2.36h2.69l1.35,2.34-1.35,2.34Z"/>
+</svg>
\ No newline at end of file
diff --git a/jdaviz/data/icons/roman.svg b/jdaviz/data/icons/roman.svg
new file mode 100644
index 0000000000..1ff0e60d69
--- /dev/null
+++ b/jdaviz/data/icons/roman.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" width=".29in" height=".29in" viewBox="0 0 21.09 21.09">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #231f20;
+        stroke: #231f20;
+        stroke-miterlimit: 10;
+        stroke-width: .5px;
+      }
+    </style>
+  </defs>
+  <rect class="cls-1" x="1.37" y="8.19" width="1.7" height="1.7"/>
+  <rect class="cls-1" x="1.37" y="11.51" width="1.7" height="1.7"/>
+  <rect class="cls-1" x="1.37" y="14.84" width="1.7" height="1.7"/>
+  <rect class="cls-1" x="18.17" y="8.19" width="1.7" height="1.7"/>
+  <rect class="cls-1" x="18.17" y="11.51" width="1.7" height="1.7"/>
+  <rect class="cls-1" x="18.17" y="14.84" width="1.7" height="1.7"/>
+  <rect class="cls-1" x="4.7" y="6.37" width="1.7" height="1.7"/>
+  <rect class="cls-1" x="4.7" y="9.69" width="1.7" height="1.7"/>
+  <rect class="cls-1" x="4.7" y="13.02" width="1.7" height="1.7"/>
+  <rect class="cls-1" x="14.75" y="6.37" width="1.7" height="1.7"/>
+  <rect class="cls-1" x="14.75" y="9.69" width="1.7" height="1.7"/>
+  <rect class="cls-1" x="14.75" y="13.02" width="1.7" height="1.7"/>
+  <rect class="cls-1" x="8.07" y="5.55" width="1.7" height="1.7"/>
+  <rect class="cls-1" x="8.07" y="8.88" width="1.7" height="1.7"/>
+  <rect class="cls-1" x="8.07" y="12.21" width="1.7" height="1.7"/>
+  <rect class="cls-1" x="11.38" y="5.55" width="1.7" height="1.7"/>
+  <rect class="cls-1" x="11.38" y="8.88" width="1.7" height="1.7"/>
+  <rect class="cls-1" x="11.38" y="12.21" width="1.7" height="1.7"/>
+</svg>
\ No newline at end of file
diff --git a/jdaviz/data/icons/roman_solid.svg b/jdaviz/data/icons/roman_solid.svg
new file mode 100644
index 0000000000..d0a78297cc
--- /dev/null
+++ b/jdaviz/data/icons/roman_solid.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" width=".29in" height=".29in" viewBox="0 0 21.09 21.09">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #231f20;
+      }
+    </style>
+  </defs>
+  <polygon class="cls-1" points="17.31 6.59 17.31 4.76 13.99 4.76 13.99 3.98 7.02 3.98 7.02 4.79 3.68 4.79 3.68 6.6 .49 6.6 .49 16.55 3.72 16.55 3.72 14.73 7.07 14.73 7.07 13.92 13.95 13.92 13.95 14.71 17.3 14.71 17.3 16.53 20.53 16.53 20.53 6.59 17.31 6.59"/>
+</svg>
\ No newline at end of file