diff --git a/rsconcept/frontend/src/app/navigation/navigation-button.tsx b/rsconcept/frontend/src/app/navigation/navigation-button.tsx
index 9acd6a46..3298e130 100644
--- a/rsconcept/frontend/src/app/navigation/navigation-button.tsx
+++ b/rsconcept/frontend/src/app/navigation/navigation-button.tsx
@@ -15,7 +15,7 @@ export function NavigationButton({ icon, title, hideTitle, className, style, onC
   return (
     <button
       type='button'
-      tabIndex={1}
+      tabIndex={0}
       aria-label={title}
       data-tooltip-id={!!title ? globalIDs.tooltip : undefined}
       data-tooltip-hidden={hideTitle}
diff --git a/rsconcept/frontend/src/components/view/value-icon.tsx b/rsconcept/frontend/src/components/view/value-icon.tsx
index 021dddc4..14b9c5e1 100644
--- a/rsconcept/frontend/src/components/view/value-icon.tsx
+++ b/rsconcept/frontend/src/components/view/value-icon.tsx
@@ -41,7 +41,6 @@ export function ValueIcon({
   onClick,
   ...restProps
 }: ValueIconProps) {
-  // TODO: do not add button if onClick is disabled
   return (
     <div
       className={clsx(