diff --git a/ui/components/CopyToCliboard.tsx b/ui/components/CopyToCliboard.tsx
index 957c41c149..c0616fcf8d 100644
--- a/ui/components/CopyToCliboard.tsx
+++ b/ui/components/CopyToCliboard.tsx
@@ -1,29 +1,16 @@
 import * as React from "react";
 import { useCallback, useState } from "react";
-import styled from "styled-components";
-import { IconButton } from "./Button";
 import Icon, { IconType } from "./Icon";
 
-const CopyButton = styled(IconButton)`
-  &.MuiButton-outlinedPrimary {
-    margin-left: ${(props) => props.theme.spacing.xxs};
-    padding: ${(props) => props.theme.spacing.xxs};
-  }
-  &.MuiButton-root {
-    height: initial;
-    width: initial;
-    min-width: 0px;
-  }
-`;
-
 export default function CopyToClipboard({
   value,
-  className,
   size,
+  showText,
 }: {
   value: string;
   className?: string;
-  size?: "small" | "medium" | "large";
+  size?: "small" | "base" | "medium" | "large";
+  showText?: boolean;
 }) {
   const [copied, setCopied] = useState(false);
   const handleCopy = useCallback(() => {
@@ -34,13 +21,17 @@ export default function CopyToClipboard({
       }, 1500);
     });
   }, [value]);
-
+  let text = undefined;
+  if (showText) {
+    text = copied ? "Copied" : "Copy";
+  }
   return (
-    <CopyButton onClick={handleCopy} className={className}>
+    <div onClick={handleCopy} style={{ cursor: "pointer" }}>
       <Icon
         type={copied ? IconType.CheckMark : IconType.FileCopyIcon}
         size={size}
+        text={text}
       />
-    </CopyButton>
+    </div>
   );
 }
diff --git a/ui/components/YamlView.tsx b/ui/components/YamlView.tsx
index d0a9c2bd62..57dfa8dafe 100644
--- a/ui/components/YamlView.tsx
+++ b/ui/components/YamlView.tsx
@@ -7,6 +7,7 @@ import { useInDarkMode } from "../hooks/theme";
 import { ObjectRef } from "../lib/api/core/types.pb";
 import { createYamlCommand } from "../lib/utils";
 import CopyToClipboard from "./CopyToCliboard";
+import Flex from "./Flex";
 
 export type YamlViewProps = {
   className?: string;
@@ -16,10 +17,9 @@ export type YamlViewProps = {
   theme?: ThemeTypes;
 };
 
-const YamlHeader = styled.div`
+const YamlHeader = styled(Flex)`
   background: ${(props) => props.theme.colors.neutralGray};
   padding: ${(props) => props.theme.spacing.small};
-  width: 100%;
   border-bottom: 1px solid ${(props) => props.theme.colors.neutral20};
   font-family: monospace;
   color: ${(props) => props.theme.colors.primary10};
@@ -53,7 +53,7 @@ function UnstyledYamlView({
       },
     },
 
-    lineProps: { style: { flexWrap: "wrap" } },
+    lineProps: { style: { textWrap: "wrap" } },
 
     ...(dark && { style: darcula }),
   };
@@ -61,25 +61,29 @@ function UnstyledYamlView({
   return (
     <div className={className}>
       {headerText && (
-        <YamlHeader>
+        <YamlHeader wide gap="4" alignItems="center">
           {headerText}
           <CopyToClipboard
             value={headerText}
-            className="yaml-copy"
+            className="yamlheader-copy"
             size="small"
           />
         </YamlHeader>
       )}
 
-      <SyntaxHighlighter
-        language={type}
-        {...styleProps}
-        wrapLongLines
-        wrapLines
-        showLineNumbers
-      >
-        {yaml}
-      </SyntaxHighlighter>
+      <div className="code-wrapper">
+        <div className="copy-wrapper">
+          <CopyToClipboard value={yaml} className="yaml-copy" size="base" />
+        </div>
+        <SyntaxHighlighter
+          language={type}
+          {...styleProps}
+          wrapLines
+          showLineNumbers
+        >
+          {yaml}
+        </SyntaxHighlighter>
+      </div>
     </div>
   );
 }
@@ -94,6 +98,17 @@ const YamlView = styled(UnstyledYamlView).attrs({
   border-radius: 8px;
   overflow: hidden;
 
+  .code-wrapper {
+    position: relative;
+  }
+  .copy-wrapper {
+    position: absolute;
+    right: 4px;
+    top: 8px;
+    background: ${(props) => props.theme.colors.neutralGray};
+    padding: 4px 8px;
+    border-radius: 2px;
+  }
   pre {
     padding: ${(props) => props.theme.spacing.medium}
       ${(props) => props.theme.spacing.small} !important;
diff --git a/ui/components/__tests__/__snapshots__/YamlView.test.tsx.snap b/ui/components/__tests__/__snapshots__/YamlView.test.tsx.snap
index 588f300def..91407f6c1b 100644
--- a/ui/components/__tests__/__snapshots__/YamlView.test.tsx.snap
+++ b/ui/components/__tests__/__snapshots__/YamlView.test.tsx.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`YamlView snapshots renders 1`] = `
-.c4 {
+.c1 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -13,13 +13,77 @@ exports[`YamlView snapshots renders 1`] = `
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
+  gap: 4px;
+  width: 100%;
 }
 
-.c5 svg {
+.c3 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: row;
+  -ms-flex-direction: row;
+  flex-direction: row;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+}
+
+.c4 svg {
+  height: 12px;
+  width: 12px;
+}
+
+.c4 svg path.path-fill,
+.c4 svg line.path-fill,
+.c4 svg polygon.path-fill,
+.c4 svg rect.path-fill,
+.c4 svg circle.path-fill,
+.c4 svg polyline.path-fill {
+  fill: !important;
+  -webkit-transition: fill 200ms cubic-bezier(0.4,0,0.2,1) 0ms;
+  transition: fill 200ms cubic-bezier(0.4,0,0.2,1) 0ms;
+}
+
+.c4 svg path.stroke-fill,
+.c4 svg line.stroke-fill,
+.c4 svg polygon.stroke-fill,
+.c4 svg rect.stroke-fill,
+.c4 svg circle.stroke-fill,
+.c4 svg polyline.stroke-fill {
+  stroke: !important;
+  -webkit-transition: stroke 200ms cubic-bezier(0.4,0,0.2,1) 0ms;
+  transition: stroke 200ms cubic-bezier(0.4,0,0.2,1) 0ms;
+}
+
+.c4 svg rect.rect-height {
   height: 12px;
   width: 12px;
 }
 
+.c4.downward {
+  -webkit-transform: rotate(180deg);
+  -ms-transform: rotate(180deg);
+  transform: rotate(180deg);
+}
+
+.c4.upward {
+  -webkit-transform: initial;
+  -ms-transform: initial;
+  transform: initial;
+}
+
+.c4 img {
+  width: 12px;
+}
+
+.c5 svg {
+  height: 16px;
+  width: 16px;
+}
+
 .c5 svg path.path-fill,
 .c5 svg line.path-fill,
 .c5 svg polygon.path-fill,
@@ -43,8 +107,8 @@ exports[`YamlView snapshots renders 1`] = `
 }
 
 .c5 svg rect.rect-height {
-  height: 12px;
-  width: 12px;
+  height: 16px;
+  width: 16px;
 }
 
 .c5.downward {
@@ -60,35 +124,12 @@ exports[`YamlView snapshots renders 1`] = `
 }
 
 .c5 img {
-  width: 12px;
-}
-
-.c2.MuiButton-root {
-  border-radius: 50%;
-  min-width: 38px;
-  height: 38px;
-  padding: 0;
-}
-
-.c2.MuiButton-text {
-  padding: 0;
-}
-
-.c3.MuiButton-outlinedPrimary {
-  margin-left: 4px;
-  padding: 4px;
+  width: 16px;
 }
 
-.c3.MuiButton-root {
-  height: initial;
-  width: initial;
-  min-width: 0px;
-}
-
-.c1 {
+.c2 {
   background: #F6F7F9;
   padding: 12px;
-  width: 100%;
   border-bottom: 1px solid #d8d8d8;
   font-family: monospace;
   color: #009CCC;
@@ -104,6 +145,19 @@ exports[`YamlView snapshots renders 1`] = `
   overflow: hidden;
 }
 
+.c0 .code-wrapper {
+  position: relative;
+}
+
+.c0 .copy-wrapper {
+  position: absolute;
+  right: 4px;
+  top: 8px;
+  background: #F6F7F9;
+  padding: 4px 8px;
+  border-radius: 2px;
+}
+
 .c0 pre {
   padding: 24px 12px !important;
 }
@@ -112,32 +166,49 @@ exports[`YamlView snapshots renders 1`] = `
   className="c0 UnstyledYamlView"
 >
   <div
-    className="c1"
+    className="c1 c2"
   >
     kubectl get kustomization podinfo -n flux-system -o yaml
-    <button
-      className="MuiButtonBase-root MuiButton-root MuiButton-outlined c2 c3 yaml-copy MuiButton-outlinedPrimary MuiButton-disableElevation"
-      disabled={false}
-      onBlur={[Function]}
+    <div
       onClick={[Function]}
-      onDragLeave={[Function]}
-      onFocus={[Function]}
-      onKeyDown={[Function]}
-      onKeyUp={[Function]}
-      onMouseDown={[Function]}
-      onMouseLeave={[Function]}
-      onMouseUp={[Function]}
-      onTouchEnd={[Function]}
-      onTouchMove={[Function]}
-      onTouchStart={[Function]}
-      tabIndex={0}
-      type="button"
+      style={
+        Object {
+          "cursor": "pointer",
+        }
+      }
     >
-      <span
-        className="MuiButton-label"
+      <div
+        className="c3 c4"
+      >
+        <svg
+          aria-hidden={true}
+          className="MuiSvgIcon-root"
+          focusable="false"
+          viewBox="0 0 24 24"
+        >
+          <path
+            d="M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12V1zm-1 4H8c-1.1 0-1.99.9-1.99 2L6 21c0 1.1.89 2 1.99 2H19c1.1 0 2-.9 2-2V11l-6-6zM8 21V7h6v5h5v9H8z"
+          />
+        </svg>
+      </div>
+    </div>
+  </div>
+  <div
+    className="code-wrapper"
+  >
+    <div
+      className="copy-wrapper"
+    >
+      <div
+        onClick={[Function]}
+        style={
+          Object {
+            "cursor": "pointer",
+          }
+        }
       >
         <div
-          className="c4 c5"
+          className="c3 c5"
         >
           <svg
             aria-hidden={true}
@@ -150,75 +221,74 @@ exports[`YamlView snapshots renders 1`] = `
             />
           </svg>
         </div>
-      </span>
-    </button>
-  </div>
-  <pre
-    style={
-      Object {
-        "MozHyphens": "none",
-        "MozTabSize": "4",
-        "OTabSize": "4",
-        "WebkitHyphens": "none",
-        "background": "#f5f2f0",
-        "backgroundColor": "transparent",
-        "color": "black",
-        "fontFamily": "Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace",
-        "fontSize": "1em",
-        "hyphens": "none",
-        "lineHeight": "1.5",
-        "margin": 0,
-        "msHyphens": "none",
-        "overflow": "auto",
-        "padding": "1em",
-        "tabSize": "4",
-        "textAlign": "left",
-        "textShadow": "0 1px white",
-        "whiteSpace": "pre",
-        "wordBreak": "normal",
-        "wordSpacing": "normal",
-        "wordWrap": "normal",
-      }
-    }
-  >
-    <code
+      </div>
+    </div>
+    <pre
       style={
         Object {
-          "whiteSpace": "pre-wrap",
-          "wordBreak": "break-word",
+          "MozHyphens": "none",
+          "MozTabSize": "4",
+          "OTabSize": "4",
+          "WebkitHyphens": "none",
+          "background": "#f5f2f0",
+          "backgroundColor": "transparent",
+          "color": "black",
+          "fontFamily": "Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace",
+          "fontSize": "1em",
+          "hyphens": "none",
+          "lineHeight": "1.5",
+          "margin": 0,
+          "msHyphens": "none",
+          "overflow": "auto",
+          "padding": "1em",
+          "tabSize": "4",
+          "textAlign": "left",
+          "textShadow": "0 1px white",
+          "whiteSpace": "pre",
+          "wordBreak": "normal",
+          "wordSpacing": "normal",
+          "wordWrap": "normal",
         }
       }
     >
-      <span
+      <code
         style={
           Object {
-            "display": "flex",
-            "flexWrap": "wrap",
+            "whiteSpace": "pre",
+            "wordBreak": "break-word",
           }
         }
       >
         <span
-          className="linenumber react-syntax-highlighter-line-number"
           style={
             Object {
-              "color": "slategray",
-              "display": "inline-block",
-              "minWidth": "1.25em",
-              "paddingRight": "1em",
-              "textAlign": "right",
-              "userSelect": "none",
+              "textWrap": "wrap",
             }
           }
         >
-          1
-        </span>
-        <span
-          style={Object {}}
-        >
-          yaml\\nyaml\\nyaml\\n
+          <span
+            className="linenumber react-syntax-highlighter-line-number"
+            style={
+              Object {
+                "color": "slategray",
+                "display": "inline-block",
+                "minWidth": "1.25em",
+                "paddingRight": "1em",
+                "textAlign": "right",
+                "userSelect": "none",
+              }
+            }
+          >
+            1
+          </span>
+          <span
+            style={Object {}}
+          >
+            yaml\\nyaml\\nyaml\\n
+          </span>
         </span>
-      </span>
-    </code>
-  </pre>
+      </code>
+    </pre>
+  </div>
 </div>
 `;