diff --git a/ivette/src/frama-c/kernel/ASTinfo.tsx b/ivette/src/frama-c/kernel/ASTinfo.tsx
index 5453dc220c1e96cd7bbf833cadb22276d039251b..c1b688faec6ce990ed3ac96ceba23d47a4a84aa2 100644
--- a/ivette/src/frama-c/kernel/ASTinfo.tsx
+++ b/ivette/src/frama-c/kernel/ASTinfo.tsx
@@ -145,6 +145,15 @@ function MarkInfos(props: InfoSectionProps): JSX.Element {
   const filtered = allInfos.filter((info) => !fs.some((m) => m === info.id));
   const infos = more ? allInfos : filtered;
   const hasMore = filtered.length < allInfos.length;
+  const pinButton =
+    (!props.pinned || props.selected) ?
+    {
+      icon: "PIN", selected: props.pinned, onClick: props.onPin,
+      title: "Pin/unpin marker information"
+    } : {
+      icon: "CIRC.CLOSE", onClick: props.onRemove,
+      title:"Remove marker information"
+    };
   return (
     <div
       className={`astinfo-section ${highlight}`}
@@ -168,15 +177,6 @@ function MarkInfos(props: InfoSectionProps): JSX.Element {
         <Code className="astinfo-markercode">
           {kind}{descr}
         </Code>
-        <IconButton
-          className="astinfo-markerbutton"
-          title="Pin/unpin information in sidebar"
-          size={9}
-          offset={0}
-          icon="PIN"
-          selected={props.pinned}
-          onClick={props.onPin}
-        />
         <IconButton
           style={{ display: hasMore ? undefined : 'none' }}
           className="astinfo-markerbutton"
@@ -189,11 +189,9 @@ function MarkInfos(props: InfoSectionProps): JSX.Element {
         />
         <IconButton
           className="astinfo-markerbutton"
-          title="Remove informations"
           size={9}
           offset={0}
-          icon="CIRC.CLOSE"
-          onClick={props.onRemove}
+          {...pinButton}
         />
       </div>
       {unfold && infos.map((info) => <InfoItem key={info.id} {...info} />)}