diff --git a/packages/epo-widget-lib/src/charts/ScatterPlot/index.tsx b/packages/epo-widget-lib/src/charts/ScatterPlot/index.tsx
index e662c75a..3d388f58 100644
--- a/packages/epo-widget-lib/src/charts/ScatterPlot/index.tsx
+++ b/packages/epo-widget-lib/src/charts/ScatterPlot/index.tsx
@@ -18,7 +18,6 @@ import useAxis from "@/charts/hooks/useAxis";
 import * as Styled from "./styles";
 import defaults from "../defaults";
 import CanvasPoints from "../canvas/Points";
-import { isSafari } from "@/lib/utils";
 
 export interface ScatterPlotProps {
   xAxis: AxisConfig;
@@ -145,7 +144,7 @@ const ScatterPlot: FunctionComponent<ScatterPlotProps> = ({
         labelledById={xAxisLabelId}
         {...{ xDomain, xScale }}
       />
-      {tooltip && !isSafari() && (
+      {tooltip && (
         <Tooltip
           x={activePoint ? xScale(activePoint.x) : undefined}
           y={activePoint ? yScale(activePoint.y) : undefined}
diff --git a/packages/epo-widget-lib/src/widgets/LightCurvePlot/Plot/index.tsx b/packages/epo-widget-lib/src/widgets/LightCurvePlot/Plot/index.tsx
index d9982e0b..80bf5f2c 100644
--- a/packages/epo-widget-lib/src/widgets/LightCurvePlot/Plot/index.tsx
+++ b/packages/epo-widget-lib/src/widgets/LightCurvePlot/Plot/index.tsx
@@ -105,14 +105,16 @@ const Plot: FunctionComponent<PlotProps> = ({
           label: t("light_curve.plot.plot_label"),
           points: data,
         }}
-        tooltip={({ y }) =>
-          t("light_curve.plot.tooltip", {
-            magnitude: y.toLocaleString(language, {
-              minimumFractionDigits: 2,
-              maximumFractionDigits: 2,
-            }),
-          })
-        }
+        tooltip={({ y }) => (
+          <Styled.TooltipWrapper>
+            {t("light_curve.plot.tooltip", {
+              magnitude: y.toLocaleString(language, {
+                minimumFractionDigits: 2,
+                maximumFractionDigits: 2,
+              }),
+            })}
+          </Styled.TooltipWrapper>
+        )}
         plotChildren={({ xScale, yStart, yEnd, Data, ...props }) =>
           plotChildren
             ? plotChildren({ xScale, yStart, yEnd, Data, ...props })
diff --git a/packages/epo-widget-lib/src/widgets/LightCurvePlot/Plot/styles.ts b/packages/epo-widget-lib/src/widgets/LightCurvePlot/Plot/styles.ts
index 273da4fa..b5691f92 100644
--- a/packages/epo-widget-lib/src/widgets/LightCurvePlot/Plot/styles.ts
+++ b/packages/epo-widget-lib/src/widgets/LightCurvePlot/Plot/styles.ts
@@ -16,3 +16,7 @@ export const SliderInnerWrapper = styled.div`
   height: 100%;
   position: relative;
 `;
+
+export const TooltipWrapper = styled.span`
+  white-space: nowrap;
+`;
diff --git a/packages/epo-widget-lib/src/widgets/SourceSelector/SourceSelector.tsx b/packages/epo-widget-lib/src/widgets/SourceSelector/SourceSelector.tsx
index 3f866594..ba8cf23e 100644
--- a/packages/epo-widget-lib/src/widgets/SourceSelector/SourceSelector.tsx
+++ b/packages/epo-widget-lib/src/widgets/SourceSelector/SourceSelector.tsx
@@ -6,8 +6,8 @@ import AspectRatio from "@/layout/AspectRatio";
 import Message from "./Message";
 import Loader from "@/atomic/Loader";
 import ElapsedTime from "@/atomic/ElapsedTime";
-import Blinker from "@/atomic/Blinker";
 import PointSelector from "./PointSelector";
+import * as Styled from "./styles";
 
 interface BlinkConfig {
   autoplay?: boolean;
@@ -118,7 +118,7 @@ const SourceSelector: FunctionComponent<SourceSelectorProps> = ({
           {message}
         </Message>
       )}
-      <Blinker
+      <Styled.BackgroundBlinker
         images={images}
         activeIndex={activeAlertIndex}
         blinkCallback={alertChangeCallback}
@@ -134,7 +134,7 @@ const SourceSelector: FunctionComponent<SourceSelectorProps> = ({
           onSelectCallback={handleClick}
           {...{ width, height, sources, selectedSource }}
         />
-      </Blinker>
+      </Styled.BackgroundBlinker>
       {!isPrepared && <Loader />}
     </AspectRatio>
   );
diff --git a/packages/epo-widget-lib/src/widgets/SourceSelector/styles.ts b/packages/epo-widget-lib/src/widgets/SourceSelector/styles.ts
index 225eb08c..e2406045 100644
--- a/packages/epo-widget-lib/src/widgets/SourceSelector/styles.ts
+++ b/packages/epo-widget-lib/src/widgets/SourceSelector/styles.ts
@@ -1,4 +1,5 @@
 import styled from "styled-components";
+import Blinker from "@/atomic/Blinker";
 
 export const SVG = styled.svg`
   cursor: pointer;
@@ -6,3 +7,9 @@ export const SVG = styled.svg`
   bottom: 0;
   left: 0;
 `;
+
+export const BackgroundBlinker = styled(Blinker)`
+  position: absolute;
+  width: 100%;
+  height: 100%;
+`;