diff --git a/src/app/components/elements/ContentPropertyTags.tsx b/src/app/components/elements/ContentPropertyTags.tsx
index cdefe57329..5e31600b8c 100644
--- a/src/app/components/elements/ContentPropertyTags.tsx
+++ b/src/app/components/elements/ContentPropertyTags.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { isStaff, isTeacherOrAbove } from "../../services";
+import { isPhy, isStaff, isTeacherOrAbove } from "../../services";
 import { selectors, useAppSelector } from "../../state";
 import classNames from "classnames";
 import {v4 as uuid_v4} from "uuid";
@@ -16,7 +16,7 @@ export const QuestionPropertyTags = ({ supersededBy, tags, ...rest }: QuestionPr
     const accessibilitySettings = useAccessibilitySettings();
 
     return <div {...rest} className={classNames("d-flex gap-2 align-items-center", rest.className)}>
-        {accessibilitySettings?.SHOW_INACCESSIBLE_WARNING && getAccessibilityTags(tags)?.map(tag => {
+        {isPhy && accessibilitySettings?.SHOW_INACCESSIBLE_WARNING && getAccessibilityTags(tags)?.map(tag => {
             const id = `access-warn-${uuid_v4()}`; // must be globally unique. making refs in a loop was too painful.
             return <React.Fragment key={tag}>
                 <i className={`icon icon-md ${ACCESSIBILITY_WARNINGS[tag].icon} icon-access-visual icon-color-black z-2`} id={id} />
diff --git a/src/app/components/elements/GameboardBuilderRow.tsx b/src/app/components/elements/GameboardBuilderRow.tsx
index ffcf912c6c..ccd9099220 100644
--- a/src/app/components/elements/GameboardBuilderRow.tsx
+++ b/src/app/components/elements/GameboardBuilderRow.tsx
@@ -116,8 +116,7 @@ const GameboardBuilderRow = (
                             </button>
                             <Spacer />
                         </div>
-                        {isPhy && <QuestionPropertyTags className="my-1" supersededBy={question.supersededBy} tags={question.tags} />}
-
+                        <QuestionPropertyTags className="my-1" supersededBy={question.supersededBy} tags={question.tags} />
                         {question.subtitle && <>
                             <span className="small text-muted d-none d-sm-block">{question.subtitle}</span>
                         </>}
diff --git a/src/app/components/elements/LLMFreeTextQuestionIndicator.tsx b/src/app/components/elements/LLMFreeTextQuestionIndicator.tsx
index c01ec45239..de2e0ccc5d 100644
--- a/src/app/components/elements/LLMFreeTextQuestionIndicator.tsx
+++ b/src/app/components/elements/LLMFreeTextQuestionIndicator.tsx
@@ -3,7 +3,7 @@ import React from "react";
 import { isAda } from "../../services";
 
 export function LLMFreeTextQuestionIndicator({small, symbol, className}: {small?: boolean, symbol?: boolean, className?: string}) {
-    return <div className={classNames(className, "llm-indicator text-nowrap my-1", { small })}>
+    return <div className={classNames(className, "llm-indicator text-nowrap", {small, "my-1": !small})}>
         <span className={classNames("icon icon-ai", {"me-2": !symbol}, {"icon-md": isAda})}/> 
         {!symbol && `LLM marked question`}
     </div>;
diff --git a/src/app/components/elements/PageTitle.tsx b/src/app/components/elements/PageTitle.tsx
index 295866074c..3cc63b4c75 100644
--- a/src/app/components/elements/PageTitle.tsx
+++ b/src/app/components/elements/PageTitle.tsx
@@ -67,6 +67,8 @@ export interface TitleIconProps extends PhyHexIconProps {
     type: "img" | "hex" | "placeholder";
     height?: string;
     width?: string;
+    alt?: string;
+    label?: string;
 }
 
 export interface PageTitleProps {
@@ -97,7 +99,7 @@ export const PageTitle = ({currentPageTitle, displayTitleOverride, subTitle, dis
     return <h1 id="main-heading" tabIndex={-1} ref={headerRef} className={classNames("h-title h-secondary d-sm-flex", {"align-items-center py-2 mb-0": isPhy}, className)}>
         <div className="d-flex w-100" data-testid={"main-heading"}>
             {isPhy && icon && (
-                icon.type === "img" ? <img src={icon.icon} alt="" height={icon.height} width={icon.width} className="me-3"/> 
+                icon.type === "img" ? <img src={icon.icon} alt={icon.alt ?? ""} height={icon.height} width={icon.width} className="me-3"/> 
                     : icon.type === "hex" ? <PhyHexIcon icon={icon.icon} subject={icon.subject} style={{"height": icon.height, "width": icon.width}}/> 
                         : icon.type === "placeholder" ? <div style={{width: icon.width, height: icon.height}}/>
                             : undefined
diff --git a/src/app/components/elements/StageAndDifficultySummaryIcons.tsx b/src/app/components/elements/StageAndDifficultySummaryIcons.tsx
index 6f29d387b3..24f111a44f 100644
--- a/src/app/components/elements/StageAndDifficultySummaryIcons.tsx
+++ b/src/app/components/elements/StageAndDifficultySummaryIcons.tsx
@@ -30,7 +30,7 @@ export const StageAndDifficultySummaryIcons = (props: StageAndDifficultySummaryI
                 </span>
             )}
         </div>,
-        <div className={classNames(className, "d-sm-flex flex-wrap mt-1 align-items-baseline", {"justify-content-end": !stack})}>
+        <div className={classNames(className, "d-sm-flex flex-wrap align-items-baseline", {"justify-content-end": !stack})}>
             <div key={`${difficulties[0]}`} className={classNames("align-self-center d-flex align-items-center")}>
                 {difficulties.length > 0 && <>
                     <div className="hierarchy-tags text-center me-2">
diff --git a/src/app/components/elements/layout/SidebarLayout.tsx b/src/app/components/elements/layout/SidebarLayout.tsx
index 8cea0a9fa5..3af3c975fb 100644
--- a/src/app/components/elements/layout/SidebarLayout.tsx
+++ b/src/app/components/elements/layout/SidebarLayout.tsx
@@ -31,7 +31,6 @@ import { EventsPageQueryParams } from "../../pages/Events";
 import { StyledDropdown } from "../inputs/DropdownInput";
 import { CollapsibleList } from "../CollapsibleList";
 import { extendUrl } from "../../pages/subjectLandingPageComponents";
-import { getProgressIcon } from "../../pages/Gameboard";
 import { tags as tagsService } from "../../../services";
 import { Markup } from "../markup";
 import { History } from "history";
@@ -69,11 +68,18 @@ const QuestionLink = (props: React.HTMLAttributes<HTMLLIElement> & QuestionLinkP
     const audienceFields = filterAudienceViewsByProperties(determineAudienceViews(question.audience), AUDIENCE_DISPLAY_FIELDS);
     const link = isDefined(gameboardId) ? `/questions/${question.id}?board=${gameboardId}` : `/questions/${question.id}`;
 
+    const progressIcon = question.state && (question.state === CompletionState.ALL_CORRECT
+        ? "icon icon-raw icon-correct"
+        : [CompletionState.ALL_INCORRECT, CompletionState.ALL_ATTEMPTED].includes(question.state)
+            ? "icon icon-raw icon-attempted"
+            : question.state === CompletionState.IN_PROGRESS
+                ? "icon icon-raw icon-in-progress"
+                : "icon icon-raw icon-not-started");
+
     return <li key={question.id} {...rest} data-bs-theme={getThemeFromContextAndTags(subject, question.tags ?? [])}>
         <Link to={link} className="py-2">
             {(isDefined(gameboardId) || question.state !== CompletionState.NOT_ATTEMPTED) 
-                ? <i className={classNames(getProgressIcon(question.state).icon, {"ms-2": isDefined(gameboardId)})} style={{minWidth: "16px"}}/> 
-
+                ? <i className={classNames(progressIcon, {"ms-2": isDefined(gameboardId)})} style={{minWidth: "16px"}}/> 
                 : <i className="icon icon-question-thick"/>
             }
             <div className="d-flex flex-column w-100">
diff --git a/src/app/components/elements/list-groups/AbstractListViewItem.tsx b/src/app/components/elements/list-groups/AbstractListViewItem.tsx
index c01958ec69..701fefa5be 100644
--- a/src/app/components/elements/list-groups/AbstractListViewItem.tsx
+++ b/src/app/components/elements/list-groups/AbstractListViewItem.tsx
@@ -5,7 +5,7 @@ import { ViewingContext} from "../../../../IsaacAppTypes";
 import classNames from "classnames";
 import { Badge, Button, Col, ListGroupItem } from "reactstrap";
 import { CompletionState, GameboardDTO } from "../../../../IsaacApiTypes";
-import { below, isDefined, isPhy, isTeacherOrAbove, siteSpecific, Subject, useDeviceSize } from "../../../services";
+import { above, below, isAda, isDefined, isPhy, isTeacherOrAbove, siteSpecific, Subject, useDeviceSize } from "../../../services";
 import { PhyHexIcon } from "../svg/PhyHexIcon";
 import { TitleIconProps } from "../PageTitle";
 import { Markup } from "../markup";
@@ -161,9 +161,10 @@ export type AbstractListViewItemProps = {
     url?: string;
     state?: AbstractListViewItemState;
     className?: string;
+    hasCaret?: boolean;
 } & ALVIType & ALVILayout;
 
-export const AbstractListViewItem = ({title, icon, subject, subtitle, breadcrumb, tags, fullWidth, url, state, className, ...typedProps}: AbstractListViewItemProps) => { 
+export const AbstractListViewItem = ({title, icon, subject, subtitle, breadcrumb, tags, fullWidth, url, state, className, hasCaret, ...typedProps}: AbstractListViewItemProps) => { 
     const deviceSize = useDeviceSize();
     const user = useAppSelector(selectors.user.orNull);
 
@@ -176,19 +177,20 @@ export const AbstractListViewItem = ({title, icon, subject, subtitle, breadcrumb
     fullWidth = fullWidth || below["sm"](deviceSize) || (isItem && !(typedProps.status || typedProps.audienceViews));
     const cardBody = <div className="w-100 d-flex flex-row">
         <Col className={classNames("d-flex flex-grow-1", {"mt-3": isCard, "mb-3": isCard && !typedProps.linkTags?.length})}>
-            <div className="position-relative">
-                {icon && (
-                    icon.type === "img" ? <img src={icon.icon} alt="" width={icon.width} height={icon.height} className={classNames(icon.className, "me-3")} /> 
+            <div className={classNames("position-relative", {"question-progress-icon": isAda})}>
+                {icon && <div className="inner-progress-icon">
+                    {icon.type === "img" ? <img src={icon.icon} alt={icon.alt ?? ""} width={icon.width} height={icon.height} className={classNames(icon.className, {"me-3": isPhy})} /> 
                         : icon.type === "hex" ? <PhyHexIcon icon={icon.icon} subject={icon.subject} size={icon.size} className={icon.className} />
                             : icon.type === "placeholder" ? <div style={{width: icon.width, height: icon.height}} /> 
-                                : undefined
-                )}
-                {isItem && typedProps.status && typedProps.status === CompletionState.ALL_CORRECT && <div className="list-view-status-indicator">
+                                : undefined}
+                    {icon.label && above['sm'](deviceSize) && <div className="icon-title mt-1">{icon.label}</div>}
+                </div>}
+                {isPhy && isItem && typedProps.status && typedProps.status === CompletionState.ALL_CORRECT && <div className="list-view-status-indicator">
                     <StatusDisplay status={typedProps.status} showText={false} />
                 </div>}
                 {isGameboard && typedProps.board?.contents && <ItemCount count={typedProps.board.contents.length} />}
             </div>
-            <div className="align-content-center text-overflow-ellipsis pe-2">
+            <div className={classNames("align-content-center text-overflow-ellipsis", siteSpecific("pe-2", "py-3"))}>
                 <div className="d-flex text-wrap mt-n1">
                     {url && !isDisabled
                         ? (url.startsWith("http")
@@ -205,7 +207,7 @@ export const AbstractListViewItem = ({title, icon, subject, subtitle, breadcrumb
                     }
                     {isItem && <>
                         {typedProps.quizTag && <span className="quiz-level-1-tag ms-sm-2">{typedProps.quizTag}</span>}
-                        {isPhy && <QuestionPropertyTags className="ms-2 justify-self-end" supersededBy={typedProps.supersededBy} tags={tags} />}
+                        <QuestionPropertyTags className="ms-2 justify-self-end" supersededBy={typedProps.supersededBy} tags={tags} />
                     </>}
                 </div>
                 {subtitle && <div className="small text-muted text-wrap">
@@ -217,10 +219,10 @@ export const AbstractListViewItem = ({title, icon, subject, subtitle, breadcrumb
                 {isItem && fullWidth && typedProps.audienceViews && <div className="d-flex mt-1"> 
                     <StageAndDifficultySummaryIcons audienceViews={typedProps.audienceViews} stack/> 
                 </div>}
-                {tags?.includes("llm_question_page") && <div className="mt-2">
+                {tags?.includes("llm_question_page") && <div className={classNames("mt-1", {"mt-2": isPhy || !fullWidth})}>
                     <LLMFreeTextQuestionIndicator small />
                 </div>}
-                {isItem && fullWidth && typedProps.status && typedProps.status !== CompletionState.ALL_CORRECT &&
+                {isPhy && isItem && fullWidth && typedProps.status && typedProps.status !== CompletionState.ALL_CORRECT &&
                     <StatusDisplay status={typedProps.status} showText className="py-1" />
                 }
                 {isGameboard && fullWidth && isTeacherOrAbove(user) && <div className="d-flex pt-3">
@@ -236,9 +238,9 @@ export const AbstractListViewItem = ({title, icon, subject, subtitle, breadcrumb
         </Col>
         {!fullWidth &&
             <>
-                {isItem && typedProps.status && typedProps.status !== CompletionState.ALL_CORRECT && <StatusDisplay status={typedProps.status} showText className="ms-2 me-3" />}
+                {isPhy && isItem && typedProps.status && typedProps.status !== CompletionState.ALL_CORRECT && <StatusDisplay status={typedProps.status} showText className="ms-2 me-3" />}
                 {isItem && typedProps.audienceViews && <div className={classNames("d-none d-md-flex justify-content-end wf-13", {"list-view-border": typedProps.audienceViews.length > 0})}>
-                    <StageAndDifficultySummaryIcons audienceViews={typedProps.audienceViews} stack className="w-100"/> 
+                    <StageAndDifficultySummaryIcons audienceViews={typedProps.audienceViews} stack className={siteSpecific("w-100", "py-3 pe-3")}/> 
                 </div>}
                 {isGameboard && isTeacherOrAbove(user) && <Col md={6} className="d-none d-md-flex align-items-center justify-content-end">
                     <GameboardAssign board={typedProps.board} />
@@ -248,6 +250,9 @@ export const AbstractListViewItem = ({title, icon, subject, subtitle, breadcrumb
                 </Col>}
             </>
         }
+        {hasCaret && <div className="list-caret align-content-center" aria-hidden="true">
+            <i className="icon icon-chevron-right" aria-hidden="true"/>
+        </div>}
     </div>;
 
     return <ListGroupItem
diff --git a/src/app/components/elements/list-groups/ContentSummaryListGroupItem.tsx b/src/app/components/elements/list-groups/ContentSummaryListGroupItem.tsx
deleted file mode 100644
index c5a2178cf5..0000000000
--- a/src/app/components/elements/list-groups/ContentSummaryListGroupItem.tsx
+++ /dev/null
@@ -1,221 +0,0 @@
-import {CompletionState, ContentSummaryDTO} from "../../../../IsaacApiTypes";
-import {
-    AUDIENCE_DISPLAY_FIELDS,
-    below,
-    determineAudienceViews,
-    DOCUMENT_TYPE,
-    documentTypePathPrefix,
-    filterAudienceViewsByProperties,
-    generateQuestionTitle,
-    isAda,
-    isIntendedAudience,
-    isPhy,
-    notRelevantMessage,
-    SEARCH_RESULT_TYPE,
-    siteSpecific,
-    TAG_ID,
-    TAG_LEVEL,
-    tags,
-    useDeviceSize,
-    useUserViewingContext
-} from "../../../services";
-import {Link} from "react-router-dom";
-import React, {useRef} from "react";
-import {selectors, useAppSelector} from "../../../state";
-import {v4 as uuid_v4} from "uuid";
-import {StageAndDifficultySummaryIcons} from "../StageAndDifficultySummaryIcons";
-import {ShortcutResponse} from "../../../../IsaacAppTypes";
-import {Markup} from "../markup";
-import classNames from "classnames";
-import {ListGroup, ListGroupItem, UncontrolledTooltip} from "reactstrap";
-import { CSSModule } from "reactstrap/types/lib/utils";
-import { LLMFreeTextQuestionIndicator } from "../LLMFreeTextQuestionIndicator";
-import { QuestionPropertyTags } from "../ContentPropertyTags";
-
-export enum ContentTypeVisibility {
-    SHOWN, // default if not specified
-    ICON_ONLY,
-    FULLY_HIDDEN
-}
-
-export const ContentSummaryListGroupItem = ({item, search, showBreadcrumb, noCaret, contentTypeVisibility, ignoreIntendedAudience}: {
-    item: ShortcutResponse;
-    search?: string;
-    showBreadcrumb?: boolean;
-    noCaret?: boolean;
-    contentTypeVisibility?: ContentTypeVisibility;
-    ignoreIntendedAudience?: boolean;
-}) => {
-    const componentId = useRef(uuid_v4().slice(0, 4)).current;
-    const userContext = useUserViewingContext();
-    const user = useAppSelector(selectors.user.orNull);
-    const isContentsIntendedAudience = ignoreIntendedAudience || isIntendedAudience(item.audience, userContext, user);
-    const hash = item.hash;
-
-    let linkDestination, icon, audienceViews;
-    let itemClasses = "p-0 content-summary-link ";
-    itemClasses += isContentsIntendedAudience && !item.supersededBy ? "bg-transparent " : "de-emphasised ";
-
-    let stack = false;
-    let title = item.title;
-    let titleClasses = "content-summary-link-title flex-grow-1 ";
-    const itemSubject = tags.getSpecifiedTag(TAG_LEVEL.subject, item.tags as TAG_ID[]);
-    if (itemSubject) {
-        titleClasses += itemSubject.id;
-    }
-    const hierarchyTags = tags.getByIdsAsHierarchy((item.tags || []) as TAG_ID[])
-        .filter((_t, i) => !isAda || i !== 0); // CS always has Computer Science at the top level
-
-    let questionIconLabel, questionIcon;
-    switch(item.state) {
-        case CompletionState.IN_PROGRESS:
-            questionIconLabel = "In progress question icon";
-            questionIcon = <img src="/assets/cs/icons/status-in-progress.svg" alt={questionIconLabel} />;
-            break;
-        case CompletionState.ALL_CORRECT:
-            questionIconLabel = "Complete question icon";
-            questionIcon = <img src="/assets/cs/icons/status-correct.svg" alt={questionIconLabel} />;
-            break;
-        case CompletionState.ALL_INCORRECT:
-            questionIconLabel = "Incorrect question icon";
-            questionIcon = <img src="/assets/cs/icons/status-incorrect.svg" alt={questionIconLabel} />;
-            break;
-        case CompletionState.NOT_ATTEMPTED:
-        default:
-            questionIconLabel = "Not attempted question icon";
-            questionIcon = <img src="/assets/cs/icons/status-not-started.svg" alt={questionIconLabel} />;
-            break;
-    }
-
-    const deviceSize = useDeviceSize();
-
-    let typeLabel;
-
-    switch (item.type) {
-        case (SEARCH_RESULT_TYPE.SHORTCUT):
-            linkDestination = item.url;
-            icon = <img src={siteSpecific("/assets/phy/icons/concept.svg", "/assets/cs/icons/concept.svg")} alt="Shortcut icon"/>;
-            if (isAda) {
-                typeLabel = "Shortcut";
-            }
-            break;
-        case (DOCUMENT_TYPE.QUESTION):
-        case (DOCUMENT_TYPE.FAST_TRACK_QUESTION):
-            title = generateQuestionTitle(item);
-            if (isPhy) {
-                itemClasses += item.state === CompletionState.ALL_CORRECT ? "bg-success" : "text-info";
-            }
-            if (isAda) {
-                typeLabel = "Question";
-            }
-            linkDestination = `/${documentTypePathPrefix[DOCUMENT_TYPE.QUESTION]}/${item.id}`;
-            icon = questionIcon;
-            audienceViews = filterAudienceViewsByProperties(determineAudienceViews(item.audience), AUDIENCE_DISPLAY_FIELDS);
-            stack = below["md"](deviceSize);
-            break;
-        case (DOCUMENT_TYPE.CONCEPT):
-            linkDestination = `/${documentTypePathPrefix[DOCUMENT_TYPE.CONCEPT]}/${item.id}`;
-            icon = <img src={siteSpecific("/assets/phy/icons/concept.svg", "/assets/cs/icons/concept.svg")} alt="Concept page icon"/>;
-            if (isAda) {
-                typeLabel = "Concept";
-            }
-            break;
-        case (DOCUMENT_TYPE.EVENT):
-            linkDestination = `/${documentTypePathPrefix[DOCUMENT_TYPE.EVENT]}/${item.id}`;
-            icon = <img src={siteSpecific("/assets/common/icons/event-md.svg", "/assets/cs/icons/event.svg")} alt="Event page icon"/>;
-            typeLabel = "Event";
-            break;
-        case (DOCUMENT_TYPE.TOPIC_SUMMARY):
-            linkDestination = `/${documentTypePathPrefix[DOCUMENT_TYPE.TOPIC_SUMMARY]}/${item.id?.slice("topic_summary_".length)}`;
-            icon = <img src={siteSpecific("/assets/common/icons/work-md.svg", "/assets/cs/icons/topic.svg")} alt="Topic summary page icon"/>;
-            typeLabel = "Topic";
-            break;
-        case (DOCUMENT_TYPE.GENERIC):
-            linkDestination = `/${documentTypePathPrefix[DOCUMENT_TYPE.GENERIC]}/${item.id}`;
-            icon = <img src={siteSpecific("/assets/common/icons/info-md.svg", "/assets/cs/icons/info-filled.svg")} alt="Generic page icon"/>;
-            if (isAda) {
-                typeLabel = "Info";
-            }
-            break;
-        default:
-            // Do not render this item if there is no matching DOCUMENT_TYPE
-            console.error("Not able to display item as a ContentSummaryListGroupItem: ", item);
-            return null;
-    }
-
-    return <ListGroupItem className={classNames(itemClasses, {"p-3 d-md-flex flex-column justify-content-center content-summary-item": isPhy})} data-bs-theme={itemSubject?.id} key={linkDestination}>
-        <Link className={classNames({"position-relative justify-content-center": isAda})} to={{pathname: linkDestination, search: search, hash: hash}}>
-            {contentTypeVisibility !== ContentTypeVisibility.FULLY_HIDDEN && <span className={classNames({"content-summary-link-title align-self-center": isPhy, "question-progress-icon": isAda})}>
-                {siteSpecific(
-                    icon,
-                    <div className={"inner-progress-icon"}>
-                        {icon}
-                        {contentTypeVisibility !== ContentTypeVisibility.ICON_ONLY && <>
-                            <br/>
-                            <span className={"icon-title"}>{typeLabel}</span>
-                        </>}
-                    </div>
-                )}
-            </span>}
-            <div className={classNames("flex-fill", {"py-3 pe-3 align-content-center": isAda, "d-flex": isAda && !stack, "d-md-flex": isPhy})}>
-                <div className={"align-self-center " + titleClasses}>
-                    <div className="d-flex">
-                        <Markup encoding={"latex"} className={classNames( "link-title question-link-title", {"text-theme": isPhy})}>
-                            {title ?? ""}
-                        </Markup>
-                        {isPhy && typeLabel && <span className={"small text-muted align-self-end d-none d-md-inline ms-2 mb-1"}>
-                            ({typeLabel})
-                        </span>}
-                        <QuestionPropertyTags className="ms-2" supersededBy={item.supersededBy} tags={item.tags} />
-                    </div>
-                    {(isPhy && item.summary) && <div className="small text-muted d-none d-sm-block">
-                        {item.summary}
-                    </div>}
-                    {(!item.summary || deviceSize === "xs") && item.subtitle && <div className="small text-muted d-block">
-                        {item.subtitle}
-                    </div>}
-                    {showBreadcrumb && hierarchyTags && <div className={"hierarchy-tags d-none d-md-block"}>
-                        {hierarchyTags.map(tag => (<span className="hierarchy-tag" key={tag.id}>{tag.title}</span>))}
-                    </div>}
-                    {item.tags?.includes("llm_question_page") && <div className="ms-n1 my-2 mb-lg-0">
-                        <LLMFreeTextQuestionIndicator small />
-                    </div>}
-                </div>
-
-                {isPhy && !isContentsIntendedAudience && <div className="ms-auto me-3 d-flex align-items-center">
-                    <i id={`audience-help-${componentId}`} className="icon icon-info icon-color-grey" />
-                    <UncontrolledTooltip placement="bottom" target={`audience-help-${componentId}`}>
-                        {`This content has ${notRelevantMessage(userContext)}.`}
-                    </UncontrolledTooltip>
-                </div>}
-                <div>
-                    {audienceViews && audienceViews.length > 0 && <StageAndDifficultySummaryIcons audienceViews={audienceViews} stack={stack}/>}
-                </div>
-            </div>
-            {isAda && !noCaret && <div className="list-caret align-content-center" aria-hidden="true">
-                <i className="icon icon-chevron-right" aria-hidden="true"/>
-            </div>}
-        </Link>
-    </ListGroupItem>;
-};
-
-export const LinkToContentSummaryList = ({items, search, showBreadcrumb, noCaret, contentTypeVisibility, ignoreIntendedAudience, ...rest}: {
-    items: ContentSummaryDTO[];
-    search?: string;
-    showBreadcrumb?: boolean;
-    noCaret?: boolean;
-    contentTypeVisibility?: ContentTypeVisibility;
-    ignoreIntendedAudience?: boolean;
-    tag?: React.ElementType;
-    flush?: boolean;
-    className?: string;
-    cssModule?: CSSModule;
-}) => {
-    return <ListGroup {...rest} className={"link-list list-group-links mb-3" + rest.className}>
-        {items.map(item => <ContentSummaryListGroupItem
-            item={item} search={search} noCaret={noCaret}
-            key={item.type + "/" + item.id} showBreadcrumb={showBreadcrumb}
-            contentTypeVisibility={contentTypeVisibility} ignoreIntendedAudience={ignoreIntendedAudience}
-        />)}
-    </ListGroup>;
-};
diff --git a/src/app/components/elements/list-groups/ListView.tsx b/src/app/components/elements/list-groups/ListView.tsx
index f5d8d6f52f..b686ceaaaf 100644
--- a/src/app/components/elements/list-groups/ListView.tsx
+++ b/src/app/components/elements/list-groups/ListView.tsx
@@ -2,14 +2,23 @@ import React from "react";
 import { AbstractListViewItem, AbstractListViewItemProps } from "./AbstractListViewItem";
 import { ShortcutResponse, ViewingContext } from "../../../../IsaacAppTypes";
 import { determineAudienceViews } from "../../../services/userViewingContext";
-import { BOOK_DETAIL_ID_SEPARATOR, DOCUMENT_TYPE, documentTypePathPrefix, getThemeFromContextAndTags, ISAAC_BOOKS, PATHS, SEARCH_RESULT_TYPE, Subject, TAG_ID, TAG_LEVEL, tags } from "../../../services";
+import { BOOK_DETAIL_ID_SEPARATOR, DOCUMENT_TYPE, documentTypePathPrefix, getThemeFromContextAndTags, ISAAC_BOOKS, isAda, isPhy, PATHS, SEARCH_RESULT_TYPE, siteSpecific, Subject, TAG_ID, TAG_LEVEL, tags } from "../../../services";
 import { ListGroup, ListGroupItem, ListGroupProps } from "reactstrap";
 import { AffixButton } from "../AffixButton";
-import { ContentSummaryDTO, GameboardDTO, IsaacWildcard, QuizSummaryDTO } from "../../../../IsaacApiTypes";
+import { CompletionState, ContentSummaryDTO, GameboardDTO, IsaacWildcard, QuizSummaryDTO } from "../../../../IsaacApiTypes";
 import { Link } from "react-router-dom";
 import { selectors, showQuizSettingModal, useAppDispatch, useAppSelector } from "../../../state";
 import { UnionToIntersection } from "@reduxjs/toolkit/dist/tsHelpers";
 import classNames from "classnames";
+import { TitleIconProps } from "../PageTitle";
+
+function iconPath(name: string): string {
+    return `/assets/${siteSpecific("phy", "cs")}/icons/${name}.svg`;
+}
+
+function getBreadcrumb(tagIds: TAG_ID[] = []): string[] {
+    return tags.getByIdsAsHierarchy(tagIds).filter((_t, i) => !isAda || i !== 0).map(tag => tag.title);
+}
 
 type ListViewCardItemProps = Extract<AbstractListViewItemProps, {alviType: "item", alviLayout: "card"}>;
 
@@ -21,20 +30,32 @@ export const ListViewCardItem = (props: ListViewCardItemProps) => {
 
 interface QuestionListViewItemProps extends Extract<AbstractListViewItemProps, {alviType: "item", alviLayout: "list"}> {
     item: ContentSummaryDTO;
+    hideIconLabel?: boolean;
     linkedBoardId?: string;
 }
 
 export const QuestionListViewItem = (props : QuestionListViewItemProps) => {
-    const { item, linkedBoardId, ...rest } = props;
-    const breadcrumb = tags.getByIdsAsHierarchy((item.tags || []) as TAG_ID[]).map(tag => tag.title);
+    const { item, hideIconLabel, linkedBoardId, ...rest } = props;
+    const breadcrumb = (isPhy || props.hasCaret) ? getBreadcrumb(item.tags as TAG_ID[]) : undefined;
     const audienceViews: ViewingContext[] = determineAudienceViews(item.audience);
     const pageSubject = useAppSelector(selectors.pageContext.subject);
     const itemSubject = getThemeFromContextAndTags(pageSubject, tags.getSubjectTags((item.tags || []) as TAG_ID[]).map(t => t.id));
     const url = `/${documentTypePathPrefix[DOCUMENT_TYPE.QUESTION]}/${item.id}` + (linkedBoardId ? `?board=${linkedBoardId}` : "");
 
+    const icon: TitleIconProps = isPhy
+        ? {type: "hex", icon: "icon-question", size: "lg"}
+        : [CompletionState.IN_PROGRESS, CompletionState.ALL_ATTEMPTED].includes(item.state as CompletionState)
+            ? {type: "img", icon: iconPath("status-in-progress"), width: "24px", height: "24px", alt: "In progress question icon", label: "In progress"}
+            : item.state === CompletionState.ALL_CORRECT
+                ? {type: "img", icon: iconPath("status-correct"), width: "24px", height: "24px", alt: "Complete question icon", label: "Correct"}
+                : item.state === CompletionState.ALL_INCORRECT
+                    ? {type: "img", icon: iconPath("status-incorrect"), width: "24px", height: "24px", alt: "Incorrect question icon", label: "Incorrect"}
+                    : {type: "img", icon: iconPath("status-not-started"), width: "24px", height: "24px", alt: "Not attempted question icon", label: linkedBoardId ? "Not started" : "Question"};
+    if (hideIconLabel) icon.label = undefined;
+
     return <AbstractListViewItem
         {...rest}
-        icon={{type: "hex", icon: "icon-question", size: "lg"}}
+        icon={icon}
         title={item.title ?? ""}
         subject={itemSubject !== "neutral" ? itemSubject : undefined}
         tags={item.tags}
@@ -54,13 +75,41 @@ interface ConceptListViewItemProps extends Extract<AbstractListViewItemProps, {a
 export const ConceptListViewItem = ({item, ...rest}: ConceptListViewItemProps) => {
     const pageSubject = useAppSelector(selectors.pageContext.subject);
     const itemSubject = getThemeFromContextAndTags(pageSubject, tags.getSubjectTags((item.tags || []) as TAG_ID[]).map(t => t.id));
+    const breadcrumb = rest.hasCaret ? getBreadcrumb(item.tags as TAG_ID[]) : undefined;
     const url = `/${documentTypePathPrefix[DOCUMENT_TYPE.CONCEPT]}/${item.id}`;
 
+    const icon: TitleIconProps = isPhy
+        ? {type: "hex", icon: "icon-concept", size: "lg"}
+        : {type: "img", icon: iconPath("concept"), width: "32px", height: "32px", alt: "Concept page icon", label: "Concept"};
+
     return <AbstractListViewItem
-        icon={{type: "hex", icon: "icon-concept", size: "lg"}}
+        icon={icon}
         title={item.title ?? ""}
         subject={itemSubject !== "neutral" ? itemSubject : undefined}
         subtitle={item.summary ?? item.subtitle}
+        breadcrumb={breadcrumb}
+        url={url}
+        {...rest}
+    />;
+};
+
+interface TopicListViewItemProps extends Extract<AbstractListViewItemProps, {alviType: "item", alviLayout: "list"}> {
+    item: ContentSummaryDTO;
+}
+
+export const TopicListViewItem = ({item, ...rest}: TopicListViewItemProps) => {
+    const pageSubject = useAppSelector(selectors.pageContext.subject);
+    const itemSubject = getThemeFromContextAndTags(pageSubject, tags.getSubjectTags((item.tags || []) as TAG_ID[]).map(t => t.id));
+    const breadcrumb = rest.hasCaret ? getBreadcrumb(item.tags as TAG_ID[]) : undefined;
+    const url = `/${documentTypePathPrefix[DOCUMENT_TYPE.TOPIC_SUMMARY]}/${item.id}`;
+    const icon: TitleIconProps = {type: "img", icon: iconPath("topic"), width: "32px", height: "32px", alt: "Topic summary page icon", label: "Topic"};
+
+    return <AbstractListViewItem
+        icon={icon}
+        title={item.title ?? ""}
+        subject={itemSubject !== "neutral" ? itemSubject : undefined}
+        subtitle={item.subtitle}
+        breadcrumb={breadcrumb}
         url={url}
         {...rest}
     />;
@@ -152,7 +201,7 @@ interface QuickQuizListViewItemProps extends Extract<AbstractListViewItemProps,
 }
 
 export const QuickQuizListViewItem = ({item, ...rest}: QuickQuizListViewItemProps) => {
-    const breadcrumb = tags.getByIdsAsHierarchy((item.tags || []) as TAG_ID[]).map(tag => tag.title);
+    const breadcrumb = getBreadcrumb(item.tags as TAG_ID[]);
     const audienceViews: ViewingContext[] = determineAudienceViews(item.audience);
     const itemSubject = tags.getSpecifiedTag(TAG_LEVEL.subject, item.tags as TAG_ID[])?.id as Subject;
     const url = `${PATHS.GAMEBOARD}#${item.id}`;
@@ -176,13 +225,17 @@ interface GenericListViewItemProps extends Extract<AbstractListViewItemProps, {a
 }
 
 export const GenericListViewItem = ({item, ...rest}: GenericListViewItemProps) => {
-    const breadcrumb = tags.getByIdsAsHierarchy((item.tags || []) as TAG_ID[]).map(tag => tag.title);
+    const breadcrumb = getBreadcrumb(item.tags as TAG_ID[]);
     const audienceViews: ViewingContext[] = determineAudienceViews(item.audience);
     const itemSubject = tags.getSpecifiedTag(TAG_LEVEL.subject, item.tags as TAG_ID[])?.id as Subject;
     const url = `/${documentTypePathPrefix[DOCUMENT_TYPE.GENERIC]}/${item.id}`;
 
+    const icon: TitleIconProps = isPhy
+        ? {type: "hex", icon: "icon-info", size: "lg"}
+        : {type: "img", icon: iconPath("info-filled"), width: "32px", height: "32px", alt: "Generic page icon", label: "Info"};
+
     return <AbstractListViewItem
-        icon={{type: "hex", icon: "icon-info", size: "lg"}}
+        icon={icon}
         title={item.title ?? ""}
         subject={itemSubject}
         subtitle={item.summary ?? item.subtitle}  // summary more useful than subtitle, if present.
@@ -202,7 +255,7 @@ interface ShortcutListViewItemProps extends Extract<AbstractListViewItemProps, {
 }
 
 export const ShortcutListViewItem = ({item, linkedBoardId, ...rest}: ShortcutListViewItemProps) => {
-    const breadcrumb = tags.getByIdsAsHierarchy((item.tags || []) as TAG_ID[]).map(tag => tag.title);
+    const breadcrumb = getBreadcrumb(item.tags as TAG_ID[]);
     const audienceViews: ViewingContext[] = determineAudienceViews(item.audience);
     const itemSubject = tags.getSpecifiedTag(TAG_LEVEL.subject, item.tags as TAG_ID[])?.id as Subject;
     const url = `${item.url}${linkedBoardId ? `?board=${linkedBoardId}` : ""}${item.hash ? `#${item.hash}` : ""}`;
@@ -286,6 +339,7 @@ type ListViewItemProps =
 type ListViewProps<T, G extends "item" | "gameboard" | "quiz"> = {
     className?: string;
     fullWidth?: boolean;
+    hasCaret?: boolean;
 } & (
     {
         items: Required<T> extends Required<Extract<ListViewItemProps, {alviType: G}>['item']> ? T[] : never;
@@ -328,7 +382,7 @@ export const ListView = <T extends {type?: string}, G extends "item" | "gameboar
         return null;
     };
 
-    return <ListGroup className={`link-list list-group-links ${className}`}>
+    return <ListGroup className={classNames("link-list list-group-links", className)}>
         {(() => {
             switch (type) {
                 case "item":
@@ -343,6 +397,8 @@ export const ListView = <T extends {type?: string}, G extends "item" | "gameboar
                                 return <QuestionListViewItem key={index} {...rest} item={item} alviType={type} alviLayout="list"/>;
                             case (DOCUMENT_TYPE.CONCEPT):
                                 return <ConceptListViewItem key={index} {...rest} item={item} alviType={type} alviLayout="list"/>;
+                            case (DOCUMENT_TYPE.TOPIC_SUMMARY):
+                                return <TopicListViewItem key={index} {...rest} item={item} alviType={type} alviLayout="list"/>;
                             case (DOCUMENT_TYPE.EVENT):
                                 return <EventListViewItem key={index} {...rest} item={item} alviType={type} alviLayout="list"/>;
                             case DOCUMENT_TYPE.BOOK_INDEX_PAGE:
diff --git a/src/app/components/pages/AssignmentSchedule.tsx b/src/app/components/pages/AssignmentSchedule.tsx
index b8f91e788c..5ceb61d6a0 100644
--- a/src/app/components/pages/AssignmentSchedule.tsx
+++ b/src/app/components/pages/AssignmentSchedule.tsx
@@ -9,7 +9,7 @@ import {
     useLazyGetGameboardByIdQuery,
     useUnassignGameboardMutation
 } from "../../state";
-import {AssignmentDTO, GameboardDTO, RegisteredUserDTO, UserGroupDTO} from "../../../IsaacApiTypes";
+import {AssignmentDTO, ContentSummaryDTO, GameboardDTO, RegisteredUserDTO, UserGroupDTO} from "../../../IsaacApiTypes";
 import groupBy from "lodash/groupBy";
 import mapValues from "lodash/mapValues";
 import range from "lodash/range";
@@ -34,6 +34,7 @@ import {
 import {
     above,
     BoardLimit,
+    convertGameboardItemToContentSummary,
     determineGameboardStagesAndDifficulties,
     determineGameboardSubjects,
     difficultyShortLabelMap,
@@ -66,11 +67,11 @@ import {
 import {calculateHexagonProportions, Hexagon} from "../elements/svg/Hexagon";
 import classNames from "classnames";
 import {currentYear, DateInput} from "../elements/inputs/DateInput";
-import {GameboardViewerInner} from "./Gameboard";
 import {Link, useLocation} from "react-router-dom";
 import {ShowLoadingQuery} from "../handlers/ShowLoadingQuery";
 import {StyledSelect} from "../elements/inputs/StyledSelect";
 import {formatDate} from "../elements/DateString";
+import { ListView } from "../elements/list-groups/ListView";
 
 interface HeaderProps {
     assignmentsSetByMe?: AssignmentDTO[];
@@ -220,7 +221,6 @@ const AssignmentListEntry = ({assignment}: AssignmentListEntryProps) => {
 
     const boardStagesAndDifficulties = determineGameboardStagesAndDifficulties(gameboardToPreview);
 
-
     return <Card className={"my-1"}>
         <CardHeader className={"pt-2 pb-0 d-flex text-break"}>
             <h4><a target={"_blank"} rel={"noreferrer noopener"} href={gameboardLink}>{gameboardTitle}</a></h4>
@@ -275,11 +275,7 @@ const AssignmentListEntry = ({assignment}: AssignmentListEntryProps) => {
                             </Table>
                         </Col>}
                     </Row>
-                    {gameboardToPreview?.contents && gameboardToPreview.contents.length > 0 && <Card className={"mt-1"}>
-                        <CardHeader className={"text-end"}><Button color={"link"} onClick={() => setShowGameboardPreview(p => !p)}>{showGameboardPreview ? "Hide" : "Show"}{" "}{siteSpecific("question deck", "quiz")} preview</Button></CardHeader>
-                        {showGameboardPreview && gameboardToPreview && <GameboardViewerInner gameboard={gameboardToPreview}/>}
-                        {showGameboardPreview && <CardFooter className={"text-end"}><Button color={"link"} onClick={() => setShowGameboardPreview(p => !p)}>Hide {siteSpecific("question deck", "quiz")} preview</Button></CardFooter>}
-                    </Card>}
+                    {gameboardToPreview && <GameboardPreviewCard showGameboardPreview={showGameboardPreview} toggleGameboardPreview={() => setShowGameboardPreview(p => !p)} gameboardToPreview={gameboardToPreview} />}
                 </div>}
             </>}
         </CardBody>
@@ -382,6 +378,26 @@ const MonthAssignmentList = ({year, month, datesAndAssignments}: {year: number,
     </>;
 };
 
+const GameboardPreviewCard = ({showGameboardPreview, toggleGameboardPreview, gameboardToPreview}: {showGameboardPreview: boolean, toggleGameboardPreview: () => void, gameboardToPreview: GameboardDTO}) => {
+    const displayQuestions: ContentSummaryDTO[] = gameboardToPreview?.contents?.map(q => { return {...convertGameboardItemToContentSummary(q), state: q.state}; }) || [];
+
+    return displayQuestions.length > 0 && <Card className="my-1">
+        <CardHeader className="text-end">
+            <Button color={"link"} onClick={toggleGameboardPreview}>
+                {showGameboardPreview ? "Hide " : "Show "}{siteSpecific("question deck", "quiz")} preview
+            </Button>
+        </CardHeader>
+        {showGameboardPreview && <>
+            <ListView type="item" items={displayQuestions} linkedBoardId={gameboardToPreview.id} hasCaret={isAda}/>
+            <CardFooter className="text-end">
+                <Button color={"link"} onClick={toggleGameboardPreview}>
+                    Hide {siteSpecific("question deck", "quiz")} preview
+                </Button>
+            </CardFooter>
+        </>}
+    </Card>;
+};
+
 interface AssignmentModalProps {
     user: RegisteredUserDTO;
     showSetAssignmentUI: boolean;
@@ -394,10 +410,7 @@ const AssignmentModal = ({user, showSetAssignmentUI, toggleSetAssignmentUI, assi
     const [dueDate, setDueDate] = useState<Date>();
     const [scheduledStartDate, setScheduledStartDate] = useState<Date>();
     const [assignmentNotes, setAssignmentNotes] = useState<string>();
-
     const [showGameboardPreview, setShowGameboardPreview] = useState<boolean>(false);
-    const toggleGameboardPreview = () => setShowGameboardPreview(o => !o);
-
     const [selectedGameboard, setSelectedGameboard] = useState<Item<string>[]>();
 
     const {boardsById, groups, gameboards, boardIdsByGroupId} = useContext(AssignmentScheduleContext);
@@ -469,7 +482,7 @@ const AssignmentModal = ({user, showSetAssignmentUI, toggleSetAssignmentUI, assi
             }
         }
     }
-
+    
     return <>
         <h3>
             Set new assignment{assignmentToCopy ? " (from existing)" : ""}
@@ -491,11 +504,7 @@ const AssignmentModal = ({user, showSetAssignmentUI, toggleSetAssignmentUI, assi
             {alreadyAssignedGroupNames && alreadyAssignedGroupNames.length > 0 && <Alert color={"warning"} className={"my-1"}>
                 This {siteSpecific("question deck", "quiz")} is already assigned to group{alreadyAssignedGroupNames.length > 1 ? "s" : ""}: {alreadyAssignedGroupNames.join(", ")}. You must delete the previous assignment{alreadyAssignedGroupNames.length > 1 ? "s" : ""} to set it again.
             </Alert>}
-            {gameboardToPreview?.contents && <Card className={"my-1"} >
-                <CardHeader className={"text-end"}><Button color={"link"} onClick={toggleGameboardPreview}>{showGameboardPreview ? "Hide" : "Show"}{" "}{siteSpecific("question deck", "quiz")} preview</Button></CardHeader>
-                {showGameboardPreview && gameboardToPreview && <GameboardViewerInner gameboard={gameboardToPreview}/>}
-                {showGameboardPreview && <CardFooter className={"text-end"}><Button color={"link"} onClick={toggleGameboardPreview}>Hide {siteSpecific("question deck", "quiz")} preview</Button></CardFooter>}
-            </Card>}
+            {gameboardToPreview && <GameboardPreviewCard showGameboardPreview={showGameboardPreview} toggleGameboardPreview={() => setShowGameboardPreview(p => !p)} gameboardToPreview={gameboardToPreview} />} 
         </Label>
         <Label className="w-100 pb-2">Schedule an assignment start date <span className="text-muted"> (optional)</span>
             <DateInput value={scheduledStartDate} placeholder="Select your scheduled start date..." yearRange={yearRange}
diff --git a/src/app/components/pages/Concepts.tsx b/src/app/components/pages/Concepts.tsx
index 0ba1c6efc2..d156283291 100644
--- a/src/app/components/pages/Concepts.tsx
+++ b/src/app/components/pages/Concepts.tsx
@@ -7,7 +7,6 @@ import {getFilteredStageOptions, isPhy, isRelevantToPageContext, matchesAllWords
 import {generateSubjectLandingPageCrumbFromContext, TitleAndBreadcrumb} from "../elements/TitleAndBreadcrumb";
 import {ShortcutResponse, Tag} from "../../../IsaacAppTypes";
 import { ListView } from "../elements/list-groups/ListView";
-import { ContentTypeVisibility, LinkToContentSummaryList } from "../elements/list-groups/ContentSummaryListGroupItem";
 import { SubjectSpecificConceptListSidebar, MainContent, SidebarLayout, GenericConceptsSidebar } from "../elements/layout/SidebarLayout";
 import { getHumanContext, isFullyDefinedContext, useUrlPageTheme } from "../../services/pageContext";
 import { useListConceptsQuery } from "../../state/slices/api/conceptsApi";
@@ -180,12 +179,7 @@ export const Concepts = withRouter((props: RouteComponentProps) => {
                                     </ResultsListHeader>}
 
                                     {shortcutAndFilteredSearchResults.length
-                                        ? isPhy
-                                            ? <ListView type="item" items={shortcutAndFilteredSearchResults}/>
-                                            : <LinkToContentSummaryList 
-                                                items={shortcutAndFilteredSearchResults} showBreadcrumb={false} 
-                                                contentTypeVisibility={ContentTypeVisibility.ICON_ONLY}
-                                            />
+                                        ? <ListView type="item" items={shortcutAndFilteredSearchResults}/>
                                         : <em>No results found</em>
                                     }
                                 </>;
diff --git a/src/app/components/pages/Gameboard.tsx b/src/app/components/pages/Gameboard.tsx
index df9672808c..f2ce8a2102 100644
--- a/src/app/components/pages/Gameboard.tsx
+++ b/src/app/components/pages/Gameboard.tsx
@@ -1,6 +1,5 @@
 import React, {useEffect} from "react";
 import {
-    AppState,
     logAction,
     selectors,
     setAssignBoardPath,
@@ -10,18 +9,12 @@ import {
     useGetMyAssignmentsQuery
 } from "../../state";
 import {Link, withRouter} from "react-router-dom";
-import {Button, Col, Container, ListGroup, ListGroupItem, Row} from "reactstrap";
-import {CompletionState, ContentSummaryDTO, GameboardDTO, GameboardItem, IsaacWildcard} from "../../../IsaacApiTypes";
+import {Button, Col, Container, Row} from "reactstrap";
+import {ContentSummaryDTO} from "../../../IsaacApiTypes";
 import {TitleAndBreadcrumb} from "../elements/TitleAndBreadcrumb";
 import {
-    AUDIENCE_DISPLAY_FIELDS,
-    below,
     convertGameboardItemToContentSummary,
-    determineAudienceViews,
-    filterAudienceViewsByProperties,
-    generateQuestionTitle,
     isAda,
-    isAppLink,
     isDefined,
     isFound,
     isNotPartiallyLoggedIn,
@@ -31,14 +24,8 @@ import {
     SEARCH_RESULT_TYPE,
     showWildcard,
     siteSpecific,
-    TAG_ID,
-    tags,
-    useDeviceSize,
-    useUserViewingContext
 } from "../../services";
 import {Redirect} from "react-router";
-import {StageAndDifficultySummaryIcons} from "../elements/StageAndDifficultySummaryIcons";
-import {Markup} from "../elements/markup";
 import classNames from "classnames";
 import {skipToken} from "@reduxjs/toolkit/query";
 import {ShowLoadingQuery} from "../handlers/ShowLoadingQuery";
@@ -46,125 +33,6 @@ import {GameboardSidebar, MainContent, SidebarLayout} from "../elements/layout/S
 import {PageMetadata} from "../elements/PageMetadata";
 import {ListView} from "../elements/list-groups/ListView";
 
-export const getProgressIcon = (state?: CompletionState) => {
-    const itemClasses = classNames("content-summary-link text-info", {"p-3": isPhy, "p-0": isAda});
-    let backgroundColor = "white";
-    let icon = siteSpecific("icon icon-raw icon-not-started", "/assets/cs/icons/status-not-started.svg");
-    let message = siteSpecific("", "Not started");
-    switch (state) {
-        case CompletionState.ALL_CORRECT:
-            if (isPhy) {
-                backgroundColor = "correct";
-            }
-            message = "Correct";
-            icon = siteSpecific("icon icon-raw icon-correct", "/assets/cs/icons/status-correct.svg");
-            break;
-        case CompletionState.ALL_INCORRECT:
-            if (isAda) {
-                backgroundColor = "incorrect";
-                message = "Incorrect";
-                icon = "/assets/cs/icons/status-incorrect.svg";
-                break;
-            }
-            // fallthrough if isPhy
-        case CompletionState.ALL_ATTEMPTED:
-            if (isPhy) {
-                message = "All attempted (some errors)";
-                icon = "icon icon-raw icon-attempted";
-                break;
-            }
-            // fallthrough if isAda
-        case CompletionState.IN_PROGRESS:
-            message = "In progress";
-            icon = siteSpecific("icon icon-raw icon-in-progress", "/assets/cs/icons/status-in-progress.svg");
-            break;
-    }
-    return {itemClasses: classNames(itemClasses, `bg-${backgroundColor}`), icon, message};
-};
-
-const GameboardItemComponent = ({gameboard, question}: {gameboard: GameboardDTO, question: GameboardItem}) => {
-    const {itemClasses, icon, message} = getProgressIcon(question.state);
-
-    const questionTags = tags.getByIdsAsHierarchy((question.tags || []) as TAG_ID[])
-        .filter((t, i) => !isAda || i !== 0); // CS always has Computer Science at the top level
-
-    const questionViewingContexts = filterAudienceViewsByProperties(determineAudienceViews(question.audience, question.creationContext), AUDIENCE_DISPLAY_FIELDS);
-    const userViewingContext = useUserViewingContext();
-    const deviceSize = useDeviceSize();
-    const currentUser = useAppSelector((state: AppState) => state?.user?.loggedIn && state.user || null);
-    const uniqueStage = questionViewingContexts.find(context => userViewingContext.contexts.map(c => c.stage).includes(context.stage));
-    return <ListGroupItem key={question.id} className={itemClasses}>
-        <Link to={`/questions/${question.id}?board=${gameboard.id}`} className={classNames("position-relative", {"align-items-center": isPhy, "justify-content-center": isAda})}>
-            <span className={"question-progress-icon"}>
-                {siteSpecific(
-                    <div className={`${icon} me-3`}/>,
-                    <div className={"inner-progress-icon"}>
-                        <img src={icon} alt="" /><br/>
-                        <span className={"icon-title d-none d-sm-block"}>{message}</span>
-                    </div>
-                )}
-            </span>
-            <div className={classNames({"d-flex py-3 pe-3 flex-column flex-md-row flex-fill": isAda, "d-flex flex-column flex-sm-row align-items-sm-center w-100": isPhy})}>
-                <div>
-                    <Markup encoding={"latex"} className={classNames( "link-title question-link-title", {"text-theme me-2": isPhy})}>
-                        {generateQuestionTitle(question)}
-                    </Markup>
-                    {isPhy && question.subtitle && <div className="small text-muted d-none d-sm-block">
-                        {question.subtitle}
-                    </div>}
-                    {questionTags && <div className={classNames("hierarchy-tags", {"mt-2": isAda})}>
-                        {questionTags.map(tag => (<span className="hierarchy-tag" key={tag.id}>{tag.title}</span>))}
-                    </div>}
-                </div>
-                {question.audience && <span className="ms-sm-auto w-max-content">
-                    <StageAndDifficultySummaryIcons stack={isAda && below['sm'](deviceSize)} audienceViews={
-                        isPhy && !isTutorOrAbove(currentUser) && uniqueStage ? [uniqueStage] : questionViewingContexts
-                    } />
-                </span>}
-            </div>
-            {isAda && <div className="list-caret align-content-center" aria-hidden="true">
-                <i className="icon icon-chevron-right" aria-hidden="true"/>
-            </div>}
-        </Link>
-    </ListGroupItem>;
-};
-
-export const Wildcard = ({gameboard, wildcard}: {gameboard: GameboardDTO, wildcard: IsaacWildcard}) => {
-    if (!wildcard.url) return null;
-    const link = isAppLink(wildcard.url) ? `${wildcard.url}?board=${gameboard.id}` : wildcard.url;
-
-    return <ListGroupItem key={wildcard.id} className={"content-summary-link text-info bg-wildcard p-3"}>
-        <a href={link} className="align-items-center">
-            <i className="icon icon-concept me-3" />
-            <div className={"flex-grow-1"}>
-                <span className="link-title question-link-title me-2">{wildcard.title}</span>
-                {wildcard.description && <div className="hierarchy-tags">
-                    <span className="hierarchy-tag">{wildcard.description}</span>
-                </div>}
-            </div>
-        </a>
-    </ListGroupItem>;
-};
-
-export const GameboardViewerInner = ({gameboard}: {gameboard: GameboardDTO}) => {
-    return <ListGroup className="link-list list-group-links list-gameboard">
-        {gameboard?.wildCard && showWildcard(gameboard) &&
-            <Wildcard gameboard={gameboard} wildcard={gameboard.wildCard} />
-        }
-        {gameboard?.contents && gameboard.contents.map(q =>
-            <GameboardItemComponent key={q.id} gameboard={gameboard} question={q} />
-        )}
-    </ListGroup>;
-};
-
-export const GameboardViewer = ({gameboard, className}: {gameboard: GameboardDTO; className?: string}) => (
-    <Row className={className}>
-        <div className={isAda ? "col col-lg-10 offset-lg-1" : ""}>
-            <GameboardViewerInner gameboard={gameboard}/>
-        </div>
-    </Row>
-);
-
 export const Gameboard = withRouter(({ location }) => {
     const dispatch = useAppDispatch();
     const gameboardId = location.hash ? location.hash.slice(1) : null;
@@ -214,10 +82,8 @@ export const Gameboard = withRouter(({ location }) => {
                             <GameboardSidebar gameboard={gameboard} assignments={thisGameboardAssignments} hideButton />
                             <MainContent>
                                 <PageMetadata title={gameboard.title} showSidebarButton sidebarButtonText="Details"/>
-                                {isPhy
-                                    ? <ListView type="item" items={displayQuestions} linkedBoardId={gameboardId} className="mt-3"/>
-                                    : <GameboardViewer gameboard={gameboard} className="mt-4 mt-lg-7" />
-                                }
+                                <ListView type="item" items={displayQuestions} linkedBoardId={gameboardId} className={classNames("mt-3", {"col col-lg-10 offset-lg-1": isAda})} hasCaret={isAda}/>
+                                {/*  <GameboardViewer gameboard={gameboard} className="mt-4 mt-lg-7" /> */}
                                 {user && isTutorOrAbove(user)
                                     ? <Row>
                                         <Col xs={{size: 10, offset: 1}} sm={{size: 8, offset: 2}} md={{size: 6, offset: 0}} lg={{size: 4, offset: 2}} xl={{size: 3, offset: 2}} className="mt-4">
diff --git a/src/app/components/pages/MyProgress.tsx b/src/app/components/pages/MyProgress.tsx
index d40fcd88e3..a7de0e5233 100644
--- a/src/app/components/pages/MyProgress.tsx
+++ b/src/app/components/pages/MyProgress.tsx
@@ -30,7 +30,6 @@ import { Tabs } from "../elements/Tabs";
 import { FlushableRef, QuestionProgressCharts } from "../elements/views/QuestionProgressCharts";
 import { ActivityGraph } from "../elements/views/ActivityGraph";
 import { ProgressBar } from "../elements/views/ProgressBar";
-import { ContentTypeVisibility, LinkToContentSummaryList } from "../elements/list-groups/ContentSummaryListGroupItem";
 import { ListView } from '../elements/list-groups/ListView';
 
 const siteSpecificStats: {questionCountByBookTag: {[bookTag in keyof typeof ISAAC_BOOKS_BY_TAG]?: number}, questionTypeStatsList: string[]} = siteSpecific(
@@ -187,23 +186,11 @@ const MyProgress = withRouter((props: MyProgressProps) => {
                     <Row id="progress-questions">
                         {progress?.mostRecentQuestions && progress?.mostRecentQuestions.length > 0 && <Col md={12} lg={6} className="mt-4">
                             <h4>Most recently answered questions</h4>
-                            {isPhy ?
-                                <ListView type="item" items={progress.mostRecentQuestions} fullWidth={below["lg"](screenSize)}/> :
-                                <LinkToContentSummaryList
-                                    items={progress.mostRecentQuestions}
-                                    contentTypeVisibility={ContentTypeVisibility.FULLY_HIDDEN}
-                                    ignoreIntendedAudience
-                                />}
+                            <ListView type="item" items={progress.mostRecentQuestions} fullWidth={below["lg"](screenSize)} className="bordered"/>
                         </Col>}
                         {progress?.oldestIncompleteQuestions && progress?.oldestIncompleteQuestions.length > 0 && <Col md={12} lg={6} className="mt-4">
                             <h4>Oldest unsolved questions</h4>
-                            {isPhy ?
-                                <ListView type="item" items={progress.oldestIncompleteQuestions} fullWidth={below["lg"](screenSize)}/> :
-                                <LinkToContentSummaryList
-                                    items={progress.oldestIncompleteQuestions}
-                                    contentTypeVisibility={ContentTypeVisibility.FULLY_HIDDEN}
-                                    ignoreIntendedAudience
-                                />}
+                            <ListView type="item" items={progress.oldestIncompleteQuestions} fullWidth={below["lg"](screenSize)} className="bordered"/>
                         </Col>}
                     </Row>
                 </div>
diff --git a/src/app/components/pages/QuestionFinder.tsx b/src/app/components/pages/QuestionFinder.tsx
index 55133ffd71..bb49e7e9c6 100644
--- a/src/app/components/pages/QuestionFinder.tsx
+++ b/src/app/components/pages/QuestionFinder.tsx
@@ -47,7 +47,6 @@ import {ChoiceTree, getChoiceTreeLeaves, QuestionFinderFilterPanel} from "../ele
 import {TierID} from "../elements/svg/HierarchyFilter";
 import { MainContent, QuestionFinderSidebar, SidebarLayout } from "../elements/layout/SidebarLayout";
 import { ListView } from "../elements/list-groups/ListView";
-import { ContentTypeVisibility, LinkToContentSummaryList } from "../elements/list-groups/ContentSummaryListGroupItem";
 import { PageFragment } from "../elements/PageFragment";
 import { RenderNothing } from "../elements/RenderNothing";
 import { processTagHierarchy, pruneTreeNode } from "../../services/questionHierarchy";
@@ -575,20 +574,12 @@ export const QuestionFinder = withRouter(({location}: RouteComponentProps) => {
                             <CardBody className={classNames({"border-0": isPhy, "p-0": displayQuestions?.length, "m-0": isAda && displayQuestions?.length})}>
                                 <ShowLoading until={displayQuestions} placeholder={loadingPlaceholder}>
                                     {displayQuestions?.length
-                                        ? isPhy
-                                            ? <ListView type="item" items={displayQuestions} />
-                                            : <LinkToContentSummaryList
-                                                items={displayQuestions} className="m-0"
-                                                contentTypeVisibility={ContentTypeVisibility.ICON_ONLY}
-                                                ignoreIntendedAudience noCaret
-                                            />
-                                        : isAda && <>{
-                                            isCurrentSearchEmpty
-                                                ? <span>Please select and apply filters.</span>
-                                                : filteringByStatus 
-                                                    ? <span>Could not load any results matching the requested filters.</span>
-                                                    : <span>No results match the requested filters.</span>
-                                        }</>
+                                        ? <ListView type="item" items={displayQuestions} hideIconLabel />
+                                        : isAda && isCurrentSearchEmpty
+                                            ? <span>Please select and apply filters.</span>
+                                            : filteringByStatus 
+                                                ? <span>Could not load any results matching the requested filters.</span>
+                                                : <span>No results match the requested filters.</span>
                                     }
                                 </ShowLoading>
                             </CardBody>
diff --git a/src/app/components/pages/Search.tsx b/src/app/components/pages/Search.tsx
index 39ee53d9b7..9b70b5de45 100644
--- a/src/app/components/pages/Search.tsx
+++ b/src/app/components/pages/Search.tsx
@@ -15,7 +15,6 @@ import {
     DOCUMENT_TYPE,
     documentDescription,
     isAda,
-    isPhy,
     parseLocationSearch,
     pushSearchToHistory,
     SEARCH_RESULT_TYPE,
@@ -34,7 +33,6 @@ import classNames from "classnames";
 import {SearchPageSearch} from "../elements/SearchInputs";
 import {StyledSelect} from "../elements/inputs/StyledSelect";
 import { ListView } from "../elements/list-groups/ListView";
-import { ContentTypeVisibility, LinkToContentSummaryList } from "../elements/list-groups/ContentSummaryListGroupItem";
 
 interface Item<T> {
     value: T;
@@ -151,13 +149,8 @@ export const Search = withRouter((props: RouteComponentProps) => {
                 </CardHeader>
                 {urlQuery != "" && <CardBody className={classNames({"p-0 m-0": isAda && gotResults})}>
                     <ShowLoading until={shortcutAndFilteredSearchResults}>
-                        {gotResults ?
-                            isPhy ? 
-                                <ListView type="item" items={shortcutAndFilteredSearchResults}/> :
-                                <LinkToContentSummaryList 
-                                    items={shortcutAndFilteredSearchResults} showBreadcrumb={true}
-                                    contentTypeVisibility={ContentTypeVisibility.SHOWN}   
-                                />
+                        {gotResults
+                            ? <ListView type="item" items={shortcutAndFilteredSearchResults} hasCaret={isAda}/>
                             : <em>No results found</em>}
                     </ShowLoading>
                 </CardBody>}
diff --git a/src/scss/common/cards.scss b/src/scss/common/cards.scss
index 943fb44958..b7ff3916b2 100644
--- a/src/scss/common/cards.scss
+++ b/src/scss/common/cards.scss
@@ -198,3 +198,14 @@
       flex-direction: column;
   }
 }
+
+.card {
+  .card-header {
+    // If the card body is empty, remove the header's bottom-styling
+    &:not(:has(~ :not(.d-none))), &:only-child, .no-body {
+      border-bottom-left-radius: inherit;
+      border-bottom-right-radius: inherit;
+      border-bottom: none;
+    }
+  }
+}
diff --git a/src/scss/cs/button.scss b/src/scss/cs/button.scss
index 98b520a04f..e0952e84ce 100644
--- a/src/scss/cs/button.scss
+++ b/src/scss/cs/button.scss
@@ -290,7 +290,7 @@
   color: $cs-jet;
 }
 
-a:not(.btn):not(.nav-link) {
+a:not(.btn):not(.nav-link):not(.question-link-title) {
   // FIXME this breaks tables with links
   &:not(.link-light):not(.footer-link):not(.a-link):not(.breadcrumb-link) {
     color: $cs-jet;
diff --git a/src/scss/cs/cards.scss b/src/scss/cs/cards.scss
index 12560f3449..e77d7e7697 100644
--- a/src/scss/cs/cards.scss
+++ b/src/scss/cs/cards.scss
@@ -191,10 +191,6 @@ a.icon-card, a.cs-card {
   .card-header {
     border-top-left-radius: inherit;
     border-top-right-radius: inherit;
-
-    &:has(+ div.d-none) {
-      border-radius: inherit;
-    }
   }
 }
 
diff --git a/src/scss/cs/list-groups.scss b/src/scss/cs/list-groups.scss
index ca28619c12..0c511cabea 100644
--- a/src/scss/cs/list-groups.scss
+++ b/src/scss/cs/list-groups.scss
@@ -3,17 +3,11 @@
 .list-group-links {
   border: 0;
   border-radius: 0;
-  .list-group-item {
-    .link-title {
-      @extend .font-size-1-25;
-    }
-    .question-link-title {
-      @extend .fw-semi-bold;
-    }
-    border-color: $cs-list-outline-gray;
-    border-left: 0;
-    border-right: 0;
+
+  &.bordered {
+    border: 1px solid $cs-list-outline-gray;
   }
+
   .list-caret {
     position: relative;
     text-align: center;
@@ -22,16 +16,36 @@
     border-left: 1px solid $cs-list-outline-gray;
   }
 
-  li {
+  li.list-group-item {
+    border-color: $cs-list-outline-gray;
+    border-left: 0;
+    border-right: 0;
     border-bottom: 1px solid $gray-107;
+    padding: 0;
     &:last-of-type {
       border-width: 0;
     }
 
-    a {
+    .question-link-title {
+      @extend .fw-semi-bold;
+    }
+
+    .alvi-title {
+      @extend .font-size-1-25;
+
+      &:is(a)::before {
+        content: '';
+        position: absolute;
+        inset: 0;
+        z-index: 1;
+        cursor: pointer;
+      }
+    }
+
+    > div {
       font-size: 1.25rem;
 
-      > span:first-of-type {
+      .question-progress-icon {
         display: inline-block;
         border-right: 1px solid $gray-107;
         margin-right: 1rem;
diff --git a/src/test/pages/QuestionFinder.test.tsx b/src/test/pages/QuestionFinder.test.tsx
index 580bbd9053..81d525a706 100644
--- a/src/test/pages/QuestionFinder.test.tsx
+++ b/src/test/pages/QuestionFinder.test.tsx
@@ -385,7 +385,7 @@ type RenderParameters = {
 
 const findQuestions = () => screen.findByTestId("question-finder-results").then(e => within(e).findAllByRole('listitem'));
 
-const getQuestionText = (q: HTMLElement) => q.querySelector(isPhy ? '.question-link-title > span' : 'span.question-link-title')?.textContent;
+const getQuestionText = (q: HTMLElement) => q.querySelector('.question-link-title > span')?.textContent;
 
 const expectQuestions = (expectedQuestions: IsaacQuestionPageDTO[]) => waitFor(async () => {
     const found = await findQuestions();
diff --git a/src/test/pages/__image_snapshots__/ada/Question finder page should have no visual regressions #0.png b/src/test/pages/__image_snapshots__/ada/Question finder page should have no visual regressions #0.png
index f30e7fa8de..25679cdbe4 100644
Binary files a/src/test/pages/__image_snapshots__/ada/Question finder page should have no visual regressions #0.png and b/src/test/pages/__image_snapshots__/ada/Question finder page should have no visual regressions #0.png differ