Merge branch 'master' into nathan-starter

1 files changed, 12 insertions, 1 deletions

diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx
index e4a18dcea..31d88fb87 100644
--- a/src/client/views/MainView.tsx
+++ b/src/client/views/MainView.tsx
@@ -54,6 +54,7 @@ import { CollectionMenu } from './collections/CollectionMenu';
 import { TabDocView } from './collections/TabDocView';
 import './collections/TreeView.scss';
 import { CollectionFreeFormView } from './collections/collectionFreeForm';
+import { ImageLabelHandler } from './collections/collectionFreeForm/ImageLabelHandler';
 import { MarqueeOptionsMenu } from './collections/collectionFreeForm/MarqueeOptionsMenu';
 import { CollectionLinearView } from './collections/collectionLinear';
 import { LinkMenu } from './linking/LinkMenu';
@@ -76,8 +77,8 @@ import { AnchorMenu } from './pdf/AnchorMenu';
 import { GPTPopup } from './pdf/GPTPopup/GPTPopup';
 import { TopBar } from './topbar/TopBar';
 
-const _global = (window /* browser */ || global) /* node */ as any;
 const { LEFT_MENU_WIDTH, TOPBAR_HEIGHT } = require('./global/globalCssVariables.module.scss'); // prettier-ignore
+const _global = (window /* browser */ || global) /* node */ as any;
 
 @observer
 export class MainView extends ObservableReactComponent<{}> {
@@ -371,6 +372,10 @@ export class MainView extends ObservableReactComponent<{}> {
                 fa.faCut,
                 fa.faEllipsisV,
                 fa.faEraser,
+                fa.faDeleteLeft,
+                fa.faXmarksLines,
+                fa.faCircleXmark,
+                fa.faXmark,
                 fa.faExclamation,
                 fa.faFileAlt,
                 fa.faFileAudio,
@@ -538,6 +543,11 @@ export class MainView extends ObservableReactComponent<{}> {
                 fa.faZ,
                 fa.faArrowsUpToLine,
                 fa.faArrowsDownToLine,
+                fa.faPalette,
+                fa.faHourglassHalf,
+                fa.faRobot,
+                fa.faSatellite,
+                fa.faStar,
             ]
         );
     }
@@ -1078,6 +1088,7 @@ export class MainView extends ObservableReactComponent<{}> {
                 <PreviewCursor />
                 <TaskCompletionBox />
                 <ContextMenu />
+                <ImageLabelHandler />
                 <AnchorMenu />
                 <MapAnchorMenu />
                 <DirectionsAnchorMenu />