diff --git a/react/features/base/jwt/functions.ts b/react/features/base/jwt/functions.ts
index f49215891b..06f2bbdcc1 100644
--- a/react/features/base/jwt/functions.ts
+++ b/react/features/base/jwt/functions.ts
@@ -46,7 +46,7 @@ export function getJwtName(state: IReduxState) {
  * @param {string} feature - The feature we want to check.
  * @param {boolean} ifNoToken - Default value if there is no token.
  * @param {boolean} ifNotInFeatures - Default value if features prop exists but does not have the {@code feature}.
- * @returns {bolean}
+ * @returns {boolean}
  */
 export function isJwtFeatureEnabled(state: IReduxState, feature: string, ifNoToken = false, ifNotInFeatures = false) {
     const { jwt } = state['features/base/jwt'];
diff --git a/react/features/toolbox/components/web/AudioSettingsButton.tsx b/react/features/toolbox/components/web/AudioSettingsButton.tsx
index f8c67eab84..6f3ebb8d82 100644
--- a/react/features/toolbox/components/web/AudioSettingsButton.tsx
+++ b/react/features/toolbox/components/web/AudioSettingsButton.tsx
@@ -9,10 +9,10 @@ import { IconArrowUp } from '../../../base/icons/svg';
 import JitsiMeetJS from '../../../base/lib-jitsi-meet/_';
 import { IGUMPendingState } from '../../../base/media/types';
 import ToolboxButtonWithIcon from '../../../base/toolbox/components/web/ToolboxButtonWithIcon';
-import { toggleAudioSettings } from '../../../settings/actions';
+import { toggleAudioSettings } from '../../../settings/actions.web';
 import AudioSettingsPopup from '../../../settings/components/web/audio/AudioSettingsPopup';
-import { getAudioSettingsVisibility } from '../../../settings/functions';
-import { isAudioSettingsButtonDisabled } from '../../functions';
+import { getAudioSettingsVisibility } from '../../../settings/functions.web';
+import { isAudioSettingsButtonDisabled } from '../../functions.web';
 
 import AudioMuteButton from './AudioMuteButton';
 
diff --git a/react/features/toolbox/components/web/ShareDesktopButton.ts b/react/features/toolbox/components/web/ShareDesktopButton.ts
index e463e65468..e51dfab5f4 100644
--- a/react/features/toolbox/components/web/ShareDesktopButton.ts
+++ b/react/features/toolbox/components/web/ShareDesktopButton.ts
@@ -10,17 +10,17 @@ import AbstractButton, { IProps as AbstractButtonProps } from '../../../base/too
 import { startScreenShareFlow } from '../../../screen-share/actions.web';
 import { isScreenVideoShared } from '../../../screen-share/functions';
 import { closeOverflowMenuIfOpen } from '../../actions.web';
-import { isDesktopShareButtonDisabled } from '../../functions';
+import { isDesktopShareButtonDisabled } from '../../functions.web';
 
 interface IProps extends AbstractButtonProps {
 
     /**
-     * Whether or not screensharing is initialized.
+     * Whether or not screen-sharing is initialized.
      */
     _desktopSharingEnabled: boolean;
 
     /**
-     * Whether or not the local participant is screensharing.
+     * Whether or not the local participant is screen-sharing.
      */
     _screensharing: boolean;
 }
@@ -101,7 +101,7 @@ class ShareDesktopButton extends AbstractButton<IProps> {
  * @returns {Object}
  */
 const mapStateToProps = (state: IReduxState) => {
-    // Disable the screenshare button if the video sender limit is reached and there is no video or media share in
+    // Disable the screen-share button if the video sender limit is reached and there is no video or media share in
     // progress.
     const desktopSharingEnabled
         = JitsiMeetJS.isDesktopSharingEnabled() && !isDesktopShareButtonDisabled(state);
diff --git a/react/features/toolbox/hooks.web.ts b/react/features/toolbox/hooks.web.ts
index b7bc5d146f..0607218be1 100644
--- a/react/features/toolbox/hooks.web.ts
+++ b/react/features/toolbox/hooks.web.ts
@@ -20,7 +20,7 @@ import { useFeedbackButton } from '../feedback/hooks.web';
 import { setGifMenuVisibility } from '../gifs/actions';
 import { isGifEnabled } from '../gifs/function.any';
 import InviteButton from '../invite/components/add-people-dialog/web/InviteButton';
-import { registerShortcut, unregisterShortcut } from '../keyboard-shortcuts/actions.any';
+import { registerShortcut, unregisterShortcut } from '../keyboard-shortcuts/actions.web';
 import { useKeyboardShortcutsButton } from '../keyboard-shortcuts/hooks.web';
 import NoiseSuppressionButton from '../noise-suppression/components/NoiseSuppressionButton';
 import {
@@ -37,13 +37,13 @@ import { toggleReactionsMenuVisibility } from '../reactions/actions.web';
 import RaiseHandContainerButton from '../reactions/components/web/RaiseHandContainerButtons';
 import { REACTIONS } from '../reactions/constants';
 import { shouldDisplayReactionsButtons } from '../reactions/functions.any';
-import { useReactionsButton } from '../reactions/hooks';
+import { useReactionsButton } from '../reactions/hooks.web';
 import { useLiveStreamingButton, useRecordingButton } from '../recording/hooks.web';
 import { isSalesforceEnabled } from '../salesforce/functions';
 import { startScreenShareFlow } from '../screen-share/actions.web';
 import ShareAudioButton from '../screen-share/components/web/ShareAudioButton';
 import { isScreenAudioSupported, isScreenVideoShared } from '../screen-share/functions';
-import { useSecurityDialogButton } from '../security/hooks';
+import { useSecurityDialogButton } from '../security/hooks.web';
 import SettingsButton from '../settings/components/web/SettingsButton';
 import SharedVideoButton from '../shared-video/components/web/SharedVideoButton';
 import SpeakerStats from '../speaker-stats/components/web/SpeakerStats';
@@ -51,7 +51,7 @@ import { isSpeakerStatsDisabled } from '../speaker-stats/functions';
 import { useSpeakerStatsButton } from '../speaker-stats/hooks.web';
 import { useClosedCaptionButton } from '../subtitles/hooks.web';
 import { toggleTileView } from '../video-layout/actions.any';
-import { shouldDisplayTileView } from '../video-layout/functions.any';
+import { shouldDisplayTileView } from '../video-layout/functions.web';
 import { useTileViewButton } from '../video-layout/hooks';
 import VideoQualityButton from '../video-quality/components/VideoQualityButton.web';
 import VideoQualityDialog from '../video-quality/components/VideoQualityDialog.web';