diff --git a/public/css/index-tailwind-output.css b/public/css/index-tailwind-output.css
index 97d7b77fe7..a81ff44a19 100644
--- a/public/css/index-tailwind-output.css
+++ b/public/css/index-tailwind-output.css
@@ -2517,6 +2517,7 @@ button.soft, .button.soft {
 button.soft:hover, .button.soft:hover {
   background-color: var(--interactive-background);
   color: var(--interactive-foreground);
+  border: 2px solid var(--catch-detail-color-contrast);
 }
 
 .links-as-button a {
diff --git a/src/UI/Base/ShareButton.svelte b/src/UI/Base/ShareButton.svelte
index e9875e0854..86256843bd 100644
--- a/src/UI/Base/ShareButton.svelte
+++ b/src/UI/Base/ShareButton.svelte
@@ -26,7 +26,7 @@
   }
 </script>
 
-<button on:click={share} class="soft m-0 h-8 w-8 p-0" use:ariaLabel={Translations.t.general.share}>
+<button on:click={share} class="soft no-image-background m-0 h-8 w-8 p-0" use:ariaLabel={Translations.t.general.share}>
   <slot name="content">
     <Share class="h-7 w-7 p-1" />
   </slot>
diff --git a/src/UI/Popup/MarkAsFavouriteMini.svelte b/src/UI/Popup/MarkAsFavouriteMini.svelte
index 88df70b112..9953505308 100644
--- a/src/UI/Popup/MarkAsFavouriteMini.svelte
+++ b/src/UI/Popup/MarkAsFavouriteMini.svelte
@@ -27,7 +27,7 @@
 <LoginToggle ignoreLoading={true} {state}>
   {#if $isFavourite}
     <button
-      class="m-0 h-8 w-8 p-0"
+      class="m-0 h-8 w-8 p-0 soft no-image-background"
       on:click={() => markFavourite(false)}
       use:ariaLabel={Translations.t.favouritePoi.button.isMarkedShort}
     >
diff --git a/src/UI/ThemeViewGUI.svelte b/src/UI/ThemeViewGUI.svelte
index 0c03008c36..f893f7da05 100644
--- a/src/UI/ThemeViewGUI.svelte
+++ b/src/UI/ThemeViewGUI.svelte
@@ -165,7 +165,7 @@
 
 {#if $visualFeedback}
   <div
-    class="absolute top-0 left-0 flex h-screen w-screen items-center justify-center overflow-hidden"
+    class="absolute top-0 left-0 flex h-screen w-screen items-center justify-center overflow-hidden pointer-events-none"
   >
     <div bind:this={$viewport} style="border: 2px solid #ff000044; width: 300px; height: 300px" />
   </div>
diff --git a/src/index.css b/src/index.css
index 3e1a468f3c..0b7bf4fb37 100644
--- a/src/index.css
+++ b/src/index.css
@@ -358,6 +358,7 @@ button.soft, .button.soft {
 button.soft:hover, .button.soft:hover {
     background-color: var(--interactive-background);
     color: var(--interactive-foreground);
+    border: 2px solid var(--catch-detail-color-contrast);
 }
 
 .links-as-button a {