diff --git a/src/app/components/elements/PrintButton.tsx b/src/app/components/elements/PrintButton.tsx
index 3de261165c..fe617cdf30 100644
--- a/src/app/components/elements/PrintButton.tsx
+++ b/src/app/components/elements/PrintButton.tsx
@@ -14,8 +14,8 @@ export const PrintButton = ({questionPage}: PrintProps ) => {
     const dispatch = useAppDispatch();
 
     return questionPage ?
-        <>
-            {questionPrintOpen && <div className="question-actions-link-box not-mobile">
+        <div className="position-relative">
+            {questionPrintOpen && <div className="action-buttons-popup-container not-mobile">
                 <div className="question-actions-link text-nowrap">
                     <Button
                         size={"sm"}
@@ -58,7 +58,7 @@ export const PrintButton = ({questionPage}: PrintProps ) => {
                     aria-label="Print page"
                 />
             )}
-        </>
+        </div>
         :
         siteSpecific(
             <IconButton
diff --git a/src/app/components/elements/ShareLink.tsx b/src/app/components/elements/ShareLink.tsx
index c5efd8b4f5..ef473c7dc9 100644
--- a/src/app/components/elements/ShareLink.tsx
+++ b/src/app/components/elements/ShareLink.tsx
@@ -1,5 +1,5 @@
 import React, {useEffect, useRef, useState} from "react";
-import {isMobile, isPhy, isTutorOrAbove, PATHS, siteSpecific, useOutsideCallback} from "../../services";
+import {isAda, isMobile, isPhy, isTutorOrAbove, PATHS, siteSpecific, useOutsideCallback} from "../../services";
 import {selectors, useAppSelector} from "../../state";
 import classNames from "classnames";
 import { IconButton } from "./AffixButton";
@@ -40,9 +40,17 @@ export const ShareLink = ({linkUrl, reducedWidthLink, gameboardId, clickAwayClos
     useOutsideCallback(shareLinkDivRef, () => clickAwayClose && setShowShareLink(false), [setShowShareLink]);
 
     const buttonAriaLabel = showShareLink ? "Hide share link" : "Get share link";
-    const linkWidth = isMobile() || reducedWidthLink ? 192 : (shareUrl.length * siteSpecific(9, 6));
+    const linkWidth = isMobile() || reducedWidthLink ? siteSpecific(256, 192) : (shareUrl.length * siteSpecific(9, 6));
     const showDuplicateAndEdit = gameboardId && isTutorOrAbove(user);
-    return <div ref={shareLinkDivRef} className={classNames(className, "share-link-icon", {"w-max-content d-inline-flex": isPhy})}>
+    return <div ref={shareLinkDivRef} className={classNames(className, "position-relative share-link-icon", {"w-max-content d-inline-flex": isPhy})}>
+        <div className={`action-buttons-popup-container ${showShareLink ? "" : "d-none"} ${showDuplicateAndEdit ? "double-height" : ""}`} style={{width: linkWidth}}>
+            <input type="text" readOnly ref={shareLink} value={shareUrl} onClick={(e) => e.preventDefault()} aria-label="Share URL" />
+        </div>
+        {showShareLink && showDuplicateAndEdit && <div className="duplicate-and-edit" style={{width: linkWidth}}>
+            <a href={`${PATHS.GAMEBOARD_BUILDER}?base=${gameboardId}`} className={isPhy ? "px-1" : ""}>
+                {siteSpecific("Duplicate and Edit", "Duplicate and edit")}
+            </a>
+        </div>}
         {siteSpecific(
             <IconButton
                 icon="icon-share"
@@ -54,16 +62,7 @@ export const ShareLink = ({linkUrl, reducedWidthLink, gameboardId, clickAwayClos
                 data-bs-theme="neutral"
                 onClick={(e) => { e.preventDefault(); toggleShareLink(); }}
             />,
-            <button className={siteSpecific("btn-action", classNames({"outline": outline}))} onClick={(e) => {e.preventDefault(); toggleShareLink();}} aria-label={buttonAriaLabel} />
+            <button className={siteSpecific("btn-action", classNames("btn btn-primary", {"outline": outline}))} onClick={(e) => {e.preventDefault(); toggleShareLink();}} aria-label={buttonAriaLabel} />
         )}
-        <div className={`share-link ${showShareLink ? "d-block" : ""} ${showDuplicateAndEdit ? "double-height" : ""}`} style={{width: linkWidth}}>
-            <input type="text" readOnly ref={shareLink} value={shareUrl} onClick={(e) => e.preventDefault()} aria-label="Share URL" />
-            {showDuplicateAndEdit && <React.Fragment>
-                {isPhy && <hr className="text-center mt-4" />}
-                <a href={`${PATHS.GAMEBOARD_BUILDER}?base=${gameboardId}`} className={isPhy ? "px-1" : ""}>
-                    {siteSpecific("Duplicate and Edit", "Duplicate and edit")}
-                </a>
-            </React.Fragment>}
-        </div>
     </div>;
 };
diff --git a/src/app/components/elements/inputs/UserContextPicker.tsx b/src/app/components/elements/inputs/UserContextPicker.tsx
index c55766dd70..77f3a5efbd 100644
--- a/src/app/components/elements/inputs/UserContextPicker.tsx
+++ b/src/app/components/elements/inputs/UserContextPicker.tsx
@@ -17,6 +17,7 @@ import {
     useUserViewingContext
 } from "../../../services";
 import {selectors, transientUserContextSlice, useAppDispatch, useAppSelector,} from "../../../state";
+import classNames from "classnames";
 
 const contextExplanationMap: {[key in CONTEXT_SOURCE]: string} = {
     [CONTEXT_SOURCE.TRANSIENT]: "these context picker settings",
@@ -62,7 +63,7 @@ export const UserContextPicker = ({className, hideLabels = true}: {className?: s
         return <Col className={`d-flex flex-column w-100 px-0 mt-2 context-picker-container no-print ${className}`}>
             <Row sm={12} md={7} lg={siteSpecific(7, 8)} xl={siteSpecific(7, 9)} className={`d-flex m-0 p-0 justify-content-md-end`}>
                 {/* Stage Selector */}
-                <FormGroup className={`form-group w-100 d-flex justify-content-end m-0`}>
+                <div className={classNames("form-group w-100 d-flex justify-content-end m-0", {"mb-3": isAda})}>
                     {!hideLabels && <Label className="d-inline-block pe-2" htmlFor="uc-stage-select">Stage</Label>}
                     {!userContext.hasDefaultPreferences && (userContext.explanation.stage == CONTEXT_SOURCE.TRANSIENT || userContext.explanation.examBoard == CONTEXT_SOURCE.TRANSIENT) &&
                         <button className={"icon-reset mt-2"} aria-label={"Reset viewing context"} onClick={() => {
@@ -71,7 +72,7 @@ export const UserContextPicker = ({className, hideLabels = true}: {className?: s
                         }}/>
                     }
                     <Input
-                        className={`flex-grow-1 d-inline-block ps-2 pe-0 mb-2 ${isAda ? "me-1" : ""}`}
+                        className={classNames("flex-grow-1 d-inline-block ps-2 pe-0", { "mb-2 me-1": isAda })}
                         type="select" id="uc-stage-select"
                         aria-label={hideLabels ? "Stage" : undefined}
                         value={userContext.stage}
@@ -134,7 +135,7 @@ export const UserContextPicker = ({className, hideLabels = true}: {className?: s
                             }
                         </UncontrolledTooltip>
                     </div>
-                </FormGroup>
+                </div>
             </Row>
         </Col>;
     }
diff --git a/src/app/components/elements/layout/SidebarLayout.tsx b/src/app/components/elements/layout/SidebarLayout.tsx
index f699058795..26a26ec41f 100644
--- a/src/app/components/elements/layout/SidebarLayout.tsx
+++ b/src/app/components/elements/layout/SidebarLayout.tsx
@@ -67,7 +67,7 @@ const NavigationSidebar = (props: SidebarProps) => {
     if (isAda) return <></>;
 
     const { className, ...rest } = props;
-    return <Col lg={4} xl={3} {...rest} className={classNames("sidebar p-4 order-1 order-lg-0", className)} />;
+    return <Col lg={4} xl={3} {...rest} className={classNames("sidebar no-print p-4 order-1 order-lg-0", className)} />;
 };
 
 interface ContentSidebarProps extends SidebarProps {
@@ -86,9 +86,9 @@ const ContentSidebar = (props: ContentSidebarProps) => {
     const { className, buttonTitle, ...rest } = props;
     return <>
         {above['lg'](deviceSize) 
-            ? <Col lg={4} xl={3} {...rest} className={classNames("d-none d-lg-flex flex-column sidebar p-4 order-0", className)} />
+            ? <Col lg={4} xl={3} {...rest} className={classNames("d-none d-lg-flex flex-column sidebar no-print p-4 order-0", className)} />
             : <>
-                <div className="d-flex align-items-center flex-wrap py-3 gap-3">
+                <div className="d-flex align-items-center no-print flex-wrap py-3 gap-3">
                     <AffixButton color="keyline" size="lg" onClick={toggleMenu} affix={{
                         affix: "icon-sidebar", 
                         position: "prefix", 
@@ -196,12 +196,13 @@ interface FilterCheckboxProps extends React.HTMLAttributes<HTMLElement> {
     incompatibleTags?: Tag[]; // tags that are removed when this tag is added
     dependentTags?: Tag[]; // tags that are removed when this tag is removed
     baseTag?: Tag; // tag to add when all tags are removed
+    partiallySelected?: boolean;
     checkboxStyle?: "tab" | "button";
     bsSize?: "sm" | "lg";
 }
 
 const FilterCheckbox = (props : FilterCheckboxProps) => {
-    const {tag, conceptFilters, setConceptFilters, tagCounts, checkboxStyle, incompatibleTags, dependentTags, baseTag, ...rest} = props;
+    const {tag, conceptFilters, setConceptFilters, tagCounts, checkboxStyle, incompatibleTags, dependentTags, baseTag, partiallySelected, ...rest} = props;
     const [checked, setChecked] = useState(conceptFilters.includes(tag));
 
     useEffect(() => {
@@ -210,7 +211,7 @@ const FilterCheckbox = (props : FilterCheckboxProps) => {
 
     const handleCheckboxChange = (checked: boolean) => {
         const newConceptFilters = checked 
-            ? [...conceptFilters.filter(c => !incompatibleTags?.includes(c)), tag] 
+            ? [...conceptFilters.filter(c => !incompatibleTags?.includes(c)), ...(!partiallySelected ? [tag] : [])] 
             : conceptFilters.filter(c => ![tag, ...(dependentTags ?? [])].includes(c));
         setConceptFilters(newConceptFilters.length > 0 ? newConceptFilters : (baseTag ? [baseTag] : []));
     };
@@ -226,12 +227,17 @@ const FilterCheckbox = (props : FilterCheckboxProps) => {
         />;
 };
 
-const AllFiltersCheckbox = (props: Omit<FilterCheckboxProps, "tag">) => {
-    const { conceptFilters, setConceptFilters, tagCounts, baseTag, ...rest } = props;
+const AllFiltersCheckbox = (props: Omit<FilterCheckboxProps, "tag"> & {forceEnabled?: boolean}) => {
+    const { conceptFilters, setConceptFilters, tagCounts, baseTag, forceEnabled, ...rest } = props;
     const [previousFilters, setPreviousFilters] = useState<Tag[]>(baseTag ? [baseTag] : []);
     return <StyledTabPicker {...rest} 
-        id="all" checked={baseTag ? conceptFilters.length === 1 && conceptFilters[0] === baseTag : !conceptFilters.length} checkboxTitle="All" count={tagCounts && Object.values(tagCounts).reduce((a, b) => a + b, 0)}
+        id="all" checked={forceEnabled || baseTag ? conceptFilters.length === 1 && conceptFilters[0] === baseTag : !conceptFilters.length} 
+        checkboxTitle="All" count={tagCounts && (baseTag ? tagCounts[baseTag.id] : Object.values(tagCounts).reduce((a, b) => a + b, 0))}
         onInputChange={(e) => {
+            if (forceEnabled) {
+                setConceptFilters(baseTag ? [baseTag] : []);
+                return;
+            }
             if (e.target.checked) {
                 setPreviousFilters(conceptFilters);
                 setConceptFilters(baseTag ? [baseTag] : []);
@@ -272,19 +278,25 @@ export const SubjectSpecificConceptListSidebar = (props: ConceptListSidebarProps
 
         <div className="d-flex flex-column">
             <h5>Filter by topic</h5>
-            <AllFiltersCheckbox conceptFilters={conceptFilters} setConceptFilters={setConceptFilters} tagCounts={tagCounts} baseTag={subjectTag}/>
+            <AllFiltersCheckbox 
+                conceptFilters={conceptFilters} setConceptFilters={setConceptFilters} tagCounts={tagCounts} baseTag={subjectTag} 
+                forceEnabled={applicableTags.filter(tag => !isDefined(tagCounts) || tagCounts[tag.id] > 0).length === 0}
+            />
             <div className="section-divider-small"/>
-            {applicableTags.map(tag => 
-                <FilterCheckbox 
-                    key={tag.id} 
-                    tag={tag} 
-                    conceptFilters={conceptFilters} 
-                    setConceptFilters={setConceptFilters} 
-                    tagCounts={tagCounts} 
-                    incompatibleTags={[subjectTag]} 
-                    baseTag={subjectTag}
-                />
-            )}
+            {applicableTags
+                .filter(tag => !isDefined(tagCounts) || tagCounts[tag.id] > 0)
+                .map(tag => 
+                    <FilterCheckbox 
+                        key={tag.id} 
+                        tag={tag} 
+                        conceptFilters={conceptFilters} 
+                        setConceptFilters={setConceptFilters} 
+                        tagCounts={tagCounts} 
+                        incompatibleTags={[subjectTag]} 
+                        baseTag={subjectTag}
+                    />
+                )
+            }
         </div>
 
         <div className="section-divider"/>
@@ -331,6 +343,7 @@ export const GenericConceptsSidebar = (props: ConceptListSidebarProps) => {
                     <FilterCheckbox 
                         checkboxStyle="button" color="theme" data-bs-theme={subject} tag={subjectTag} conceptFilters={conceptFilters} 
                         setConceptFilters={setConceptFilters} tagCounts={tagCounts} dependentTags={descendentTags} incompatibleTags={descendentTags}
+                        partiallySelected={descendentTags.some(tag => conceptFilters.includes(tag))} // not quite isPartial; this is also true if all descendents selected
                         className={classNames({"icon-checkbox-off": !isSelected, "icon icon-checkbox-partial-alt": isSelected && isPartial, "icon-checkbox-selected": isSelected && !isPartial})}
                     />
                     {isSelected && <div className="ms-3 ps-2">
diff --git a/src/app/components/elements/markup/markdownRendering.ts b/src/app/components/elements/markup/markdownRendering.ts
index 9c2872a4f1..f343f2f156 100644
--- a/src/app/components/elements/markup/markdownRendering.ts
+++ b/src/app/components/elements/markup/markdownRendering.ts
@@ -6,8 +6,9 @@ MARKDOWN_RENDERER.renderer.rules.link_open = function(tokens: Remarkable.LinkOpe
     const href = utils.escapeHtml(tokens[idx].href || "");
     const localLink = href.startsWith(window.location.origin) || href.startsWith("/") || href.startsWith("mailto:") || href.startsWith("#");
     const title = tokens[idx].title ? (' title="' + utils.escapeHtml(utils.replaceEntities(tokens[idx].title || "")) + '"') : '';
+    const conceptIcon = "<i class=\"icon icon-lightbulb\"></i>";
     if (localLink) {
-        return `<a class="a-link" href="${href}" ${title}>`;
+        return `<a class="a-link" href="${href}" ${title}>${isPhy && href.includes("/concepts/") ? conceptIcon : ""}`;
     } else {
         return `<a class="a-link" href="${href}" ${title} target="_blank" rel="noopener nofollow">`;
     }
diff --git a/src/app/components/pages/Concept.tsx b/src/app/components/pages/Concept.tsx
index 3b0c6a15ce..0832f782cb 100644
--- a/src/app/components/pages/Concept.tsx
+++ b/src/app/components/pages/Concept.tsx
@@ -5,7 +5,7 @@ import {Col, Container, Row} from "reactstrap";
 import {ShowLoading} from "../handlers/ShowLoading";
 import {IsaacContent} from "../content/IsaacContent";
 import {IsaacConceptPageDTO} from "../../../IsaacApiTypes";
-import {DOCUMENT_TYPE, Subject, above, below, usePreviousPageContext, isAda, isPhy, useDeviceSize, useNavigation} from "../../services";
+import {DOCUMENT_TYPE, Subject, above, below, usePreviousPageContext, isAda, isPhy, useDeviceSize, useNavigation, siteSpecific} from "../../services";
 import {DocumentSubject, GameboardContext} from "../../../IsaacAppTypes";
 import {RelatedContent} from "../elements/RelatedContent";
 import {WithFigureNumbering} from "../elements/WithFigureNumbering";
@@ -60,9 +60,9 @@ export const Concept = withRouter(({match: {params}, location: {search}, concept
             <Container data-bs-theme={doc.subjectId ?? pageContext?.subject}>
                 <TitleAndBreadcrumb
                     intermediateCrumbs={navigation.breadcrumbHistory}
-                    currentPageTitle={doc.title as string}
+                    currentPageTitle={siteSpecific("Concept", doc.title as string)}
                     collectionType={navigation.collectionType}
-                    subTitle={doc.subtitle as string}
+                    subTitle={siteSpecific(undefined, doc.subtitle as string)}
                     preview={preview} 
                     icon={{type: "hex", subject: doc.subjectId as Subject, icon: "page-icon-concept"}}
                 />
@@ -73,14 +73,35 @@ export const Concept = withRouter(({match: {params}, location: {search}, concept
                 <SidebarLayout>
                     <ConceptSidebar relatedContent={doc.relatedContent} />
                     <MainContent>
-                        <EditContentButton doc={doc} />
+                        {isPhy && <>
+                            <div className="no-print d-flex align-items-center mt-3">
+                                <div>
+                                    <h2 className="text-theme-dark mb-4"><Markup encoding="latex">{doc.title as string}</Markup></h2>
+                                    {doc.subtitle && <h5 className="text-theme-dark">{doc.subtitle}</h5>}
+                                </div>
+                                <div className="d-flex gap-2 ms-auto">
+                                    <ShareLink linkUrl={`/concepts/${conceptId}${search || ""}`} />
+                                    <PrintButton />
+                                    <ReportButton pageId={conceptId}/>
+                                </div>
+                            </div>
 
-                        {below["sm"](deviceSize) && <ManageButtons />}
+                            <div className="section-divider"/>
 
-                        <div className="d-flex justify-content-end align-items-center me-sm-1 flex-grow-1">
-                            <UserContextPicker />
-                            {above["md"](deviceSize) && <ManageButtons />}
-                        </div>
+                            <div className="d-flex justify-content-end align-items-center me-sm-1 flex-grow-1">
+                                <EditContentButton doc={doc} />
+                                <UserContextPicker />
+                            </div>
+                        </>}
+
+                        {isAda && <>
+                            {below["sm"](deviceSize) && <ManageButtons />}
+
+                            <div className="d-flex justify-content-end align-items-center me-sm-1 flex-grow-1">
+                                <UserContextPicker />
+                                {above["md"](deviceSize) && <ManageButtons />}
+                            </div>
+                        </>}
 
                         <Row className="concept-content-container">
                             <Col className={classNames("py-4 concept-panel", {"mw-760": isAda})}>
@@ -102,8 +123,6 @@ export const Concept = withRouter(({match: {params}, location: {search}, concept
                                 {isAda && doc.relatedContent && <RelatedContent conceptId={conceptId} content={doc.relatedContent} parentPage={doc} />}
 
                                 <NavigationLinks navigation={navigation} />
-
-                                {isPhy && doc.relatedContent && <RelatedContent conceptId={conceptId} content={doc.relatedContent} parentPage={doc} />}
                             </Col>
                         </Row>
                     </MainContent>
diff --git a/src/app/components/pages/Concepts.tsx b/src/app/components/pages/Concepts.tsx
index 0cb450792f..9a42295633 100644
--- a/src/app/components/pages/Concepts.tsx
+++ b/src/app/components/pages/Concepts.tsx
@@ -29,7 +29,7 @@ export const Concepts = withRouter((props: RouteComponentProps) => {
     };
     
     const applicableTags = pageContext?.subject ? tags.getDirectDescendents(subjectToTagMap[pageContext.subject]) : tags.allFieldTags;
-    const tagCounts : Record<string, number> = applicableTags.reduce((acc, t) => ({...acc, [t.id]: concepts?.filter(c => c.tags?.includes(t.id)).length || 0}), {});
+    const tagCounts : Record<string, number> = [...applicableTags, ...(pageContext?.subject ? [tags.getById(pageContext?.subject as TAG_ID)] : [])].reduce((acc, t) => ({...acc, [t.id]: concepts?.filter(c => c.tags?.includes(t.id)).length || 0}), {});
 
     useEffect(() => {
         if (pageContext) {
@@ -105,7 +105,7 @@ export const Concepts = withRouter((props: RouteComponentProps) => {
                     : <GenericConceptsSidebar {...sidebarProps}/>
                 }
                 <MainContent>
-                    {isPhy && <div className="list-results-container p-2 mt-4">
+                    {isPhy && <div className="list-results-container p-2 my-4">
                         {shortcutAndFilteredSearchResults && <div className="p-2 py-3">
                             Showing <b>{shortcutAndFilteredSearchResults.length}</b> results
                         </div>}
diff --git a/src/scss/common/scroll-button.scss b/src/scss/common/scroll-button.scss
index b2c2975a13..be2d972e37 100644
--- a/src/scss/common/scroll-button.scss
+++ b/src/scss/common/scroll-button.scss
@@ -1,5 +1,6 @@
-button.btn.scroll-btn {
+button.scroll-btn.scroll-btn {
   position: fixed;
+  display: flex;
   opacity: 0;
   height: 45px;
   width: 45px;
@@ -15,8 +16,6 @@ button.btn.scroll-btn {
 
   &.is-sticky {
     opacity: 1;
-    display: flex;
-    // TODO: animate opacity on destruction
   }
   
   > img {
diff --git a/src/scss/cs/button.scss b/src/scss/cs/button.scss
index 71a864b992..398891db33 100644
--- a/src/scss/cs/button.scss
+++ b/src/scss/cs/button.scss
@@ -178,42 +178,6 @@
     position: relative;
     z-index: 2;
   }
-  .share-link {
-    z-index: 1;
-    top: 3px;
-    font-family: $secondary-font !important;
-    display: none;
-    position: absolute;
-    border: 1px solid gray;
-    transform: translate(calc(30px - 100%));
-    height: 42px;
-    width: 70%;
-
-    input {
-      z-index: 1;
-      padding-right: 40px;
-      padding-left: 10px;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-      user-select: all;
-      -webkit-user-select: all;
-      -moz-user-select: all;
-      -ms-user-select: all;
-      width: 100%;
-      height: 100%;
-    }
-
-    &.double-height {
-      height: auto;
-      padding-bottom: 10px;
-      background: #fff;
-      text-align: center;
-      input {
-        height: 42px;
-        margin-bottom: 8px;
-      }
-    }
-  }
 }
 
 .print-icon {
diff --git a/src/scss/cs/questions.scss b/src/scss/cs/questions.scss
index dfc4a52556..cff03f80d6 100644
--- a/src/scss/cs/questions.scss
+++ b/src/scss/cs/questions.scss
@@ -1,19 +1,18 @@
 @import "../common/questions";
 
-.question-actions-link-box {
-  $x-translation: 24px;
-  margin-left: -$x-translation;
-  float: left;
-  transform: translateX(7.5px + $x-translation);
-  height: 48px; // height of an icon button, should be a variable probably
+.action-buttons-popup-container {
+  position: absolute;
+  height: 100%;
+  right: 30px;
   display: flex;
   flex-direction: column;
   justify-content: center;
   border: 3px solid $secondary;
-  padding-left: 15px;
-  padding-right: 32px;
+  padding-left: 1.5rem;
+  padding-right: 2rem;
   border-top-left-radius: 50px;
   border-bottom-left-radius: 50px;
+  z-index: 2;
   .question-actions-link {
     margin-top: 2px; // Just to vertically center the links nicely
     color: $secondary;
@@ -22,6 +21,53 @@
       margin-right: 7px;
     }
   }
+
+  &:has(> input + a) {
+    flex-direction: row;
+
+    input {
+      width: auto;
+    }
+  }
+
+  a {
+    flex-grow: 1;
+    align-self: center;
+  }
+
+  input {
+    flex-grow: 1;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    user-select: all;
+    -webkit-user-select: all;
+    -moz-user-select: all;
+    -ms-user-select: all;
+    width: 100%;
+    height: 100%;
+    background: none;
+    border: none;
+    outline: none;
+  }
+
+  & ~ .duplicate-and-edit {
+    position: absolute;
+    right: 30px;
+    padding: 24px 24px 0;
+    top: 24px;
+    text-align: center;
+    background: white;
+    border: 1px solid $gray-118;
+    border-radius: 8px;
+    border-top-left-radius: 0;
+    font-size: small;
+    z-index: 1;
+  }
+
+  &.double-height {
+    background: #fff;
+    text-align: center;
+  }
 }
 
 // Validation response
diff --git a/src/scss/phy/button.scss b/src/scss/phy/button.scss
index 7e71f3ea05..e8d2802f23 100644
--- a/src/scss/phy/button.scss
+++ b/src/scss/phy/button.scss
@@ -376,43 +376,41 @@ a.btn {
   background-color: transparent;
 }
 
-.share-link-icon {
-
-  button {
+.action-buttons-popup-container {
+  position: absolute;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-evenly;
+  width: max-content;
+  height: 100%;
+  right: 50%;
+  align-items: center;
+  border: 1px solid $color-neutral-200;
+  border-radius: 0.5rem;
+  padding: 0 1.5rem 0 1rem;
+  z-index: 15;
+  background: white;
+
+  & ~ button {
     position: relative;
-    z-index: 12;
+    z-index: 15;
   }
 
-  .share-link {
-    z-index: 11;
-    font-family: $secondary-font !important;
-    display: none;
-    position: absolute;
-    padding: 4px 32px 4px 8px;
-    transform: translate(calc(25px - 100%), -3px);
-    border: 1px solid $color-neutral-300;
-    background: #fff;
-    height: 58px;
-    width: 70%;
-
-    input {
-      position: relative;
-      top: 9px;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-      user-select: all;
-      -webkit-user-select: all;
-      -moz-user-select: all;
-      -ms-user-select: all;
-      width: 100%;
-      padding-left: 2px;
-      border: none;
-      border-bottom: 2px solid $color-neutral-200;
-    }
+  input {
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    user-select: all;
+    -webkit-user-select: all;
+    -moz-user-select: all;
+    -ms-user-select: all;
+    width: 100%;
+    height: max-content;
+    border: none;
+    border-bottom: 2px solid $color-neutral-200;
+  }
 
-    &.double-height {
-      height: 118px;
-    }
+  &.double-height {
+    height: calc(100% + 38px);
   }
 }
 
diff --git a/src/scss/phy/questions.scss b/src/scss/phy/questions.scss
index 03c8ebe6d2..4db12a892a 100644
--- a/src/scss/phy/questions.scss
+++ b/src/scss/phy/questions.scss
@@ -1,33 +1,5 @@
 @import "../common/questions";
 
-.question-actions {
-  .question-actions-icon {
-    height: 3rem;
-    &:focus {
-      outline: none;
-    }
-  }
-  .question-actions-link-box {
-    float:right;
-    border: 1px solid gray;
-    height: 3.6rem;
-    border-right: none;
-    padding-right: 2.5rem;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    margin-right: -1.9rem;
-    background: white;
-
-    .question-actions-link {
-      padding-left: 3px;
-      padding-right: 3px;
-      margin-left: 1rem;
-      font-style: italic;
-    }
-  }
-}
-
 .question-panel > .content-chunk > .content-value,
 .question-component .question-content {
   font-family: $primary-font;
diff --git a/src/scss/phy/typography.scss b/src/scss/phy/typography.scss
index ee261b2647..f384a769f6 100644
--- a/src/scss/phy/typography.scss
+++ b/src/scss/phy/typography.scss
@@ -246,5 +246,16 @@ a {
     clear: left;
     text-decoration: none;
   }
+
+  &.a-link:has(> i.icon) {
+    display: inline-flex;
+    align-items: center;
+    font-weight: bold;
+    gap: 4px;
+    > i.icon {
+      order: 1;
+      margin-top: 1px;
+    }
+  }
 }