diff --git a/dependent-usage.json b/dependent-usage.json
index 7805f46418..1a3dfc64a1 100644
--- a/dependent-usage.json
+++ b/dependent-usage.json
@@ -1,5 +1,5 @@
 {
-  "lastModified": 1782143036178,
+  "lastModified": 1782227209138,
   "projectUsages": [
     {
       "version": "3.4.8",
@@ -22873,9 +22873,9 @@
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 82,
+            "line": 83,
             "column": 8,
-            "index": 2061
+            "index": 2011
           },
           {
             "filePath": "src/editors/containers/VideoEditor/components/VideoSettingsModal/components/TranscriptWidget/TranscriptActionMenu.jsx",
@@ -22977,9 +22977,9 @@
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 83,
+            "line": 84,
             "column": 10,
-            "index": 2082
+            "index": 2032
           },
           {
             "filePath": "src/editors/containers/VideoEditor/components/VideoSettingsModal/components/TranscriptWidget/TranscriptActionMenu.jsx",
@@ -23069,9 +23069,9 @@
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 91,
+            "line": 92,
             "column": 10,
-            "index": 2363
+            "index": 2313
           },
           {
             "filePath": "src/editors/containers/VideoEditor/components/VideoSettingsModal/components/TranscriptWidget/TranscriptActionMenu.jsx",
@@ -23227,9 +23227,9 @@
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 93,
+            "line": 94,
             "column": 14,
-            "index": 2443
+            "index": 2393
           },
           {
             "filePath": "src/editors/containers/VideoEditor/components/VideoSettingsModal/components/TranscriptWidget/TranscriptActionMenu.jsx",
@@ -23451,9 +23451,9 @@
           },
           {
             "filePath": "src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/SwitchEditorCard.jsx",
-            "line": 24,
+            "line": 25,
             "column": 4,
-            "index": 919
+            "index": 954
           },
           {
             "filePath": "src/certificates/empty-certificates-with-modes/EmptyCertificatesWithModes.jsx",
@@ -24509,15 +24509,9 @@
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 40,
+            "line": 41,
             "column": 4,
-            "index": 721
-          },
-          {
-            "filePath": "src/editors/sharedComponents/BaseModal/index.jsx",
-            "line": 50,
-            "column": 6,
-            "index": 1034
+            "index": 671
           },
           {
             "filePath": "src/editors/containers/VideoEditor/components/VideoSettingsModal/components/VideoSourceWidget/index.jsx",
@@ -24665,9 +24659,9 @@
           },
           {
             "filePath": "src/course-checklist/ChecklistSection/ChecklistItemBody.jsx",
-            "line": 36,
+            "line": 32,
             "column": 4,
-            "index": 1242
+            "index": 992
           },
           {
             "filePath": "src/certificates/empty-certificates-with-modes/EmptyCertificatesWithModes.jsx",
@@ -25223,18 +25217,6 @@
             "column": 8,
             "index": 1617
           },
-          {
-            "filePath": "src/editors/sharedComponents/ImageUploadModal/ImageSettingsModal/index.jsx",
-            "line": 46,
-            "column": 8,
-            "index": 1490
-          },
-          {
-            "filePath": "src/editors/sharedComponents/ImageUploadModal/ImageSettingsModal/index.jsx",
-            "line": 63,
-            "column": 6,
-            "index": 1947
-          },
           {
             "filePath": "src/editors/sharedComponents/ErrorBoundary/ErrorPage.jsx",
             "line": 46,
@@ -25519,9 +25501,9 @@
           },
           {
             "filePath": "src/course-checklist/ChecklistSection/ChecklistItemBody.jsx",
-            "line": 71,
+            "line": 67,
             "column": 10,
-            "index": 2385
+            "index": 2135
           },
           {
             "filePath": "src/content-tags-drawer/ContentTagsDropDownSelector.jsx",
@@ -25729,12 +25711,6 @@
             "column": 4,
             "index": 668
           },
-          {
-            "filePath": "src/editors/sharedComponents/BaseModal/index.jsx",
-            "line": 27,
-            "column": 2,
-            "index": 442
-          },
           {
             "filePath": "plugins/course-apps/xpert_unit_summary/settings-modal/SettingsModal.jsx",
             "line": 91,
@@ -25827,12 +25803,6 @@
             "column": 6,
             "index": 832
           },
-          {
-            "filePath": "src/editors/sharedComponents/BaseModal/index.jsx",
-            "line": 38,
-            "column": 4,
-            "index": 673
-          },
           {
             "filePath": "plugins/course-apps/xpert_unit_summary/settings-modal/SettingsModal.jsx",
             "line": 100,
@@ -25925,12 +25895,6 @@
             "column": 8,
             "index": 861
           },
-          {
-            "filePath": "src/editors/sharedComponents/BaseModal/index.jsx",
-            "line": 39,
-            "column": 6,
-            "index": 767
-          },
           {
             "filePath": "plugins/course-apps/xpert_unit_summary/settings-modal/SettingsModal.jsx",
             "line": 101,
@@ -26017,12 +25981,6 @@
             "column": 6,
             "index": 1009
           },
-          {
-            "filePath": "src/editors/sharedComponents/BaseModal/index.jsx",
-            "line": 45,
-            "column": 6,
-            "index": 921
-          },
           {
             "filePath": "plugins/course-apps/xpert_unit_summary/settings-modal/SettingsModal.jsx",
             "line": 105,
@@ -26429,21 +26387,9 @@
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 41,
+            "line": 42,
             "column": 6,
-            "index": 739
-          },
-          {
-            "filePath": "src/editors/sharedComponents/ImageUploadModal/ImageSettingsModal/DimensionControls.jsx",
-            "line": 39,
-            "column": 4,
-            "index": 995
-          },
-          {
-            "filePath": "src/editors/sharedComponents/ImageUploadModal/ImageSettingsModal/AltTextControls.jsx",
-            "line": 28,
-            "column": 4,
-            "index": 806
+            "index": 689
           },
           {
             "filePath": "src/editors/containers/VideoEditor/components/VideoSettingsModal/components/VideoSourceWidget/index.jsx",
@@ -27361,24 +27307,6 @@
             "column": 8,
             "index": 3882
           },
-          {
-            "filePath": "src/editors/sharedComponents/ImageUploadModal/ImageSettingsModal/DimensionControls.jsx",
-            "line": 40,
-            "column": 6,
-            "index": 1014
-          },
-          {
-            "filePath": "src/editors/sharedComponents/ImageUploadModal/ImageSettingsModal/AltTextControls.jsx",
-            "line": 29,
-            "column": 6,
-            "index": 844
-          },
-          {
-            "filePath": "src/editors/sharedComponents/ImageUploadModal/ImageSettingsModal/AltTextControls.jsx",
-            "line": 52,
-            "column": 8,
-            "index": 1615
-          },
           {
             "filePath": "src/editors/containers/VideoEditor/components/VideoSettingsModal/components/LicenseWidget/LicenseDetails.jsx",
             "line": 50,
@@ -27511,9 +27439,9 @@
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 55,
+            "line": 56,
             "column": 21,
-            "index": 1243
+            "index": 1193
           },
           {
             "filePath": "src/editors/containers/VideoUploadEditor/VideoUploader.jsx",
@@ -27593,12 +27521,6 @@
             "column": 52,
             "index": 4707
           },
-          {
-            "filePath": "src/editors/sharedComponents/ImageUploadModal/ImageSettingsModal/AltTextControls.jsx",
-            "line": 47,
-            "column": 6,
-            "index": 1442
-          },
           {
             "filePath": "src/editors/containers/VideoEditor/components/VideoSettingsModal/components/VideoSourceWidget/index.jsx",
             "line": 124,
@@ -27697,12 +27619,6 @@
             "column": 6,
             "index": 1251
           },
-          {
-            "filePath": "src/editors/sharedComponents/BaseModal/index.jsx",
-            "line": 49,
-            "column": 4,
-            "index": 1007
-          },
           {
             "filePath": "plugins/course-apps/xpert_unit_summary/settings-modal/SettingsModal.jsx",
             "line": 108,
@@ -27771,12 +27687,6 @@
             "column": 10,
             "index": 1302
           },
-          {
-            "filePath": "src/editors/sharedComponents/BaseModal/index.jsx",
-            "line": 58,
-            "column": 10,
-            "index": 1213
-          },
           {
             "filePath": "plugins/course-apps/xpert_unit_summary/settings-modal/SettingsModal.jsx",
             "line": 110,
@@ -27985,21 +27895,21 @@
           },
           {
             "filePath": "src/pages-and-resources/pages/PageSettingButton.jsx",
-            "line": 51,
+            "line": 37,
             "column": 16,
-            "index": 1738
+            "index": 1373
           },
           {
             "filePath": "src/pages-and-resources/pages/PageSettingButton.jsx",
-            "line": 65,
+            "line": 51,
             "column": 18,
-            "index": 2039
+            "index": 1674
           },
           {
             "filePath": "src/pages-and-resources/pages/PageSettingButton.jsx",
-            "line": 82,
+            "line": 68,
             "column": 14,
-            "index": 2364
+            "index": 1999
           },
           {
             "filePath": "src/optimizer-page/scan-results/CustomIcon.jsx",
@@ -28261,15 +28171,15 @@
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 50,
+            "line": 51,
             "column": 24,
-            "index": 1092
+            "index": 1042
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 58,
+            "line": 59,
             "column": 14,
-            "index": 1295
+            "index": 1245
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/GalleryLoadMoreButton.jsx",
@@ -28283,12 +28193,6 @@
             "column": 15,
             "index": 712
           },
-          {
-            "filePath": "src/editors/sharedComponents/ImageUploadModal/ImageSettingsModal/DimensionControls.jsx",
-            "line": 63,
-            "column": 18,
-            "index": 1905
-          },
           {
             "filePath": "src/editors/sharedComponents/CollapsibleFormWidget/CollapsibleFormWidget.jsx",
             "line": 41,
@@ -28645,21 +28549,21 @@
           },
           {
             "filePath": "src/course-checklist/ChecklistSection/ChecklistItemComment.jsx",
-            "line": 24,
+            "line": 18,
             "column": 8,
-            "index": 901
+            "index": 628
           },
           {
             "filePath": "src/course-checklist/ChecklistSection/ChecklistItemBody.jsx",
-            "line": 40,
+            "line": 36,
             "column": 12,
-            "index": 1385
+            "index": 1135
           },
           {
             "filePath": "src/course-checklist/ChecklistSection/ChecklistItemBody.jsx",
-            "line": 49,
+            "line": 45,
             "column": 12,
-            "index": 1695
+            "index": 1445
           },
           {
             "filePath": "src/content-tags-drawer/ContentTagsDropDownSelector.jsx",
@@ -28751,21 +28655,21 @@
           },
           {
             "filePath": "src/pages-and-resources/pages/PageSettingButton.jsx",
-            "line": 49,
+            "line": 35,
             "column": 6,
-            "index": 1683
+            "index": 1318
           },
           {
             "filePath": "src/pages-and-resources/pages/PageSettingButton.jsx",
-            "line": 63,
+            "line": 49,
             "column": 8,
-            "index": 1980
+            "index": 1615
           },
           {
             "filePath": "src/pages-and-resources/pages/PageSettingButton.jsx",
-            "line": 80,
+            "line": 66,
             "column": 4,
-            "index": 2317
+            "index": 1952
           },
           {
             "filePath": "src/generic/CollapsableEditor.jsx",
@@ -28859,15 +28763,9 @@
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 48,
+            "line": 49,
             "column": 14,
-            "index": 993
-          },
-          {
-            "filePath": "src/editors/sharedComponents/ImageUploadModal/ImageSettingsModal/DimensionControls.jsx",
-            "line": 58,
-            "column": 8,
-            "index": 1685
+            "index": 943
           },
           {
             "filePath": "src/editors/sharedComponents/CollapsibleFormWidget/CollapsibleFormWidget.jsx",
@@ -29229,27 +29127,9 @@
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 42,
-            "column": 8,
-            "index": 782
-          },
-          {
-            "filePath": "src/editors/sharedComponents/ImageUploadModal/ImageSettingsModal/DimensionControls.jsx",
-            "line": 44,
-            "column": 8,
-            "index": 1158
-          },
-          {
-            "filePath": "src/editors/sharedComponents/ImageUploadModal/ImageSettingsModal/DimensionControls.jsx",
-            "line": 51,
+            "line": 43,
             "column": 8,
-            "index": 1420
-          },
-          {
-            "filePath": "src/editors/sharedComponents/ImageUploadModal/ImageSettingsModal/AltTextControls.jsx",
-            "line": 32,
-            "column": 6,
-            "index": 953
+            "index": 732
           },
           {
             "filePath": "src/editors/containers/VideoEditor/components/VideoSettingsModal/components/VideoSourceWidget/index.jsx",
@@ -29747,21 +29627,15 @@
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 63,
+            "line": 64,
             "column": 22,
-            "index": 1403
+            "index": 1353
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 103,
+            "line": 104,
             "column": 10,
-            "index": 2747
-          },
-          {
-            "filePath": "src/editors/sharedComponents/BaseModal/index.jsx",
-            "line": 54,
-            "column": 12,
-            "index": 1125
+            "index": 2697
           },
           {
             "filePath": "src/editors/containers/VideoEditor/components/VideoSettingsModal/components/VideoSourceWidget/index.jsx",
@@ -29849,9 +29723,9 @@
           },
           {
             "filePath": "src/course-checklist/ChecklistSection/ChecklistItemBody.jsx",
-            "line": 65,
+            "line": 61,
             "column": 6,
-            "index": 2223
+            "index": 1973
           },
           {
             "filePath": "src/certificates/empty-certificates-with-modes/EmptyCertificatesWithModes.jsx",
@@ -31257,15 +31131,15 @@
         "ArrowForward": [
           {
             "filePath": "src/pages-and-resources/pages/PageSettingButton.jsx",
-            "line": 50,
+            "line": 36,
             "column": 13,
-            "index": 1708
+            "index": 1343
           },
           {
             "filePath": "src/pages-and-resources/pages/PageSettingButton.jsx",
-            "line": 64,
+            "line": 50,
             "column": 15,
-            "index": 2007
+            "index": 1642
           },
           {
             "filePath": "src/editors/containers/VideoUploadEditor/VideoUploader.jsx",
@@ -31277,9 +31151,9 @@
         "Settings": [
           {
             "filePath": "src/pages-and-resources/pages/PageSettingButton.jsx",
-            "line": 81,
+            "line": 67,
             "column": 11,
-            "index": 2340
+            "index": 1975
           }
         ],
         "CardGrid": [
@@ -31629,9 +31503,9 @@
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 109,
+            "line": 110,
             "column": 12,
-            "index": 2902
+            "index": 2852
           }
         ],
         "TransitionReplace": [
@@ -32267,9 +32141,9 @@
           },
           {
             "filePath": "src/course-checklist/ChecklistSection/ChecklistItemBody.jsx",
-            "line": 42,
+            "line": 38,
             "column": 19,
-            "index": 1453
+            "index": 1203
           }
         ],
         "Alert.Link": [
@@ -32415,12 +32289,6 @@
             "column": 14,
             "index": 1269
           },
-          {
-            "filePath": "src/editors/sharedComponents/ImageUploadModal/ImageSettingsModal/index.jsx",
-            "line": 74,
-            "column": 10,
-            "index": 2315
-          },
           {
             "filePath": "src/editors/containers/VideoGallery/index.jsx",
             "line": 74,
@@ -32606,12 +32474,6 @@
             "line": 68,
             "column": 6,
             "index": 2152
-          },
-          {
-            "filePath": "src/editors/sharedComponents/BaseModal/index.jsx",
-            "line": 44,
-            "column": 4,
-            "index": 884
           }
         ],
         "Sheet": [
@@ -32799,9 +32661,9 @@
           },
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 66,
+            "line": 67,
             "column": 10,
-            "index": 1542
+            "index": 1492
           }
         ],
         "Row": [
@@ -32995,25 +32857,25 @@
         "Search": [
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 58,
+            "line": 59,
             "column": 25,
-            "index": 1306
+            "index": 1256
           }
         ],
         "SelectMenu": [
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 64,
+            "line": 65,
             "column": 6,
-            "index": 1431
+            "index": 1381
           }
         ],
         "Form.SwitchSet": [
           {
             "filePath": "src/editors/sharedComponents/SelectionModal/SearchSort.jsx",
-            "line": 104,
+            "line": 105,
             "column": 10,
-            "index": 2778
+            "index": 2728
           }
         ],
         "SpinnerSimple": [
@@ -33036,14 +32898,6 @@
             "index": 5199
           }
         ],
-        "ArrowBackIos": [
-          {
-            "filePath": "src/editors/sharedComponents/ImageUploadModal/ImageSettingsModal/index.jsx",
-            "line": 64,
-            "column": 20,
-            "index": 1975
-          }
-        ],
         "FileUpload": [
           {
             "filePath": "src/editors/containers/VideoUploadEditor/VideoUploader.jsx",
@@ -33275,17 +33129,17 @@
         "ModeComment": [
           {
             "filePath": "src/course-checklist/ChecklistSection/ChecklistItemComment.jsx",
-            "line": 24,
+            "line": 18,
             "column": 19,
-            "index": 912
+            "index": 639
           }
         ],
         "RadioButtonUnchecked": [
           {
             "filePath": "src/course-checklist/ChecklistSection/ChecklistItemBody.jsx",
-            "line": 51,
+            "line": 47,
             "column": 19,
-            "index": 1765
+            "index": 1515
           }
         ],
         "Tag": [