diff --git a/src/components/Assets/AssetList/AssetEntry/index.tsx b/src/components/Assets/AssetList/AssetEntry/index.tsx
index 45627ee45..7ff42d5b4 100644
--- a/src/components/Assets/AssetList/AssetEntry/index.tsx
+++ b/src/components/Assets/AssetList/AssetEntry/index.tsx
@@ -85,6 +85,7 @@ export const AssetEntry = (props: AssetEntryProps) => {
           <Tooltip title={name}>
             <s.Link onClick={() => handleLinkClick()}>{name}</s.Link>
           </Tooltip>
+          <s.StyledCopyButton text={name} />
           <s.IndicatorsContainer>
             {isNew && <Tag type={"success"} value={"New"} />}
             {sortedInsights.map((insight) => {
diff --git a/src/components/Assets/AssetList/AssetEntry/styles.ts b/src/components/Assets/AssetList/AssetEntry/styles.ts
index 3e22cb9df..c20de31d3 100644
--- a/src/components/Assets/AssetList/AssetEntry/styles.ts
+++ b/src/components/Assets/AssetList/AssetEntry/styles.ts
@@ -1,6 +1,7 @@
 import styled from "styled-components";
 import { caption2RegularTypography } from "../../../common/App/typographies";
 import { grayScale } from "../../../common/App/v2colors";
+import { CopyButton } from "../../../common/v3/CopyButton";
 import { ImpactScoreIndicatorProps } from "./types";
 
 export const Container = styled.div`
@@ -35,11 +36,22 @@ export const Header = styled.div`
   gap: 4px;
 `;
 
+export const StyledCopyButton = styled(CopyButton)`
+  padding: 0;
+  display: none;
+`;
+
 export const TitleRow = styled.div`
   display: flex;
   gap: 2px;
   height: 20px;
   align-items: center;
+
+  &:hover {
+    ${StyledCopyButton} {
+      display: flex;
+    }
+  }
 `;
 
 export const AssetTypeIconContainer = styled.div`
diff --git a/src/components/Assets/AssetList/AssetList.stories.tsx b/src/components/Assets/AssetList/AssetList.stories.tsx
index 395e550be..83ee48327 100644
--- a/src/components/Assets/AssetList/AssetList.stories.tsx
+++ b/src/components/Assets/AssetList/AssetList.stories.tsx
@@ -21,7 +21,7 @@ export const Default: Story = {
   args: {
     searchQuery: "",
     setRefresher: () => {
-      // empty
+      return undefined;
     },
     assetTypeId: "Endpoint",
     data: {
diff --git a/src/components/Assets/AssetList/index.tsx b/src/components/Assets/AssetList/index.tsx
index 4ddac259f..5719ca027 100644
--- a/src/components/Assets/AssetList/index.tsx
+++ b/src/components/Assets/AssetList/index.tsx
@@ -354,8 +354,8 @@ export const AssetList = (props: AssetListProps) => {
     props.scopeViewOptions
   ]);
 
-  const handleBackButtonClick = () => {
-    props.onBackButtonClick();
+  const handleAllAssetsLinkClick = () => {
+    props.onGoToAllAssets();
   };
 
   const handleSortingMenuToggle = () => {
@@ -459,7 +459,7 @@ export const AssetList = (props: AssetListProps) => {
           )}
           {assetTypeInfo?.label || props.assetTypeId}
         </s.TypeHeader>
-        <Link onClick={handleBackButtonClick}>All Assets</Link>
+        <Link onClick={handleAllAssetsLinkClick}>All Assets</Link>
       </s.Header>
       <s.Toolbar>
         <s.PopoverContainer>
diff --git a/src/components/Assets/AssetList/types.ts b/src/components/Assets/AssetList/types.ts
index 708d78d0d..9f812dcb8 100644
--- a/src/components/Assets/AssetList/types.ts
+++ b/src/components/Assets/AssetList/types.ts
@@ -4,7 +4,7 @@ import { AssetScopeOption } from "../AssetsViewScopeConfiguration/types";
 
 export interface AssetListProps {
   data?: AssetsData;
-  onBackButtonClick: () => void;
+  onGoToAllAssets: () => void;
   assetTypeId: string;
   filters?: AssetFilterQuery;
   searchQuery: string;
diff --git a/src/components/Assets/AssetTypeList/AssetTypeList.stories.tsx b/src/components/Assets/AssetTypeList/AssetTypeList.stories.tsx
index a3d68c14a..3c8ef9b5c 100644
--- a/src/components/Assets/AssetTypeList/AssetTypeList.stories.tsx
+++ b/src/components/Assets/AssetTypeList/AssetTypeList.stories.tsx
@@ -19,6 +19,9 @@ type Story = StoryObj<typeof meta>;
 // More on writing stories with args: https://storybook.js.org/docs/react/writing-stories/args
 export const Default: Story = {
   args: {
+    setRefresher: () => {
+      return undefined;
+    },
     searchQuery: "",
     data: {
       assetCategories: [
@@ -54,6 +57,9 @@ export const Default: Story = {
 export const Empty: Story = {
   args: {
     searchQuery: "",
+    setRefresher: () => {
+      return undefined;
+    },
     data: {
       assetCategories: []
     }
diff --git a/src/components/Assets/index.tsx b/src/components/Assets/index.tsx
index a1bd12580..fd519a440 100644
--- a/src/components/Assets/index.tsx
+++ b/src/components/Assets/index.tsx
@@ -1,4 +1,5 @@
 import { useCallback, useContext, useEffect, useState } from "react";
+import { actions as globalActions } from "../../actions";
 import { useDebounce } from "../../hooks/useDebounce";
 import { usePrevious } from "../../hooks/usePrevious";
 import { ChangeViewPayload } from "../../types";
@@ -8,7 +9,6 @@ import { EmptyState } from "../common/EmptyState";
 import { SearchInput } from "../common/SearchInput";
 import { RefreshIcon } from "../common/icons/16px/RefreshIcon";
 import { Tooltip } from "../common/v3/Tooltip";
-import { actions as globalActions } from "./../../actions";
 import { AssetList } from "./AssetList";
 import { AssetTypeList } from "./AssetTypeList";
 import { AssetsFilter } from "./AssetsFilter";
@@ -61,7 +61,7 @@ export const Assets = ({ selectedTypeId }: AssetsProps) => {
     }
   }, [config.scope, previousScope, selectedTypeId]);
 
-  const handleAllAssetsClick = () => {
+  const handleGoToAllAssets = () => {
     setSelectedAssetTypeId(null);
     changeView("/assets");
   };
@@ -153,7 +153,7 @@ export const Assets = ({ selectedTypeId }: AssetsProps) => {
 
     return (
       <AssetList
-        onBackButtonClick={handleAllAssetsClick}
+        onGoToAllAssets={handleGoToAllAssets}
         assetTypeId={selectedAssetTypeId}
         filters={selectedFilters}
         searchQuery={debouncedSearchInputValue}
diff --git a/src/components/Dashboard/widgets/ClientSpansPerformanceImpact/index.tsx b/src/components/Dashboard/widgets/ClientSpansPerformanceImpact/index.tsx
index 0d9ad2d7a..2155f12ea 100644
--- a/src/components/Dashboard/widgets/ClientSpansPerformanceImpact/index.tsx
+++ b/src/components/Dashboard/widgets/ClientSpansPerformanceImpact/index.tsx
@@ -32,6 +32,7 @@ const renderClientSpanOverallImpactEntry = (
           {item.displayName}
         </s.SpanLink>
       </Tooltip>
+      <s.StyledCopyButton text={item.displayName} />
       <s.ImpactScoreContainer>
         <ImpactScore
           score={item.overallImpact}
diff --git a/src/components/Dashboard/widgets/ClientSpansPerformanceImpact/styles.ts b/src/components/Dashboard/widgets/ClientSpansPerformanceImpact/styles.ts
index 3390e1fa6..60da65ff9 100644
--- a/src/components/Dashboard/widgets/ClientSpansPerformanceImpact/styles.ts
+++ b/src/components/Dashboard/widgets/ClientSpansPerformanceImpact/styles.ts
@@ -1,10 +1,21 @@
 import styled from "styled-components";
 import { Link } from "../../../common/Link";
+import { CopyButton } from "../../../common/v3/CopyButton";
+
+export const StyledCopyButton = styled(CopyButton)`
+  display: none;
+  padding: 0;
+`;
 
 export const Entry = styled.div`
   display: flex;
-  justify-content: space-between;
   gap: 4px;
+
+  &:hover {
+    ${StyledCopyButton} {
+      display: flex;
+    }
+  }
 `;
 
 export const SpanLink = styled(Link)`
@@ -14,6 +25,7 @@ export const SpanLink = styled(Link)`
 `;
 
 export const ImpactScoreContainer = styled.div`
+  margin-left: auto;
   display: flex;
   width: 70px;
   flex-shrink: 0;
diff --git a/src/components/Dashboard/widgets/SlowQueries/index.tsx b/src/components/Dashboard/widgets/SlowQueries/index.tsx
index 30e8298a0..bf06543dc 100644
--- a/src/components/Dashboard/widgets/SlowQueries/index.tsx
+++ b/src/components/Dashboard/widgets/SlowQueries/index.tsx
@@ -38,6 +38,7 @@ const renderSlowQueryEntry = (
           {item.displayName}
         </s.SpanLink>
       </Tooltip>
+      <s.StyledCopyButton text={item.displayName} />
       {durationString && <s.Duration>{durationString}</s.Duration>}
     </s.Entry>
   );
diff --git a/src/components/Dashboard/widgets/SlowQueries/styles.ts b/src/components/Dashboard/widgets/SlowQueries/styles.ts
index 16c3cea2e..619f83260 100644
--- a/src/components/Dashboard/widgets/SlowQueries/styles.ts
+++ b/src/components/Dashboard/widgets/SlowQueries/styles.ts
@@ -1,10 +1,21 @@
 import styled from "styled-components";
 import { Link } from "../../../common/Link";
+import { CopyButton } from "../../../common/v3/CopyButton";
+
+export const StyledCopyButton = styled(CopyButton)`
+  display: none;
+  padding: 0;
+`;
 
 export const Entry = styled.div`
   display: flex;
-  justify-content: space-between;
   gap: 4px;
+
+  &:hover {
+    ${StyledCopyButton} {
+      display: flex;
+    }
+  }
 `;
 
 export const SpanLink = styled(Link)`
@@ -14,6 +25,7 @@ export const SpanLink = styled(Link)`
 `;
 
 export const Duration = styled.span`
+  margin-left: auto;
   flex-shrink: 0;
   font-size: 14px;
   font-weight: 500;
diff --git a/src/components/Highlights/Highlights.stories.tsx b/src/components/Highlights/Highlights.stories.tsx
index 9055c58af..4b2191bcd 100644
--- a/src/components/Highlights/Highlights.stories.tsx
+++ b/src/components/Highlights/Highlights.stories.tsx
@@ -22,38 +22,34 @@ type Story = StoryObj<typeof meta>;
 // More on writing stories with args: https://storybook.js.org/docs/react/writing-stories/args
 export const Default: Story = {
   play: () => {
-    setTimeout(() => {
-      window.setTimeout(() => {
-        window.postMessage({
-          type: "digma",
-          action: mainActions.SET_HIGHLIGHTS_TOP_ISSUES_DATA,
-          payload: mockedTopIssuesData
-        });
-        window.postMessage({
-          type: "digma",
-          action: mainActions.SET_HIGHLIGHTS_PERFORMANCE_DATA,
-          payload: mockedPerformanceData
-        });
-      }, 1000);
-    });
+    window.setTimeout(() => {
+      window.postMessage({
+        type: "digma",
+        action: mainActions.SET_HIGHLIGHTS_TOP_ISSUES_DATA,
+        payload: mockedTopIssuesData
+      });
+      window.postMessage({
+        type: "digma",
+        action: mainActions.SET_HIGHLIGHTS_PERFORMANCE_DATA,
+        payload: mockedPerformanceData
+      });
+    }, 1000);
   }
 };
 
 export const Empty: Story = {
   play: () => {
-    setTimeout(() => {
-      window.setTimeout(() => {
-        window.postMessage({
-          type: "digma",
-          action: mainActions.SET_HIGHLIGHTS_TOP_ISSUES_DATA,
-          payload: { topInsights: [] }
-        });
-        window.postMessage({
-          type: "digma",
-          action: mainActions.SET_HIGHLIGHTS_PERFORMANCE_DATA,
-          payload: { performance: [] }
-        });
-      }, 1000);
-    });
+    window.setTimeout(() => {
+      window.postMessage({
+        type: "digma",
+        action: mainActions.SET_HIGHLIGHTS_TOP_ISSUES_DATA,
+        payload: { topInsights: [] }
+      });
+      window.postMessage({
+        type: "digma",
+        action: mainActions.SET_HIGHLIGHTS_PERFORMANCE_DATA,
+        payload: { performance: [] }
+      });
+    }, 1000);
   }
 };
diff --git a/src/components/Highlights/TopIssues/common/AssetLink/index.tsx b/src/components/Highlights/TopIssues/common/AssetLink/index.tsx
index b5f15f770..6468cbb90 100644
--- a/src/components/Highlights/TopIssues/common/AssetLink/index.tsx
+++ b/src/components/Highlights/TopIssues/common/AssetLink/index.tsx
@@ -1,6 +1,7 @@
 import { actions as globalActions } from "../../../../../actions";
 import { ChangeScopePayload } from "../../../../../types";
 import { sendUserActionTrackingEvent } from "../../../../../utils/actions/sendUserActionTrackingEvent";
+import { Link } from "../../../../common/v3/Link";
 import { Tooltip } from "../../../../common/v3/Tooltip";
 import { trackingEvents } from "../../../tracking";
 import * as s from "./styles";
@@ -26,7 +27,10 @@ export const AssetLink = ({ asset }: AssetLinkProps) => {
 
   return (
     <Tooltip title={assetName}>
-      <s.Link onClick={handleAssetLinkClick}>{assetName}</s.Link>
+      <s.Container>
+        <Link onClick={handleAssetLinkClick}>{assetName}</Link>
+        <s.StyledCopyButton text={assetName} />
+      </s.Container>
     </Tooltip>
   );
 };
diff --git a/src/components/Highlights/TopIssues/common/AssetLink/styles.ts b/src/components/Highlights/TopIssues/common/AssetLink/styles.ts
index b634933bc..12678fc16 100644
--- a/src/components/Highlights/TopIssues/common/AssetLink/styles.ts
+++ b/src/components/Highlights/TopIssues/common/AssetLink/styles.ts
@@ -1,7 +1,22 @@
 import styled from "styled-components";
-import { Link as CommonLink } from "../../../../common/v3/Link";
+import { CopyButton } from "../../../../common/v3/CopyButton";
 
-export const Link = styled(CommonLink)`
+export const StyledCopyButton = styled(CopyButton)`
+  display: none;
+  padding: 0;
+`;
+
+export const Container = styled.div`
+  display: flex;
+  gap: 4px;
   padding: 6px 0;
+  width: fit-content;
   max-width: 100%;
+  align-items: center;
+
+  &:hover {
+    ${StyledCopyButton} {
+      display: flex;
+    }
+  }
 `;
diff --git a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointBottleneckInsightCard/index.tsx b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointBottleneckInsightCard/index.tsx
index 6244ee0ec..c4a2a044e 100644
--- a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointBottleneckInsightCard/index.tsx
+++ b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointBottleneckInsightCard/index.tsx
@@ -2,8 +2,7 @@ import { getDurationString } from "../../../../../../utils/getDurationString";
 import { InsightCard } from "../common/InsightCard";
 import { ColumnsContainer } from "../common/InsightCard/ColumnsContainer";
 import { KeyValue } from "../common/InsightCard/KeyValue";
-import { ContentContainer, Description, Details } from "../styles";
-import * as s from "./styles";
+import { AssetLink, ContentContainer, Description, Details } from "../styles";
 import { EndpointBottleneckInsightCardProps } from "./types";
 
 export const EndpointBottleneckInsightCard = ({
@@ -54,7 +53,7 @@ export const EndpointBottleneckInsightCard = ({
         <ContentContainer>
           <Details>
             <Description>Asset</Description>
-            <s.SpanListItem
+            <AssetLink
               name={spanName}
               onClick={() => handleSpanLinkClick(spanCodeObjectId)}
             />
diff --git a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointBottleneckInsightCard/styles.ts b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointBottleneckInsightCard/styles.ts
deleted file mode 100644
index 03fd84d20..000000000
--- a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointBottleneckInsightCard/styles.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import styled from "styled-components";
-import { ListItem } from "../common/InsightCard/ListItem";
-
-export const SpanListItem = styled(ListItem)`
-  height: 28px;
-  padding: 4px 0;
-  background: none;
-`;
diff --git a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointChattyApiV2InsightCard/index.tsx b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointChattyApiV2InsightCard/index.tsx
index ab8a29b39..89aff4689 100644
--- a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointChattyApiV2InsightCard/index.tsx
+++ b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointChattyApiV2InsightCard/index.tsx
@@ -1,6 +1,6 @@
 import { InsightType, Trace } from "../../../../types";
 import { InsightCard } from "../common/InsightCard";
-import { Description } from "../styles";
+import { AssetLink, Description } from "../styles";
 import * as s from "./styles";
 import { EndpointChattyApiV2InsightCardProps } from "./types";
 
@@ -37,7 +37,7 @@ export const EndpointChattyApiV2InsightCard = ({
           <Description>
             Excessive API calls to specific endpoint found
           </Description>
-          <s.SpanListItem
+          <AssetLink
             name={spanName}
             onClick={() => handleSpanLinkClick(spanCodeObjectId)}
           />
diff --git a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointChattyApiV2InsightCard/styles.ts b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointChattyApiV2InsightCard/styles.ts
index 491e70dda..1a47b2866 100644
--- a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointChattyApiV2InsightCard/styles.ts
+++ b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointChattyApiV2InsightCard/styles.ts
@@ -1,13 +1,6 @@
 import styled from "styled-components";
-import { ListItem } from "../common/InsightCard/ListItem";
 import { ContentContainer } from "../styles";
 
 export const Container = styled(ContentContainer)`
   gap: 4px;
 `;
-
-export const SpanListItem = styled(ListItem)`
-  height: 28px;
-  padding: 4px 0;
-  background: none;
-`;
diff --git a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointQueryOptimizationV2InsightCard/index.tsx b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointQueryOptimizationV2InsightCard/index.tsx
index 55d571a0f..7dcd7d631 100644
--- a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointQueryOptimizationV2InsightCard/index.tsx
+++ b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointQueryOptimizationV2InsightCard/index.tsx
@@ -3,8 +3,7 @@ import { InsightType, Trace } from "../../../../types";
 import { InsightCard } from "../common/InsightCard";
 import { ColumnsContainer } from "../common/InsightCard/ColumnsContainer";
 import { KeyValue } from "../common/InsightCard/KeyValue";
-import { ContentContainer, Details } from "../styles";
-import * as s from "./styles";
+import { AssetLink, ContentContainer, Details } from "../styles";
 import { EndpointQueryOptimizationV2InsightCardProps } from "./types";
 
 export const EndpointQueryOptimizationV2InsightCard = ({
@@ -46,7 +45,7 @@ export const EndpointQueryOptimizationV2InsightCard = ({
       content={
         <ContentContainer>
           <Details>
-            <s.SpanListItem
+            <AssetLink
               name={spanName}
               onClick={() => handleSpanLinkClick(spanCodeObjectId)}
             />
diff --git a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointQueryOptimizationV2InsightCard/styles.ts b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointQueryOptimizationV2InsightCard/styles.ts
deleted file mode 100644
index 03fd84d20..000000000
--- a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointQueryOptimizationV2InsightCard/styles.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import styled from "styled-components";
-import { ListItem } from "../common/InsightCard/ListItem";
-
-export const SpanListItem = styled(ListItem)`
-  height: 28px;
-  padding: 4px 0;
-  background: none;
-`;
diff --git a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointSessionInViewInsightCard/index.tsx b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointSessionInViewInsightCard/index.tsx
index f67436a1d..82681174b 100644
--- a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointSessionInViewInsightCard/index.tsx
+++ b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointSessionInViewInsightCard/index.tsx
@@ -82,7 +82,7 @@ export const EndpointSessionInViewInsightCard = ({
                   key={spanCodeObjectId}
                   onClick={() => handleLinkClick(spanCodeObjectId)}
                   name={spanName}
-                  buttons={buttons}
+                  endContent={buttons}
                 />
               );
             })}
diff --git a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointSlowdownSourceInsightCard/index.tsx b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointSlowdownSourceInsightCard/index.tsx
index 665f00120..d980ab7cf 100644
--- a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointSlowdownSourceInsightCard/index.tsx
+++ b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointSlowdownSourceInsightCard/index.tsx
@@ -37,14 +37,14 @@ export const EndpointSlowdownSourceInsightCard = ({
             key={spanCodeObjectId}
             onClick={() => handleSpanLinkClick(spanCodeObjectId)}
             name={spanName}
-            buttons={[
+            endContent={
               <DurationChange
                 key={"duration"}
                 currentDuration={x.currentDuration}
                 previousDuration={x.previousDuration}
                 changeTime={x.changeTime}
               />
-            ]}
+            }
           />
         );
       })}
diff --git a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointSpanNPlusOneInsightInsightCard/index.tsx b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointSpanNPlusOneInsightInsightCard/index.tsx
index c42b29a9e..efa1ff997 100644
--- a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointSpanNPlusOneInsightInsightCard/index.tsx
+++ b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointSpanNPlusOneInsightInsightCard/index.tsx
@@ -3,8 +3,7 @@ import { InsightType, Trace } from "../../../../types";
 import { InsightCard } from "../common/InsightCard";
 import { ColumnsContainer } from "../common/InsightCard/ColumnsContainer";
 import { KeyValue } from "../common/InsightCard/KeyValue";
-import { ContentContainer, Description, Details } from "../styles";
-import * as s from "./styles";
+import { AssetLink, ContentContainer, Description, Details } from "../styles";
 import { EndpointSpanNPlusOneInsightCardProps } from "./types";
 
 export const EndpointSpanNPlusOneInsightCard = ({
@@ -64,9 +63,8 @@ export const EndpointSpanNPlusOneInsightCard = ({
         <ContentContainer>
           <Details>
             <Description>Asset</Description>
-            <s.SpanListItem
+            <AssetLink
               name={spanName}
-              key={spanName}
               onClick={() => handleSpanLinkClick(spanInfo.spanCodeObjectId)}
             />
           </Details>
diff --git a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointSpanNPlusOneInsightInsightCard/styles.ts b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointSpanNPlusOneInsightInsightCard/styles.ts
index ca5a34021..7ba3943ef 100644
--- a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointSpanNPlusOneInsightInsightCard/styles.ts
+++ b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/EndpointSpanNPlusOneInsightInsightCard/styles.ts
@@ -1,14 +1,7 @@
 import styled from "styled-components";
-import { ListItem } from "../common/InsightCard/ListItem";
 
 export const InfoContainer = styled.div`
   display: flex;
   gap: 4px;
   align-items: center;
 `;
-
-export const SpanListItem = styled(ListItem)`
-  height: 28px;
-  padding: 4px 0;
-  background: none;
-`;
diff --git a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpaNPlusOneInsightCard/index.tsx b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpaNPlusOneInsightCard/index.tsx
index e146e4fdc..1dfb4174c 100644
--- a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpaNPlusOneInsightCard/index.tsx
+++ b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpaNPlusOneInsightCard/index.tsx
@@ -4,11 +4,11 @@ import { trimEndpointScheme } from "../../../../../../utils/trimEndpointScheme";
 import { ConfigContext } from "../../../../../common/App/ConfigContext";
 import { TraceIcon } from "../../../../../common/icons/12px/TraceIcon";
 import { Button } from "../../../../../common/v3/Button";
-import { Link } from "../../../../../common/v3/Link";
 import { Tooltip } from "../../../../../common/v3/Tooltip";
 import { InsightType, NPlusOneEndpointInfo, Trace } from "../../../../types";
 import { InsightCard } from "../common/InsightCard";
 import { ColumnsContainer } from "../common/InsightCard/ColumnsContainer";
+import { EndpointSelectedOption } from "../common/InsightCard/EndpointSelectedOption";
 import { KeyValue } from "../common/InsightCard/KeyValue";
 import { Select } from "../common/InsightCard/Select";
 import { ContentContainer, Description, Details } from "../styles";
@@ -25,14 +25,12 @@ const renderOptions = (
     return {
       label: route,
       customContent: (
-        <s.SelectedItem>
-          {x.endpointInfo.serviceName}
-          <Tooltip title={route}>
-            <Link onClick={() => handleLinkClick(spanCodeObjectId)}>
-              {route}
-            </Link>
-          </Tooltip>
-        </s.SelectedItem>
+        <EndpointSelectedOption
+          serviceName={x.endpointInfo.serviceName}
+          route={route}
+          spanCodeObjectId={spanCodeObjectId}
+          onClick={handleLinkClick}
+        />
       ),
       value: spanCodeObjectId
     };
diff --git a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanDurationBreakdownInsightCard/index.tsx b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanDurationBreakdownInsightCard/index.tsx
index 61a48d833..86c2c6df9 100644
--- a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanDurationBreakdownInsightCard/index.tsx
+++ b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanDurationBreakdownInsightCard/index.tsx
@@ -112,14 +112,14 @@ export const SpanDurationBreakdownInsightCard = ({
                   key={spanCodeObjectId}
                   name={name}
                   onClick={() => handleSpanLinkClick(spanCodeObjectId)}
-                  buttons={[
+                  endContent={
                     <Tag
                       key={"duration"}
                       title={title}
                       type={"highlight"}
                       content={getDurationString(percentile.duration)}
                     />
-                  ]}
+                  }
                 />
               ) : null;
             })}
diff --git a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanEndpointBottleneckInsightCard/index.tsx b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanEndpointBottleneckInsightCard/index.tsx
index c84d31ab7..2948f7c7b 100644
--- a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanEndpointBottleneckInsightCard/index.tsx
+++ b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanEndpointBottleneckInsightCard/index.tsx
@@ -5,11 +5,11 @@ import { trimEndpointScheme } from "../../../../../../utils/trimEndpointScheme";
 import { ConfigContext } from "../../../../../common/App/ConfigContext";
 import { TraceIcon } from "../../../../../common/icons/12px/TraceIcon";
 import { Button } from "../../../../../common/v3/Button";
-import { Link } from "../../../../../common/v3/Link";
 import { Tooltip } from "../../../../../common/v3/Tooltip";
 import { BottleneckEndpointInfo, InsightType, Trace } from "../../../../types";
 import { InsightCard } from "../common/InsightCard";
 import { ColumnsContainer } from "../common/InsightCard/ColumnsContainer";
+import { EndpointSelectedOption } from "../common/InsightCard/EndpointSelectedOption";
 import { KeyValue } from "../common/InsightCard/KeyValue";
 import { Select } from "../common/InsightCard/Select";
 import { ContentContainer, Description, Details } from "../styles";
@@ -26,14 +26,12 @@ const renderOptions = (
     return {
       label: route,
       customContent: (
-        <s.SelectedItem>
-          {x.endpointInfo.serviceName}
-          <Tooltip title={route}>
-            <Link onClick={() => handleLinkClick(spanCodeObjectId)}>
-              {route}
-            </Link>
-          </Tooltip>
-        </s.SelectedItem>
+        <EndpointSelectedOption
+          serviceName={x.endpointInfo.serviceName}
+          route={route}
+          spanCodeObjectId={spanCodeObjectId}
+          onClick={handleLinkClick}
+        />
       ),
       value: spanCodeObjectId
     };
diff --git a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanEndpointBottleneckInsightCard/styles.ts b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanEndpointBottleneckInsightCard/styles.ts
index 13722a693..681cf45ae 100644
--- a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanEndpointBottleneckInsightCard/styles.ts
+++ b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanEndpointBottleneckInsightCard/styles.ts
@@ -1,13 +1,4 @@
 import styled from "styled-components";
-import { footnoteRegularTypography } from "../../../../../common/App/typographies";
-
-export const SelectedItem = styled.div`
-  ${footnoteRegularTypography}
-
-  display: flex;
-  gap: 4px;
-  align-items: center;
-`;
 
 export const SelectContainer = styled.div`
   display: flex;
diff --git a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanQueryOptimizationInsightCard/index.tsx b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanQueryOptimizationInsightCard/index.tsx
index dc455e97e..6a06c7955 100644
--- a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanQueryOptimizationInsightCard/index.tsx
+++ b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanQueryOptimizationInsightCard/index.tsx
@@ -7,7 +7,7 @@ import { InsightCard } from "../common/InsightCard";
 import { ColumnsContainer } from "../common/InsightCard/ColumnsContainer";
 import { KeyValue } from "../common/InsightCard/KeyValue";
 import { ListItem } from "../common/InsightCard/ListItem";
-import { ContentContainer, Description, Details } from "../styles";
+import { AssetLink, ContentContainer, Description, Details } from "../styles";
 import * as s from "./styles";
 import { SpanQueryOptimizationInsightCardProps } from "./types";
 
@@ -31,7 +31,7 @@ export const SpanQueryOptimizationInsightCard = ({
     insight.id
   );
 
-  const handleSpanLinkClick = (spanCodeObjectId?: string) => {
+  const handleAssetLinkClick = (spanCodeObjectId?: string) => {
     spanCodeObjectId && onAssetLinkClick(spanCodeObjectId, insight.type);
   };
 
@@ -65,9 +65,9 @@ export const SpanQueryOptimizationInsightCard = ({
                 Query is slow compared to other{" "}
                 {insight.dbStatement.toUpperCase()} requests
               </Description>
-              <ListItem
+              <AssetLink
                 name={spanName || ""}
-                onClick={() => handleSpanLinkClick(spanCodeObjectId)}
+                onClick={() => handleAssetLinkClick(spanCodeObjectId)}
               />
             </Details>
           )}
@@ -91,7 +91,7 @@ export const SpanQueryOptimizationInsightCard = ({
                     <ListItem
                       name={route}
                       key={route}
-                      onClick={() => handleSpanLinkClick(spanCodeObjectId)}
+                      onClick={() => handleAssetLinkClick(spanCodeObjectId)}
                     />
                   );
                 })}
diff --git a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanScalingInsightCard/index.tsx b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanScalingInsightCard/index.tsx
index e13d84cae..cf07ca07a 100644
--- a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanScalingInsightCard/index.tsx
+++ b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanScalingInsightCard/index.tsx
@@ -96,11 +96,11 @@ export const SpanScalingInsightCard = ({
               );
             }
             return (
-              <s.RootCauseListItem
+              <s.StyledListItem
                 key={spanCodeObjectId}
                 name={spanName}
                 onClick={() => handleLinkClick(spanCodeObjectId)}
-                buttons={buttons}
+                endContent={buttons}
               />
             );
           })}
@@ -133,7 +133,7 @@ export const SpanScalingInsightCard = ({
               {pageItems.map((endpoint) => {
                 const endpointRoute = trimEndpointScheme(endpoint.route);
                 return (
-                  <s.EndpointListItem
+                  <s.StyledListItem
                     key={endpoint.route}
                     onClick={() => handleLinkClick(endpoint.spanCodeObjectId)}
                     name={endpointRoute}
diff --git a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanScalingInsightCard/styles.ts b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanScalingInsightCard/styles.ts
index b6a182d11..b66ee4234 100644
--- a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanScalingInsightCard/styles.ts
+++ b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanScalingInsightCard/styles.ts
@@ -18,10 +18,6 @@ export const RootCause = styled.div`
   gap: 4px;
 `;
 
-export const RootCauseListItem = styled(ListItem)`
-  height: 32px;
-`;
-
-export const EndpointListItem = styled(ListItem)`
+export const StyledListItem = styled(ListItem)`
   height: 32px;
 `;
diff --git a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanUsagesInsightCard/index.tsx b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanUsagesInsightCard/index.tsx
index 65e3ce0ff..ebcd13457 100644
--- a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanUsagesInsightCard/index.tsx
+++ b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanUsagesInsightCard/index.tsx
@@ -104,38 +104,42 @@ export const SpanUsagesInsightCard = ({
       },
       cell: (info) => {
         const flow = info.getValue();
+        const firstServiceSpanName = `${flow.firstService.service} ${flow.firstService.span}`;
+        const lastServiceSpanName = flow.lastService
+          ? `${flow.lastService.service} ${flow.lastService.span}`
+          : "";
         return (
           <s.FlowData>
-            <Tooltip
-              title={`${flow.firstService.service} ${flow.firstService.span}`}
-            >
-              <s.FullSpanName>
-                <s.SpanNamePart>{flow.firstService.service}</s.SpanNamePart>
-                <s.Link
-                  onClick={() =>
-                    handleServiceLinkClick(flow.firstService.spanCodeObjectId)
-                  }
-                >
-                  {flow.firstService.span}
-                </s.Link>
-              </s.FullSpanName>
-            </Tooltip>
+            <s.Span>
+              <Tooltip title={firstServiceSpanName}>
+                <s.FullSpanName>
+                  <s.SpanNamePart>{flow.firstService.service}</s.SpanNamePart>
+                  <s.Link
+                    onClick={() =>
+                      handleServiceLinkClick(flow.firstService.spanCodeObjectId)
+                    }
+                  >
+                    {flow.firstService.span}
+                  </s.Link>
+                </s.FullSpanName>
+              </Tooltip>
+              <s.StyledCopyButton text={firstServiceSpanName} />
+            </s.Span>
             {flow.intermediateSpan && (
-              <s.SubsequentSpan>
+              <s.Span>
                 {FlowArrow}
                 <Tooltip title={flow.intermediateSpan}>
                   <s.FullSpanName>
                     <s.SpanNamePart>{flow.intermediateSpan}</s.SpanNamePart>
                   </s.FullSpanName>
                 </Tooltip>
-              </s.SubsequentSpan>
+                <s.StyledCopyButton text={flow.intermediateSpan} />
+              </s.Span>
             )}
             {flow.lastService && (
-              <s.SubsequentSpan>
+              <s.Span>
                 {FlowArrow}
-                <Tooltip
-                  title={`${flow.lastService.service} ${flow.lastService.span}`}
-                >
+                <Tooltip title={lastServiceSpanName}>
                   <s.FullSpanName>
                     <s.SpanNamePart>{flow.lastService.service}</s.SpanNamePart>
                     <s.Link
@@ -149,17 +153,19 @@ export const SpanUsagesInsightCard = ({
                     </s.Link>
                   </s.FullSpanName>
                 </Tooltip>
-              </s.SubsequentSpan>
+                <s.StyledCopyButton text={lastServiceSpanName} />
+              </s.Span>
             )}
             {flow.lastServiceSpan && (
-              <s.SubsequentSpan>
+              <s.Span>
                 {FlowArrow}
                 <Tooltip title={flow.lastServiceSpan}>
                   <s.FullSpanName>
                     <s.SpanNamePart>{flow.lastServiceSpan}</s.SpanNamePart>
                   </s.FullSpanName>
                 </Tooltip>
-              </s.SubsequentSpan>
+                <s.StyledCopyButton text={flow.lastServiceSpan} />
+              </s.Span>
             )}
           </s.FlowData>
         );
diff --git a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanUsagesInsightCard/styles.ts b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanUsagesInsightCard/styles.ts
index f7a62cdfb..2338ade5b 100644
--- a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanUsagesInsightCard/styles.ts
+++ b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/SpanUsagesInsightCard/styles.ts
@@ -4,6 +4,7 @@ import {
   footnoteRegularTypography
 } from "../../../../../common/App/typographies";
 import { Link as CommonLink } from "../../../../../common/Link";
+import { CopyButton } from "../../../../../common/v3/CopyButton";
 
 export const Container = styled.div`
   display: flex;
@@ -21,10 +22,21 @@ export const FlowData = styled.div`
   overflow: hidden;
 `;
 
-export const SubsequentSpan = styled.div`
+export const StyledCopyButton = styled(CopyButton)`
+  padding: 0;
+  display: none;
+`;
+
+export const Span = styled.div`
   display: flex;
   gap: 8px;
   align-items: center;
+
+  &:hover {
+    ${StyledCopyButton} {
+      display: flex;
+    }
+  }
 `;
 
 export const ArrowIconContainer = styled.div`
diff --git a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/EndpointSelectedOption/index.tsx b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/EndpointSelectedOption/index.tsx
new file mode 100644
index 000000000..4c83927ed
--- /dev/null
+++ b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/EndpointSelectedOption/index.tsx
@@ -0,0 +1,25 @@
+import { Link } from "../../../../../../../common/v3/Link";
+import { Tooltip } from "../../../../../../../common/v3/Tooltip";
+import * as s from "./styles";
+import { EndpointSelectedOptionProps } from "./types";
+
+export const EndpointSelectedOption = ({
+  serviceName,
+  route,
+  spanCodeObjectId,
+  onClick
+}: EndpointSelectedOptionProps) => {
+  const title = `${serviceName} ${route}`;
+
+  return (
+    <s.Container>
+      <Tooltip title={title}>
+        <s.EndpointName>
+          <s.ServiceName>{serviceName}</s.ServiceName>
+          <Link onClick={() => onClick(spanCodeObjectId)}>{route}</Link>
+        </s.EndpointName>
+      </Tooltip>
+      <s.StyledCopyButton text={route} />
+    </s.Container>
+  );
+};
diff --git a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/EndpointSelectedOption/styles.ts b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/EndpointSelectedOption/styles.ts
new file mode 100644
index 000000000..0ec5362d7
--- /dev/null
+++ b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/EndpointSelectedOption/styles.ts
@@ -0,0 +1,36 @@
+import styled from "styled-components";
+import { footnoteRegularTypography } from "../../../../../../../common/App/typographies";
+import { CopyButton } from "../../../../../../../common/v3/CopyButton";
+
+export const StyledCopyButton = styled(CopyButton)`
+  display: none;
+  padding: 0;
+`;
+
+export const Container = styled.div`
+  ${footnoteRegularTypography}
+
+  display: flex;
+  gap: 4px;
+  align-items: center;
+  width: 100%;
+
+  &:hover {
+    ${StyledCopyButton} {
+      display: flex;
+    }
+  }
+`;
+
+export const EndpointName = styled.div`
+  display: flex;
+  gap: 4px;
+  overflow: hidden;
+`;
+
+export const ServiceName = styled.span`
+  max-width: 50%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+`;
diff --git a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/EndpointSelectedOption/types.ts b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/EndpointSelectedOption/types.ts
new file mode 100644
index 000000000..51c9fb512
--- /dev/null
+++ b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/EndpointSelectedOption/types.ts
@@ -0,0 +1,6 @@
+export interface EndpointSelectedOptionProps {
+  serviceName: string;
+  route: string;
+  spanCodeObjectId: string;
+  onClick: (spanCodeObjectId: string) => void;
+}
diff --git a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/InsightHeader/index.tsx b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/InsightHeader/index.tsx
index 1bed06bad..a2fe66904 100644
--- a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/InsightHeader/index.tsx
+++ b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/InsightHeader/index.tsx
@@ -7,7 +7,6 @@ import {
 } from "../../../../../../../../utils/getInsightTypeInfo";
 import { roundTo } from "../../../../../../../../utils/roundTo";
 import { ConfigContext } from "../../../../../../../common/App/ConfigContext";
-import { Info } from "../../../../../../../common/v3/Info";
 import { Link } from "../../../../../../../common/v3/Link";
 import { NewTag } from "../../../../../../../common/v3/NewTag";
 import { Tag } from "../../../../../../../common/v3/Tag";
@@ -105,7 +104,7 @@ export const InsightHeader = ({
         <s.Title>
           {insightTypeInfo?.label}
           {insightTypeInfo?.description && (
-            <Info title={<insightTypeInfo.description />} />
+            <s.TitleInfo title={<insightTypeInfo.description />} />
           )}
           {lastUpdateTimer && (
             <s.Description>
@@ -136,6 +135,7 @@ export const InsightHeader = ({
           <Tooltip title={spanInfo.displayName}>
             <Link onClick={handleSpanLinkClick}>{spanInfo.displayName}</Link>
           </Tooltip>
+          <s.StyledCopyButton text={spanInfo.displayName} />
         </s.SpanInfoRow>
       )}
     </s.Container>
diff --git a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/InsightHeader/styles.ts b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/InsightHeader/styles.ts
index c9ac3bcb5..adaf40caf 100644
--- a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/InsightHeader/styles.ts
+++ b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/InsightHeader/styles.ts
@@ -3,6 +3,8 @@ import {
   bodySemiboldTypography,
   footnoteRegularTypography
 } from "../../../../../../../common/App/typographies";
+import { CopyButton } from "../../../../../../../common/v3/CopyButton";
+import { Info } from "../../../../../../../common/v3/Info";
 
 export const Container = styled.div`
   display: flex;
@@ -16,9 +18,22 @@ export const TitleRow = styled.div`
   gap: 8px;
 `;
 
+export const StyledCopyButton = styled(CopyButton)`
+  padding: 0 6px;
+  display: none;
+`;
+
 export const SpanInfoRow = styled.div`
   display: flex;
   padding: 0 32px;
+  gap: 4px;
+  align-items: center;
+
+  &:hover {
+    ${StyledCopyButton} {
+      display: flex;
+    }
+  }
 `;
 
 export const TagTitle = styled.span`
@@ -37,6 +52,10 @@ export const Title = styled.div`
   align-items: center;
 `;
 
+export const TitleInfo = styled(Info)`
+  color: ${({ theme }) => theme.colors.v3.icon.tertiary};
+`;
+
 export const BadgeContainer = styled.div`
   margin-left: auto;
   display: flex;
diff --git a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/ListItem/ListItem.stories.tsx b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/ListItem/ListItem.stories.tsx
index fca0f216e..5077dde9d 100644
--- a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/ListItem/ListItem.stories.tsx
+++ b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/ListItem/ListItem.stories.tsx
@@ -28,9 +28,11 @@ export const Default: Story = {
 export const WithButtons: Story = {
   args: {
     name: "Very very very very very very very very long text",
-    buttons: [
-      <Button key={"jira"} icon={{ component: TargetIcon }} />,
-      <Button key={"target"} icon={{ component: JiraLogoIcon }} />
-    ]
+    endContent: (
+      <>
+        <Button key={"jira"} icon={{ component: TargetIcon }} />
+        <Button key={"target"} icon={{ component: JiraLogoIcon }} />
+      </>
+    )
   }
 };
diff --git a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/ListItem/index.tsx b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/ListItem/index.tsx
index 4858b704b..d46006cf3 100644
--- a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/ListItem/index.tsx
+++ b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/ListItem/index.tsx
@@ -5,7 +5,7 @@ import * as s from "./styles";
 import { ListItemProps } from "./types";
 
 const ListItemComponent = (
-  { name, onClick, className, buttons }: ListItemProps,
+  { name, onClick, className, endContent }: ListItemProps,
   ref: ForwardedRef<HTMLDivElement>
 ) => {
   const handleClick = (e: MouseEvent<HTMLAnchorElement>) => {
@@ -15,10 +15,15 @@ const ListItemComponent = (
 
   return (
     <s.Container ref={ref} className={className}>
-      <Tooltip title={name}>
-        <Link onClick={handleClick}>{name}</Link>
-      </Tooltip>
-      {buttons && <s.ButtonsContainer>{buttons}</s.ButtonsContainer>}
+      <s.LinkContainer>
+        <Tooltip title={name}>
+          <Link onClick={handleClick}>{name}</Link>
+        </Tooltip>
+        <s.StyledCopyButton text={name} />
+      </s.LinkContainer>
+      {endContent && (
+        <s.EndContentContainer>{endContent}</s.EndContentContainer>
+      )}
     </s.Container>
   );
 };
diff --git a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/ListItem/styles.ts b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/ListItem/styles.ts
index 39dc20c96..784551ecd 100644
--- a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/ListItem/styles.ts
+++ b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/ListItem/styles.ts
@@ -1,4 +1,5 @@
 import styled from "styled-components";
+import { CopyButton } from "../../../../../../../common/v3/CopyButton";
 
 export const Container = styled.div`
   display: flex;
@@ -12,7 +13,23 @@ export const Container = styled.div`
   box-sizing: border-box;
 `;
 
-export const ButtonsContainer = styled.div`
+export const StyledCopyButton = styled(CopyButton)`
+  display: none;
+`;
+
+export const LinkContainer = styled.div`
+  display: flex;
+  align-items: center;
+  overflow: hidden;
+
+  &:hover {
+    ${StyledCopyButton} {
+      display: flex;
+    }
+  }
+`;
+
+export const EndContentContainer = styled.div`
   display: flex;
   gap: 8px;
 `;
diff --git a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/ListItem/types.ts b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/ListItem/types.ts
index f40a93d1d..ea50e77e4 100644
--- a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/ListItem/types.ts
+++ b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/common/InsightCard/ListItem/types.ts
@@ -3,6 +3,6 @@ import { ReactNode } from "react";
 export interface ListItemProps {
   onClick: () => void;
   className?: string;
-  buttons?: ReactNode[];
+  endContent?: ReactNode | ReactNode[];
   name: string;
 }
diff --git a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/styles.ts b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/styles.ts
index 9497ecc82..be584bded 100644
--- a/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/styles.ts
+++ b/src/components/Insights/InsightsCatalog/InsightsPage/insightCards/styles.ts
@@ -1,5 +1,6 @@
 import styled from "styled-components";
 import { caption1RegularTypography } from "../../../../common/App/typographies";
+import { ListItem } from "./common/InsightCard/ListItem";
 
 export const Description = styled.div`
   color: ${({ theme }) => theme.colors.v3.text.secondary};
@@ -24,3 +25,9 @@ export const ListContainer = styled.div`
   flex-direction: column;
   gap: 4px;
 `;
+
+export const AssetLink = styled(ListItem)`
+  height: 28px;
+  padding: 4px 0;
+  background: none;
+`;
diff --git a/src/components/Main/Authentication/Login/Login.stories.tsx b/src/components/Main/Authentication/Login/Login.stories.tsx
index 06942caa0..c2a4873ea 100644
--- a/src/components/Main/Authentication/Login/Login.stories.tsx
+++ b/src/components/Main/Authentication/Login/Login.stories.tsx
@@ -26,7 +26,7 @@ export const WithSuccessMessage: Story = {
 
 export const Failed: Story = {
   play: () => {
-    setTimeout(
+    window.setTimeout(
       () =>
         window.postMessage({
           type: "digma",
diff --git a/src/components/Main/Authentication/Login/index.tsx b/src/components/Main/Authentication/Login/index.tsx
index 7983a0974..f63314eec 100644
--- a/src/components/Main/Authentication/Login/index.tsx
+++ b/src/components/Main/Authentication/Login/index.tsx
@@ -5,6 +5,7 @@ import { LockIcon } from "../../../common/icons/12px/LockIcon";
 import { EnvelopeIcon } from "../../../common/icons/16px/EnvelopeIcon";
 import { Spinner } from "../../../common/v3/Spinner";
 import { TextField } from "../../../common/v3/TextField";
+import * as s from "../styles";
 import {
   ButtonsContainer,
   ErrorMessage,
@@ -14,7 +15,6 @@ import {
   Loader,
   SubmitButton
 } from "../styles";
-import * as s from "./../styles";
 import { LoginFormValues, LoginProps } from "./types";
 import { useLogin } from "./useLogin";
 
diff --git a/src/components/Main/Authentication/Registration/Registration.stories.tsx b/src/components/Main/Authentication/Registration/Registration.stories.tsx
index fafa3f464..610dc09b1 100644
--- a/src/components/Main/Authentication/Registration/Registration.stories.tsx
+++ b/src/components/Main/Authentication/Registration/Registration.stories.tsx
@@ -20,7 +20,7 @@ export const Default: Story = {};
 
 export const Failed: Story = {
   play: () => {
-    setTimeout(
+    window.setTimeout(
       () =>
         window.postMessage({
           type: "digma",
diff --git a/src/components/Main/Authentication/Registration/index.tsx b/src/components/Main/Authentication/Registration/index.tsx
index 0bd8b76e9..c45a2962e 100644
--- a/src/components/Main/Authentication/Registration/index.tsx
+++ b/src/components/Main/Authentication/Registration/index.tsx
@@ -7,8 +7,7 @@ import { LockIcon } from "../../../common/icons/12px/LockIcon";
 import { EnvelopeIcon } from "../../../common/icons/16px/EnvelopeIcon";
 import { Spinner } from "../../../common/v3/Spinner";
 import { TextField } from "../../../common/v3/TextField";
-import * as s from "./../styles";
-import { Loader } from "./../styles";
+import * as s from "../styles";
 import { RegisterFormValues, RegistrationProps } from "./types";
 import { useRegistration } from "./useRegistration";
 
@@ -190,10 +189,10 @@ export const Registration = ({ onRegister }: RegistrationProps) => {
         />
       </s.ButtonsContainer>
       {isLoading && (
-        <Loader>
+        <s.Loader>
           <Spinner size={16} />
           Loading...
-        </Loader>
+        </s.Loader>
       )}
     </s.FormContainer>
   );
diff --git a/src/components/Navigation/ScopeBar/index.tsx b/src/components/Navigation/ScopeBar/index.tsx
index c7a93b3a1..ba93a6a9a 100644
--- a/src/components/Navigation/ScopeBar/index.tsx
+++ b/src/components/Navigation/ScopeBar/index.tsx
@@ -123,6 +123,8 @@ export const ScopeBar = (props: ScopeBarProps) => {
     </Tooltip>
   );
 
+  const isActive = Boolean(props.scope?.span);
+
   return (
     <s.ScopeBar $isActive={Boolean(props.scope?.span)}>
       <s.ScopeBarButton
@@ -132,7 +134,10 @@ export const ScopeBar = (props: ScopeBarProps) => {
         <HomeIcon color={"currentColor"} size={16} />
       </s.ScopeBarButton>
       <s.ScopeBarDivider />
-      <s.ScopeName>{scopeDisplayName}</s.ScopeName>
+      <s.ScopeNameContainer>
+        <s.ScopeName>{scopeDisplayName}</s.ScopeName>
+        {isActive && <s.StyledCopyButton text={scopeDisplayName} />}
+      </s.ScopeNameContainer>
       <s.ScopeBarDivider />
       {isTargetButtonMenuEnabled ? (
         <NewPopover
diff --git a/src/components/Navigation/ScopeBar/styles.ts b/src/components/Navigation/ScopeBar/styles.ts
index 96e0fb55b..9e33ae39a 100644
--- a/src/components/Navigation/ScopeBar/styles.ts
+++ b/src/components/Navigation/ScopeBar/styles.ts
@@ -1,4 +1,5 @@
 import styled from "styled-components";
+import { CopyButton } from "../../common/v3/CopyButton";
 import { ScopeBarElementProps } from "./types";
 
 export const ScopeBar = styled.div<ScopeBarElementProps>`
@@ -19,15 +20,38 @@ export const ScopeBar = styled.div<ScopeBarElementProps>`
   overflow: hidden;
 `;
 
+export const StyledCopyButton = styled(CopyButton)`
+  display: none;
+  padding: 2px 4px;
+`;
+
+export const ScopeNameContainer = styled.div`
+  display: flex;
+  align-items: center;
+  overflow: hidden;
+  width: 100%;
+
+  &:hover {
+    ${StyledCopyButton} {
+      display: flex;
+    }
+  }
+`;
+
 export const ScopeName = styled.span`
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
-  width: 100%;
   padding: 0 4px;
   user-select: none;
 `;
 
+export const ScopeBarDivider = styled.div`
+  width: 1px;
+  height: 18px;
+  background: ${({ theme }) => theme.colors.v3.stroke.primaryLight};
+`;
+
 export const ScopeBarButton = styled.button`
   display: flex;
   align-items: center;
@@ -48,9 +72,3 @@ export const ScopeBarButton = styled.button`
     color: ${({ theme }) => theme.colors.v3.icon.primary};
   }
 `;
-
-export const ScopeBarDivider = styled.div`
-  width: 1px;
-  height: 18px;
-  background: ${({ theme }) => theme.colors.v3.stroke.primaryLight};
-`;
diff --git a/src/components/RecentActivity/CreateEnvironmentWizard/CreateEnvironmentWizard.stories.tsx b/src/components/RecentActivity/CreateEnvironmentWizard/CreateEnvironmentWizard.stories.tsx
index 811ab3260..7f1b834d0 100644
--- a/src/components/RecentActivity/CreateEnvironmentWizard/CreateEnvironmentWizard.stories.tsx
+++ b/src/components/RecentActivity/CreateEnvironmentWizard/CreateEnvironmentWizard.stories.tsx
@@ -21,22 +21,20 @@ type Story = StoryObj<typeof meta>;
 // More on writing stories with args: https://storybook.js.org/docs/react/writing-stories/args
 export const Default: Story = {};
 
-export const Errored: Story = {
+export const WithError: Story = {
   play: () => {
-    setTimeout(() => {
-      window.setTimeout(() => {
-        window.postMessage({
-          type: "digma",
-          action: actions.SET_CREATE_ENVIRONMENT_RESULT,
-          payload: {
-            errors: [
-              {
-                errorCode: "ExistingEnvironmentName",
-                errorDescription: "some errororroro"
-              }
-            ]
-          }
-        });
+    window.setTimeout(() => {
+      window.postMessage({
+        type: "digma",
+        action: actions.SET_CREATE_ENVIRONMENT_RESULT,
+        payload: {
+          errors: [
+            {
+              errorCode: "ExistingEnvironmentName",
+              errorDescription: "some error message"
+            }
+          ]
+        }
       });
     }, 1000);
   }
diff --git a/src/components/RecentActivity/CreateEnvironmentWizard/EnvironmentTypePanel/index.tsx b/src/components/RecentActivity/CreateEnvironmentWizard/EnvironmentTypePanel/index.tsx
index ee1ff19b4..40d105c14 100644
--- a/src/components/RecentActivity/CreateEnvironmentWizard/EnvironmentTypePanel/index.tsx
+++ b/src/components/RecentActivity/CreateEnvironmentWizard/EnvironmentTypePanel/index.tsx
@@ -1,4 +1,5 @@
 import { useContext } from "react";
+import { CENTRAL_ON_PREM_INSTALLATION_GUIDE_URL } from "../../../../constants";
 import { openURLInDefaultBrowser } from "../../../../utils/actions/openURLInDefaultBrowser";
 import { sendUserActionTrackingEvent } from "../../../../utils/actions/sendUserActionTrackingEvent";
 import { ConfigContext } from "../../../common/App/ConfigContext";
@@ -10,8 +11,6 @@ import { trackingEvents } from "../../tracking";
 import * as s from "./styles";
 import { EnvironmentTypeData, EnvironmentTypePanelProps } from "./types";
 
-const DIGMA_FOR_TEAMS_URL = "https://digma.ai/digma-for-teams/";
-
 export const EnvironmentTypePanel = (props: EnvironmentTypePanelProps) => {
   const config = useContext(ConfigContext);
 
@@ -29,7 +28,7 @@ export const EnvironmentTypePanel = (props: EnvironmentTypePanelProps) => {
   };
 
   const handleLearnMoreClick = () => {
-    openURLInDefaultBrowser(DIGMA_FOR_TEAMS_URL);
+    openURLInDefaultBrowser(CENTRAL_ON_PREM_INSTALLATION_GUIDE_URL);
   };
 
   const environmentTypes: EnvironmentTypeData[] = [
diff --git a/src/components/RecentActivity/Digmathon/Digmathon.stories.tsx b/src/components/RecentActivity/Digmathon/Digmathon.stories.tsx
index a3ecc1d2b..a4c596a04 100644
--- a/src/components/RecentActivity/Digmathon/Digmathon.stories.tsx
+++ b/src/components/RecentActivity/Digmathon/Digmathon.stories.tsx
@@ -19,28 +19,34 @@ type Story = StoryObj<typeof meta>;
 
 // More on writing stories with args: https://storybook.js.org/docs/react/writing-stories/args
 export const Default: Story = {
+  args: {
+    getData: () => {
+      return undefined;
+    }
+  },
   play: () => {
-    setTimeout(() => {
-      window.setTimeout(() => {
-        window.postMessage({
-          type: "digma",
-          action: actions.SET_DIGMATHON_PROGRESS_DATA,
-          payload: mockedDigmathonProgressData
-        });
+    window.setTimeout(() => {
+      window.postMessage({
+        type: "digma",
+        action: actions.SET_DIGMATHON_PROGRESS_DATA,
+        payload: mockedDigmathonProgressData
       });
     }, 0);
   }
 };
 
 export const Congratulations: Story = {
+  args: {
+    getData: () => {
+      return undefined;
+    }
+  },
   play: () => {
-    setTimeout(() => {
-      window.setTimeout(() => {
-        window.postMessage({
-          type: "digma",
-          action: actions.SET_DIGMATHON_PROGRESS_DATA,
-          payload: mockedDigmathonProgressData
-        });
+    window.setTimeout(() => {
+      window.postMessage({
+        type: "digma",
+        action: actions.SET_DIGMATHON_PROGRESS_DATA,
+        payload: mockedDigmathonProgressData
       });
     }, 0);
   }
diff --git a/src/components/RecentActivity/LiveView/index.tsx b/src/components/RecentActivity/LiveView/index.tsx
index b6eccc4db..dfe0077d8 100644
--- a/src/components/RecentActivity/LiveView/index.tsx
+++ b/src/components/RecentActivity/LiveView/index.tsx
@@ -31,7 +31,6 @@ import { roundTo } from "../../../utils/roundTo";
 import { roundToNonZeroDecimals } from "../../../utils/roundToNonZeroDecimals";
 import { getThemeKind } from "../../common/App/styles";
 import { ToggleSwitch } from "../../common/ToggleSwitch";
-import { Tooltip as CommonTooltip } from "../../common/Tooltip";
 import { ArrowSmallIcon } from "../../common/icons/ArrowSmallIcon";
 import { ChartCircleIcon } from "../../common/icons/ChartCircleIcon";
 import { CrossIcon } from "../../common/icons/CrossIcon";
@@ -40,6 +39,7 @@ import { EndpointIcon } from "../../common/icons/EndpointIcon";
 import { MinusIcon } from "../../common/icons/MinusIcon";
 import { PlusIcon } from "../../common/icons/PlusIcon";
 import { Direction } from "../../common/icons/types";
+import { Tooltip as CommonTooltip } from "../../common/v3/Tooltip";
 import { trackingEvents } from "../tracking";
 import { AreaTooltipContent } from "./AreaTooltipContent";
 import { ChangeStatus } from "./ChangeStatus";
@@ -439,6 +439,7 @@ export const LiveView = (props: LiveViewProps) => {
           <CommonTooltip title={spanName}>
             <s.SpanName>{spanName}</s.SpanName>
           </CommonTooltip>
+          <s.StyledCopyButton text={spanName} />
         </s.Title>
         <s.LiveBadge>
           <DoubleCircleIcon color={getLiveIconColor(theme)} size={14} />
diff --git a/src/components/RecentActivity/LiveView/styles.ts b/src/components/RecentActivity/LiveView/styles.ts
index 4e49dbae8..247707af6 100644
--- a/src/components/RecentActivity/LiveView/styles.ts
+++ b/src/components/RecentActivity/LiveView/styles.ts
@@ -1,4 +1,5 @@
 import styled from "styled-components";
+import { CopyButton } from "../../common/v3/CopyButton";
 import {
   AreaLegendIllustrationProps,
   AxisChartContainerProps,
@@ -72,11 +73,22 @@ export const Header = styled.div`
   }};
 `;
 
+export const StyledCopyButton = styled(CopyButton)`
+  display: none;
+  padding: 0;
+`;
+
 export const Title = styled.span`
   display: flex;
   align-items: center;
   gap: 4px;
   overflow: hidden;
+
+  &:hover {
+    ${StyledCopyButton} {
+      display: flex;
+    }
+  }
 `;
 
 export const SpanIconContainer = styled.span`
diff --git a/src/components/RecentActivity/RecentActivity.stories.tsx b/src/components/RecentActivity/RecentActivity.stories.tsx
index bbe21d27c..b64db9bdb 100644
--- a/src/components/RecentActivity/RecentActivity.stories.tsx
+++ b/src/components/RecentActivity/RecentActivity.stories.tsx
@@ -28,7 +28,7 @@ const data: RecentActivityData = {
   environments: [
     {
       name: "ENV_RENDER",
-      id: "ENV_RENDER",
+      id: "ENV_RENDER#ID#1",
       isPending: false,
       type: "Public",
       token: null,
@@ -46,7 +46,7 @@ const data: RecentActivityData = {
     },
     {
       name: "UNSET_ENV",
-      id: "UNSET_ENV",
+      id: "UNSET_ENV#ID#1",
       isPending: false,
       type: "Public",
       token: null,
@@ -733,7 +733,7 @@ export const EnableDigmathonMode: Story = {
 
 export const OpenCongratulationsDigmathonView: Story = {
   play: () => {
-    setTimeout(() => {
+    window.setTimeout(() => {
       window.postMessage({
         type: "digma",
         action: actions.SET_DIGMATHON_PROGRESS_DATA,
diff --git a/src/components/RecentActivity/RecentActivityTable/index.tsx b/src/components/RecentActivity/RecentActivityTable/index.tsx
index e190f8799..52ff14cbc 100644
--- a/src/components/RecentActivity/RecentActivityTable/index.tsx
+++ b/src/components/RecentActivity/RecentActivityTable/index.tsx
@@ -109,16 +109,18 @@ export const RecentActivityTable = (props: RecentActivityTableProps) => {
   };
 
   const renderSpanLink = (span: EntrySpan) => (
-    <Tooltip title={span.displayText}>
-      <s.SpanLink
-        key={span.spanCodeObjectId}
-        onClick={() => {
-          handleSpanLinkClick(span);
-        }}
-      >
-        {span.displayText}
-      </s.SpanLink>
-    </Tooltip>
+    <s.SpanLinkContainer>
+      <Tooltip title={span.displayText}>
+        <s.SpanLink
+          onClick={() => {
+            handleSpanLinkClick(span);
+          }}
+        >
+          {span.displayText}
+        </s.SpanLink>
+      </Tooltip>
+      <s.StyledCopyButton text={span.displayText} />
+    </s.SpanLinkContainer>
   );
 
   const renderSpanLinks = (entry: ActivityEntry) => (
diff --git a/src/components/RecentActivity/RecentActivityTable/styles.ts b/src/components/RecentActivity/RecentActivityTable/styles.ts
index d98d1e845..93b51202d 100644
--- a/src/components/RecentActivity/RecentActivityTable/styles.ts
+++ b/src/components/RecentActivity/RecentActivityTable/styles.ts
@@ -1,5 +1,6 @@
 import styled from "styled-components";
 import { Link } from "../../common/Link";
+import { CopyButton } from "../../common/v3/CopyButton";
 import { ListItemProps, TableBodyRowProps, TableHeadProps } from "./types";
 
 export const Table = styled.div`
@@ -196,6 +197,23 @@ export const SpanLinksContainer = styled.span`
   gap: 4px;
 `;
 
+export const StyledCopyButton = styled(CopyButton)`
+  padding: 0 6px;
+  display: none;
+`;
+
+export const SpanLinkContainer = styled.span`
+  display: flex;
+  align-items: center;
+  overflow: hidden;
+
+  &:hover {
+    ${StyledCopyButton} {
+      display: flex;
+    }
+  }
+`;
+
 export const SpanLink = styled(Link)`
   overflow: hidden;
   text-overflow: ellipsis;
diff --git a/src/components/Tests/TestTicket/index.tsx b/src/components/Tests/TestTicket/index.tsx
index ecb783aa3..21006c0b1 100644
--- a/src/components/Tests/TestTicket/index.tsx
+++ b/src/components/Tests/TestTicket/index.tsx
@@ -25,30 +25,27 @@ export const TestTicket = (props: TestTicketProps) => {
     .map((x) => x.displayName)
     .join("\n");
 
+  const description = [
+    <div key={"title"}>
+      {`"${name}" test failed${
+        isString(errorOrFailMessage)
+          ? ` with message:\n${errorOrFailMessage}`
+          : ""
+      }`}
+    </div>,
+    <div key={"date"}>Last run at: {new Date(runAt).toString()}</div>,
+    <div key={"duration"}>Duration: {getDurationString(duration)}</div>,
+    relatedSpans.length > 0 ? (
+      <div key={"spans"}>{`Related spans:\n${relatedSpans}`}</div>
+    ) : null,
+    <DigmaSignature key={"digmaSignature"} />
+  ].filter(Boolean) as ReactElement[];
+
   const renderDescription = () => (
     <>
-      {intersperse<ReactElement, ReactElement>(
-        [
-          <div key={"title"}>
-            {`"${name}" test failed${
-              isString(errorOrFailMessage)
-                ? ` with message:\n${errorOrFailMessage}`
-                : ""
-            }`}
-          </div>,
-          <div key={"date"}>Last run at: {new Date(runAt).toString()}</div>,
-          <div key={"duration"}>Duration: {getDurationString(duration)}</div>,
-          <>
-            {relatedSpans.length > 0 && (
-              <div key={"spans"}>{`Related spans:\n${relatedSpans}`}</div>
-            )}
-          </>,
-          <DigmaSignature key={"digmaSignature"} />
-        ],
-        (i: number) => (
-          <br key={`separator-${i}`} />
-        )
-      )}
+      {intersperse<ReactElement, ReactElement>(description, (i: number) => (
+        <br key={`separator-${i}`} />
+      ))}
     </>
   );
 
diff --git a/src/components/common/CodeSnippet/index.tsx b/src/components/common/CodeSnippet/index.tsx
index 28e68c8f9..192265dd3 100644
--- a/src/components/common/CodeSnippet/index.tsx
+++ b/src/components/common/CodeSnippet/index.tsx
@@ -1,4 +1,3 @@
-import copy from "copy-to-clipboard";
 import { ForwardedRef, forwardRef, useRef } from "react";
 import SyntaxHighlighter from "react-syntax-highlighter";
 import {
@@ -7,9 +6,7 @@ import {
 } from "react-syntax-highlighter/dist/esm/styles/hljs";
 import { DefaultTheme, useTheme } from "styled-components";
 import { isString } from "../../../typeGuards/isString";
-import { CopyIcon } from "../icons/16px/CopyIcon";
-import { IconButton } from "../v3/IconButton";
-import { Tooltip } from "../v3/Tooltip";
+import { CopyButton } from "../v3/CopyButton";
 import * as s from "./styles";
 import { CodeSnippetProps, HighlighterTheme } from "./types";
 
@@ -31,13 +28,9 @@ const CodeSnippetComponent = (
   const highlighterTheme = getHighlighterTheme(theme);
   const codeRef = useRef<HTMLElement>(null);
 
-  const handleCopyButtonClick = () => {
-    if (isString(props.text)) {
-      copy(props.text);
-    } else if (codeRef.current) {
-      copy(codeRef.current.innerText);
-    }
-  };
+  const textToCopy = isString(props.text)
+    ? props.text
+    : codeRef.current?.innerText || "";
 
   return (
     <s.Container className={props.className} ref={ref}>
@@ -59,15 +52,7 @@ const CodeSnippetComponent = (
       ) : (
         <s.Code ref={codeRef}>{props.text}</s.Code>
       )}
-      <Tooltip title={"Copy"}>
-        <IconButton
-          onClick={handleCopyButtonClick}
-          icon={{
-            component: CopyIcon,
-            size: 16
-          }}
-        />
-      </Tooltip>
+      <CopyButton text={textToCopy} />
     </s.Container>
   );
 };
diff --git a/src/components/common/v3/CopyButton/index.tsx b/src/components/common/v3/CopyButton/index.tsx
new file mode 100644
index 000000000..bb3d02cc1
--- /dev/null
+++ b/src/components/common/v3/CopyButton/index.tsx
@@ -0,0 +1,23 @@
+import copy from "copy-to-clipboard";
+import { MouseEvent } from "react";
+import { CopyIcon } from "../../icons/16px/CopyIcon";
+import { IconButton } from "../IconButton";
+import { Tooltip } from "../Tooltip";
+import { CopyButtonProps } from "./types";
+
+export const CopyButton = ({ text, className }: CopyButtonProps) => {
+  const handleClick = (e: MouseEvent<HTMLButtonElement>) => {
+    e.stopPropagation();
+    copy(text);
+  };
+
+  return (
+    <Tooltip title={"Copy"}>
+      <IconButton
+        className={className}
+        icon={{ component: CopyIcon, size: 16 }}
+        onClick={handleClick}
+      />
+    </Tooltip>
+  );
+};
diff --git a/src/components/common/v3/CopyButton/types.ts b/src/components/common/v3/CopyButton/types.ts
new file mode 100644
index 000000000..5063471e6
--- /dev/null
+++ b/src/components/common/v3/CopyButton/types.ts
@@ -0,0 +1,4 @@
+export interface CopyButtonProps {
+  text: string;
+  className?: string;
+}
diff --git a/src/components/common/v3/Info/index.tsx b/src/components/common/v3/Info/index.tsx
index b782f8d12..443aa4d0c 100644
--- a/src/components/common/v3/Info/index.tsx
+++ b/src/components/common/v3/Info/index.tsx
@@ -3,9 +3,9 @@ import { Tooltip } from "../Tooltip";
 import * as s from "./styles";
 import { InfoProps } from "./types";
 
-export const Info = ({ title }: InfoProps) => (
+export const Info = ({ title, className }: InfoProps) => (
   <Tooltip title={title}>
-    <s.Container>
+    <s.Container className={className}>
       <InfoCircleIcon color={"currentColor"} size={12} />
     </s.Container>
   </Tooltip>
diff --git a/src/components/common/v3/Info/types.ts b/src/components/common/v3/Info/types.ts
index 44053cc2f..898bc6951 100644
--- a/src/components/common/v3/Info/types.ts
+++ b/src/components/common/v3/Info/types.ts
@@ -2,4 +2,5 @@ import { ReactNode } from "react";
 
 export interface InfoProps {
   title: ReactNode;
+  className?: string;
 }