diff --git a/.betterer.results b/.betterer.results
index 6e5f4a6438b..e8cf5c8ca7e 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -110,9 +110,6 @@ exports[`no enzyme tests`] = {
     "packages/jaeger-ui-components/src/TraceTimelineViewer/index.test.js:381298544": [
       [14, 19, 13, "RegExp match", "2409514259"]
     ],
-    "packages/jaeger-ui-components/src/common/CopyIcon.test.js:187212136": [
-      [15, 19, 13, "RegExp match", "2409514259"]
-    ],
     "packages/jaeger-ui-components/src/common/NewWindowIcon.test.js:1750458349": [
       [14, 19, 13, "RegExp match", "2409514259"]
     ],
diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/KeyValuesTable.tsx b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/KeyValuesTable.tsx
index 9e17ff31070..5c3df6b6e69 100644
--- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/KeyValuesTable.tsx
+++ b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/KeyValuesTable.tsx
@@ -46,6 +46,7 @@ export const getStyles = (theme: GrafanaTheme2) => {
       label: row;
       & > td {
         padding: 0rem 0.5rem;
+        height: 30px;
       }
       &:nth-child(2n) > td {
         background: ${autoColor(theme, '#f5f5f5')};
diff --git a/packages/jaeger-ui-components/src/common/CopyIcon.test.js b/packages/jaeger-ui-components/src/common/CopyIcon.test.js
index 10ea26789c2..b06ac040043 100644
--- a/packages/jaeger-ui-components/src/common/CopyIcon.test.js
+++ b/packages/jaeger-ui-components/src/common/CopyIcon.test.js
@@ -12,12 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { render, screen } from '@testing-library/react';
 import * as copy from 'copy-to-clipboard';
-import { shallow } from 'enzyme';
 import React from 'react';
 
-import { Button, Tooltip } from '@grafana/ui';
-
 import CopyIcon from './CopyIcon';
 
 jest.mock('copy-to-clipboard');
@@ -29,7 +27,6 @@ describe('<CopyIcon />', () => {
     tooltipTitle: 'tooltipTitleValue',
   };
   let copySpy;
-  let wrapper;
 
   beforeAll(() => {
     copySpy = jest.spyOn(copy, 'default');
@@ -37,24 +34,18 @@ describe('<CopyIcon />', () => {
 
   beforeEach(() => {
     copySpy.mockReset();
-    wrapper = shallow(<CopyIcon {...props} />);
   });
 
   it('renders as expected', () => {
-    expect(wrapper).toMatchSnapshot();
+    expect(() => render(<CopyIcon {...props} />)).not.toThrow();
   });
 
-  it('updates state and copies when clicked', () => {
-    expect(wrapper.state().hasCopied).toBe(false);
-    expect(copySpy).not.toHaveBeenCalled();
+  it('copies when clicked', () => {
+    render(<CopyIcon {...props} />);
+
+    const button = screen.getByRole('button');
+    button.click();
 
-    wrapper.find(Button).simulate('click');
-    expect(wrapper.state().hasCopied).toBe(true);
     expect(copySpy).toHaveBeenCalledWith(props.copyText);
   });
-
-  it('persists state when tooltip opens', () => {
-    wrapper.setState({ hasCopied: true });
-    expect(wrapper.state().hasCopied).toBe(true);
-  });
 });
diff --git a/packages/jaeger-ui-components/src/common/CopyIcon.tsx b/packages/jaeger-ui-components/src/common/CopyIcon.tsx
index 6c674713045..5fb166a7ada 100644
--- a/packages/jaeger-ui-components/src/common/CopyIcon.tsx
+++ b/packages/jaeger-ui-components/src/common/CopyIcon.tsx
@@ -15,11 +15,11 @@
 import { css } from '@emotion/css';
 import cx from 'classnames';
 import copy from 'copy-to-clipboard';
-import * as React from 'react';
+import React, { useState } from 'react';
 
-import { Button, IconName, stylesFactory, Tooltip } from '@grafana/ui';
+import { Button, IconName, Tooltip, useStyles2 } from '@grafana/ui';
 
-const getStyles = stylesFactory(() => {
+const getStyles = () => {
   return {
     CopyIcon: css`
       background-color: transparent;
@@ -27,14 +27,13 @@ const getStyles = stylesFactory(() => {
       color: inherit;
       height: 100%;
       overflow: hidden;
-      padding: 0px;
       &:focus {
         background-color: rgba(255, 255, 255, 0.25);
         color: inherit;
       }
     `,
   };
-});
+};
 
 type PropsType = {
   className?: string;
@@ -43,46 +42,24 @@ type PropsType = {
   tooltipTitle: string;
 };
 
-type StateType = {
-  hasCopied: boolean;
-};
+export default function CopyIcon(props: PropsType) {
+  const styles = useStyles2(getStyles);
 
-export default class CopyIcon extends React.PureComponent<PropsType, StateType> {
-  static defaultProps: Partial<PropsType> = {
-    className: undefined,
-    icon: 'copy',
+  const [hasCopied, setHasCopied] = useState(false);
+
+  const handleClick = () => {
+    copy(props.copyText);
+    setHasCopied(true);
   };
 
-  state = {
-    hasCopied: false,
-  };
-
-  handleClick = () => {
-    this.setState({
-      hasCopied: true,
-    });
-    copy(this.props.copyText);
-  };
-
-  handleTooltipVisibilityChange = (visible: boolean) => {
-    if (!visible && this.state.hasCopied) {
-      this.setState({
-        hasCopied: false,
-      });
-    }
-  };
-
-  render() {
-    const styles = getStyles();
-    return (
-      <Tooltip content={this.state.hasCopied ? 'Copied' : this.props.tooltipTitle}>
-        <Button
-          className={cx(styles.CopyIcon, this.props.className)}
-          type="button"
-          icon={this.props.icon}
-          onClick={this.handleClick}
-        />
-      </Tooltip>
-    );
-  }
+  return (
+    <Tooltip content={hasCopied ? 'Copied' : props.tooltipTitle}>
+      <Button className={cx(styles.CopyIcon)} type="button" icon={props.icon} onClick={handleClick} />
+    </Tooltip>
+  );
 }
+
+CopyIcon.defaultProps = {
+  icon: 'copy',
+  className: undefined,
+};
diff --git a/packages/jaeger-ui-components/src/common/__snapshots__/CopyIcon.test.js.snap b/packages/jaeger-ui-components/src/common/__snapshots__/CopyIcon.test.js.snap
deleted file mode 100644
index f7deafb73a1..00000000000
--- a/packages/jaeger-ui-components/src/common/__snapshots__/CopyIcon.test.js.snap
+++ /dev/null
@@ -1,14 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<CopyIcon /> renders as expected 1`] = `
-<Tooltip
-  content="tooltipTitleValue"
->
-  <Button
-    className="css-oqwzau classNameValue"
-    icon="copy"
-    onClick={[Function]}
-    type="button"
-  />
-</Tooltip>
-`;