From 013117849194cf2ad2b5a67739555dec9b645c7c Mon Sep 17 00:00:00 2001
From: Rebeka Dekany <50901361+rebekadekany@users.noreply.github.com>
Date: Fri, 11 Oct 2024 11:23:54 +0200
Subject: [PATCH] Merge pull request #21002 from overleaf/rd-icon-updates

[web] Material icon changes in toolbars

GitOrigin-RevId: f0a36b2f0c2bc56a7fccfe6491ea4538a997c486
---
 .../components/share-project-button.jsx            |  2 +-
 .../pdf-preview/components/pdf-compile-button.tsx  | 14 ++------------
 .../components/toolbar/insert-figure-dropdown.tsx  |  2 +-
 .../components/toolbar/toolbar-items.tsx           |  4 ++--
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/services/web/frontend/js/features/editor-navigation-toolbar/components/share-project-button.jsx b/services/web/frontend/js/features/editor-navigation-toolbar/components/share-project-button.jsx
index 2644d142b3..e5a8fa8709 100644
--- a/services/web/frontend/js/features/editor-navigation-toolbar/components/share-project-button.jsx
+++ b/services/web/frontend/js/features/editor-navigation-toolbar/components/share-project-button.jsx
@@ -12,7 +12,7 @@ function ShareProjectButton({ onClick }) {
       <button type="button" className="btn btn-full-height" onClick={onClick}>
         <BootstrapVersionSwitcher
           bs3={<Icon type="group" fw />}
-          bs5={<MaterialIcon type="groups" className="align-middle" />}
+          bs5={<MaterialIcon type="group_add" className="align-middle" />}
         />
         <p className="toolbar-label">{t('share')}</p>
       </button>
diff --git a/services/web/frontend/js/features/pdf-preview/components/pdf-compile-button.tsx b/services/web/frontend/js/features/pdf-preview/components/pdf-compile-button.tsx
index 82ceb19785..2cf0c582a9 100644
--- a/services/web/frontend/js/features/pdf-preview/components/pdf-compile-button.tsx
+++ b/services/web/frontend/js/features/pdf-preview/components/pdf-compile-button.tsx
@@ -8,7 +8,6 @@ import Icon from '../../../shared/components/icon'
 import * as eventTracking from '../../../infrastructure/event-tracking'
 import BootstrapVersionSwitcher from '@/features/ui/components/bootstrap-5/bootstrap-version-switcher'
 import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
-import { Spinner } from 'react-bootstrap-5'
 import {
   Dropdown,
   DropdownDivider,
@@ -213,20 +212,11 @@ function PdfCompileButton() {
               variant="primary"
               size="sm"
               disabled={compiling}
+              isLoading={compiling}
               onClick={() => startCompile()}
-              leadingIcon={
-                compiling ? (
-                  <Spinner
-                    animation="border"
-                    aria-hidden="true"
-                    size="sm"
-                    role="status"
-                  />
-                ) : null
-              }
               className={buttonClassName}
             >
-              {compileButtonLabel}
+              {t('recompile')}
             </OLButton>
           </OLTooltip>
 
diff --git a/services/web/frontend/js/features/source-editor/components/toolbar/insert-figure-dropdown.tsx b/services/web/frontend/js/features/source-editor/components/toolbar/insert-figure-dropdown.tsx
index 1d29c312df..09c8f19d52 100644
--- a/services/web/frontend/js/features/source-editor/components/toolbar/insert-figure-dropdown.tsx
+++ b/services/web/frontend/js/features/source-editor/components/toolbar/insert-figure-dropdown.tsx
@@ -37,7 +37,7 @@ export const InsertFigureDropdown = memo(function InsertFigureDropdown() {
       icon={
         <BootstrapVersionSwitcher
           bs3={<Icon fw type="picture-o" />}
-          bs5={<MaterialIcon type="imagesmode" />}
+          bs5={<MaterialIcon type="add_photo_alternate" />}
         />
       }
       altCommand={insertFigure}
diff --git a/services/web/frontend/js/features/source-editor/components/toolbar/toolbar-items.tsx b/services/web/frontend/js/features/source-editor/components/toolbar/toolbar-items.tsx
index 5ecb7baf93..52ec88e2e2 100644
--- a/services/web/frontend/js/features/source-editor/components/toolbar/toolbar-items.tsx
+++ b/services/web/frontend/js/features/source-editor/components/toolbar/toolbar-items.tsx
@@ -122,7 +122,7 @@ export const ToolbarItems: FC<{
                 id="toolbar-href"
                 label={t('toolbar_insert_link')}
                 command={commands.wrapInHref}
-                icon={bsVersion({ bs5: 'link', bs3: 'link' })}
+                icon={bsVersion({ bs5: 'add_link', bs3: 'link' })}
               />
               <ToolbarButton
                 id="toolbar-ref"
@@ -134,7 +134,7 @@ export const ToolbarItems: FC<{
                 id="toolbar-cite"
                 label={t('toolbar_insert_citation')}
                 command={commands.insertCite}
-                icon={bsVersion({ bs5: 'menu_book', bs3: 'book' })}
+                icon={bsVersion({ bs5: 'book_5', bs3: 'book' })}
               />
               <InsertFigureDropdown />
               <TableInserterDropdown />