diff --git a/ivette/src/dome/renderer/layout/forms.tsx b/ivette/src/dome/renderer/layout/forms.tsx
index 638517f281bead3ebd0ef377041d55cfdff0c449..135b474d5a9b13fa9e74c85d0b591a4568aafa39 100644
--- a/ivette/src/dome/renderer/layout/forms.tsx
+++ b/ivette/src/dome/renderer/layout/forms.tsx
@@ -1297,7 +1297,7 @@ export function MenuField<A>(props: MenuFieldProps<A>): JSX.Element {
   const entries: ENTRY<A>[] = React.useMemo(() =>
     props.options.map((e, k) => {
       const field = `item#${k}`;
-      const option = <option value={field} label={e.label} />;
+      const option = <option value={field} key={field} label={e.label} />;
       return { field, option, value: e.value };
     }), [props.options]);
   const input = React.useCallback(
diff --git a/ivette/src/frama-c/kernel/ASTview.tsx b/ivette/src/frama-c/kernel/ASTview.tsx
index d3505aba569a7ecbcb548baba1385e542bfc0a31..31dc6fd65b1ee9093d73ea72d0444595374661c6 100644
--- a/ivette/src/frama-c/kernel/ASTview.tsx
+++ b/ivette/src/frama-c/kernel/ASTview.tsx
@@ -164,7 +164,7 @@ export default function ASTview() {
   const multipleSelections = selection?.multiple.allSelections;
   const theFunction = selection?.current?.fct;
   const theMarker = selection?.current?.marker;
-  const { buttons: themeButtons, fontSize, wrapText } =
+  const { buttons: editorButtons, fontSize, wrapText } =
     Preferences.useEditorButtons({
       fontSize: Preferences.AstFontSize,
       wrapText: Preferences.AstWrapText,
@@ -304,7 +304,7 @@ export default function ASTview() {
   return (
     <>
       <TitleBar>
-        {themeButtons}
+        {editorButtons}
       </TitleBar>
       <Text
         buffer={buffer}
diff --git a/ivette/src/frama-c/kernel/PivotTable.tsx b/ivette/src/frama-c/kernel/PivotTable.tsx
index 54b3cff881434950f6b8d0d4591d429be485deba..f75b205c75eac827eb7daaf6e78f86e9bd16d07d 100644
--- a/ivette/src/frama-c/kernel/PivotTable.tsx
+++ b/ivette/src/frama-c/kernel/PivotTable.tsx
@@ -34,7 +34,6 @@ import * as Status from 'frama-c/kernel/Status';
 import * as States from 'frama-c/states';
 import * as PivotState from 'frama-c/plugins/pivot/api/general';
 import PivotTableUI from 'react-pivottable/PivotTableUI';
-// import 'react-pivottable/pivottable.css';
 import 'frama-c/kernel/PivotTable-style.css';
 
 // --------------------------------------------------------------------------
diff --git a/ivette/src/frama-c/kernel/SourceCode.tsx b/ivette/src/frama-c/kernel/SourceCode.tsx
index 4edabcf138ee7b2b9770acd1966e5a2c70f7a86f..a178a293277744671eec245f2ee2d0805ceceaa7 100644
--- a/ivette/src/frama-c/kernel/SourceCode.tsx
+++ b/ivette/src/frama-c/kernel/SourceCode.tsx
@@ -80,7 +80,7 @@ export default function SourceCode(): JSX.Element {
   const filename = Path.parse(file).base;
 
   // Title bar buttons, along with the parameters for our text.
-  const { buttons: themeButtons, fontSize, wrapText } =
+  const { buttons: editorButtons, fontSize, wrapText } =
     Preferences.useEditorButtons({
       fontSize: Preferences.SourceFontSize,
       wrapText: Preferences.AstWrapText,
@@ -196,7 +196,7 @@ export default function SourceCode(): JSX.Element {
         />
         <Code title={file} style={{ padding: '5px' }}>{filename}</Code>
         <Hfill />
-        {themeButtons}
+        {editorButtons}
       </TitleBar>
       <Text
         buffer={buffer}
diff --git a/ivette/src/ivette/prefs.tsx b/ivette/src/ivette/prefs.tsx
index b5d989fd41f151d56089688ca948a6fc8a1b10e9..4ae1a9b2c009410f81c2af6449fe57eedcee3277 100644
--- a/ivette/src/ivette/prefs.tsx
+++ b/ivette/src/ivette/prefs.tsx
@@ -54,7 +54,7 @@ export function ThemeSwitch(): JSX.Element {
   const [theme, setTheme] = Themes.useColorTheme();
   const other = theme === 'dark' ? 'light' : 'dark';
   const position = theme === 'dark' ? 'left' : 'right';
-  const title = `Switch to ${other} theme (right-click for full choice)`;
+  const title = `Switch to ${other} theme`;
   const onChange = (): void => setTheme(other);
   return (
     <Toolbar.Switch