diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBar.tsx b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBar.tsx
index bbfe5ba38f6..23815b3e8f2 100644
--- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBar.tsx
+++ b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBar.tsx
@@ -22,11 +22,11 @@ import AccordianLogs from './SpanDetail/AccordianLogs';
 
 import { ViewedBoundsFunctionType } from './utils';
 import { TNil } from '../types';
-import { TraceSpan } from '@grafana/data';
-import { createStyle } from '../Theme';
+import { GrafanaTheme, TraceSpan } from '@grafana/data';
 import { UIPopover } from '../uiElementsContext';
+import { useStyles } from '@grafana/ui';
 
-const getStyles = createStyle(() => {
+const getStyles = (theme: GrafanaTheme) => {
   return {
     wrapper: css`
       label: wrapper;
@@ -65,14 +65,14 @@ const getStyles = createStyle(() => {
     `,
     logMarker: css`
       label: logMarker;
-      background-color: rgba(0, 0, 0, 0.5);
+      background-color: ${theme.colors.text};
       cursor: pointer;
       height: 60%;
       min-width: 1px;
       position: absolute;
       top: 20%;
       &:hover {
-        background-color: #000;
+        background-color: ${theme.colors.textSemiWeak};
       }
       &::before,
       &::after {
@@ -87,16 +87,8 @@ const getStyles = createStyle(() => {
         left: 0;
       }
     `,
-    logHint: css`
-      label: logHint;
-      pointer-events: none;
-      // TODO won't work with different UI elements injected
-      & .ant-popover-inner-content {
-        padding: 0.25rem;
-      }
-    `,
   };
-});
+};
 
 type TCommonProps = {
   color: string;
@@ -155,7 +147,7 @@ function SpanBar(props: TInnerProps) {
     // round to the nearest 0.2%
     return toPercent(Math.round(posPercent * 500) / 500);
   });
-  const styles = getStyles();
+  const styles = useStyles(getStyles);
 
   return (
     <div
diff --git a/public/app/features/explore/TraceView/uiElements.tsx b/public/app/features/explore/TraceView/uiElements.tsx
index e049cd181ec..264300154e5 100644
--- a/public/app/features/explore/TraceView/uiElements.tsx
+++ b/public/app/features/explore/TraceView/uiElements.tsx
@@ -1,9 +1,17 @@
 import { GrafanaTheme } from '@grafana/data';
-import { Button, Input, stylesFactory, Tooltip as GrafanaTooltip, useTheme } from '@grafana/ui';
+import {
+  Button,
+  Input,
+  Popover,
+  PopoverController,
+  stylesFactory,
+  Tooltip as GrafanaTooltip,
+  useTheme,
+} from '@grafana/ui';
 import { ButtonProps, Elements, PopoverProps, TooltipProps } from '@jaegertracing/jaeger-ui-components';
 import cx from 'classnames';
 import { css } from 'emotion';
-import React from 'react';
+import React, { useRef } from 'react';
 
 /**
  * Right now Jaeger components need some UI elements to be injected. This is to get rid of AntD UI library that was
@@ -12,8 +20,34 @@ import React from 'react';
 
 // This needs to be static to prevent remounting on every render.
 export const UIElements: Elements = {
-  Popover({ children, content }: PopoverProps) {
-    return <GrafanaTooltip content={content}>{children}</GrafanaTooltip>;
+  Popover({ children, content, overlayClassName }: PopoverProps) {
+    const popoverRef = useRef<HTMLElement>(null);
+
+    return (
+      <PopoverController content={content} hideAfter={300}>
+        {(showPopper, hidePopper, popperProps) => {
+          return (
+            <>
+              {popoverRef.current && (
+                <Popover
+                  {...popperProps}
+                  referenceElement={popoverRef.current}
+                  wrapperClassName={overlayClassName}
+                  onMouseLeave={hidePopper}
+                  onMouseEnter={showPopper}
+                />
+              )}
+
+              {React.cloneElement(children, {
+                ref: popoverRef,
+                onMouseEnter: showPopper,
+                onMouseLeave: hidePopper,
+              })}
+            </>
+          );
+        }}
+      </PopoverController>
+    );
   },
   Tooltip({ children, title }: TooltipProps) {
     return <GrafanaTooltip content={title}>{children}</GrafanaTooltip>;