diff --git a/packages/scratch-gui/src/components/classroom-modal/classroom-modal.css b/packages/scratch-gui/src/components/classroom-modal/classroom-modal.css
index 44075ba0a0d..5967fcb102e 100644
--- a/packages/scratch-gui/src/components/classroom-modal/classroom-modal.css
+++ b/packages/scratch-gui/src/components/classroom-modal/classroom-modal.css
@@ -559,6 +559,19 @@
     margin-top: 1.5rem;
 }
 
+/* フッター右側のグループ（例: アーカイブ + 保存 を右寄せで並べる）。 */
+.footer-right-group {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+}
+
+/* 評価画面: キャンセルをアクションボタン行の左端に置く（右寄せの他ボタンと
+   同じ行で左に離す。レビュー指摘）。 */
+.eval-cancel {
+    margin-right: auto;
+}
+
 /* 共有設定ステップ（#1109）: 公開範囲の選択カード + 合言葉の表示。 */
 .share-mode-row {
     display: flex;
@@ -2924,21 +2937,29 @@ button.detail-tabs-download-urgent:hover:not(:disabled) {
     overflow-y: auto;
 }
 
+/* クラス名を独立行にしたので、ヘッダーはアクションボタンの折り返し行にする
+   （左寄せ・省略しない。レビュー指摘 #1108）。 */
 .board-header {
     display: flex;
+    flex-wrap: wrap;
     align-items: center;
-    justify-content: space-between;
-    gap: 1rem;
+    gap: 0.5rem;
+    margin-bottom: 0.75rem;
 }
 
 .board-title {
-    flex: 1;
-    margin: 0;
+    margin: 0.25rem 0 0.25rem;
     font-size: 1.3rem;
+    font-weight: bold;
     color: #575e75;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+}
+
+/* 課題一覧（ボード）の簡単な説明。 */
+.board-hint {
+    font-size: 0.85rem;
+    color: #888;
+    line-height: 1.5;
+    margin: 0 0 0.75rem;
 }
 
 .board-year {
diff --git a/packages/scratch-gui/src/components/classroom-modal/shared-assignment-catalog.jsx b/packages/scratch-gui/src/components/classroom-modal/shared-assignment-catalog.jsx
index 73f89e5a798..e4847c06596 100644
--- a/packages/scratch-gui/src/components/classroom-modal/shared-assignment-catalog.jsx
+++ b/packages/scratch-gui/src/components/classroom-modal/shared-assignment-catalog.jsx
@@ -4,6 +4,7 @@
  * manage the caller's own posts (unlist / republish). Supplement URLs open
  * behind an explicit confirmation that names the external domain (D4).
  */
+import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import React, { useCallback, useState } from 'react';
 import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
@@ -390,8 +391,8 @@ const SharedAssignmentCatalog = ({ group, isLoading, shared }) => {
                 </h3>
                 <button data-testid="shared-catalog-close" type="button" onClick={shared.handleCloseCatalog}>
                     <FormattedMessage
-                        defaultMessage="Close"
-                        description="Close the shared catalog"
+                        defaultMessage="Cancel"
+                        description="Cancel button that leaves the shared catalog"
                         id="gui.classroom.shared.catalogClose"
                     />
                 </button>
@@ -399,7 +400,9 @@ const SharedAssignmentCatalog = ({ group, isLoading, shared }) => {
 
             <div className={styles.detailTabs} role="tablist">
                 <button
-                    className={shared.catalogTab === 'all' ? styles.detailTabActive : styles.detailTab}
+                    className={classNames(styles.detailTab, {
+                        [styles.detailTabActive]: shared.catalogTab === 'all',
+                    })}
                     data-testid="shared-catalog-tab-all"
                     type="button"
                     onClick={handleTabAll}
@@ -411,7 +414,9 @@ const SharedAssignmentCatalog = ({ group, isLoading, shared }) => {
                     />
                 </button>
                 <button
-                    className={shared.catalogTab === 'mine' ? styles.detailTabActive : styles.detailTab}
+                    className={classNames(styles.detailTab, {
+                        [styles.detailTabActive]: shared.catalogTab === 'mine',
+                    })}
                     data-testid="shared-catalog-tab-mine"
                     type="button"
                     onClick={handleTabMine}
diff --git a/packages/scratch-gui/src/components/classroom-modal/teacher-assignment-board.jsx b/packages/scratch-gui/src/components/classroom-modal/teacher-assignment-board.jsx
index 55609d212bc..d2be7ee6e80 100644
--- a/packages/scratch-gui/src/components/classroom-modal/teacher-assignment-board.jsx
+++ b/packages/scratch-gui/src/components/classroom-modal/teacher-assignment-board.jsx
@@ -362,8 +362,15 @@ const TeacherAssignmentBoard = ({
         [allClassrooms, onReuseAssignment, group],
     );
 
-    // Reuse picker: every assignment (any class), newest first, filterable.
+    // 再利用の対象はアクティブなクラス・課題のみ（レビュー指摘）。アーカイブ済みの
+    // クラス（組）に属する課題や、アーカイブ済みの課題は候補・フィルタから除外する。
+    const activeGroupIds = new Set(
+        (allGroups || []).filter((g) => g.status !== 'archived').map((g) => g.groupId),
+    );
+    const reuseGroups = (allGroups || []).filter((g) => g.status !== 'archived');
+    // Reuse picker: active assignments (of active classes), newest first, filterable.
     const reuseCandidates = (allClassrooms || [])
+        .filter((c) => c.status !== 'archived' && activeGroupIds.has(c.groupId))
         .filter((c) => !reuseFilterGroupId || c.groupId === reuseFilterGroupId)
         .sort((a, b) =>
             String(b.sortDate || b.createdAt || '').localeCompare(String(a.sortDate || a.createdAt || '')),
@@ -389,6 +396,58 @@ const TeacherAssignmentBoard = ({
         [onUpdateGroupTopics, group.groupId],
     );
 
+    // 画面遷移サブビュー（#1108）: 作成/再利用/共有/合言葉/カタログ。開いている間は
+    // 上部アクションバーを隠し、パンくずに現在地を出す。「課題一覧」で元に戻る。
+    const subView = showInlineCreate
+        ? 'create'
+        : showReuse
+          ? 'reuse'
+          : shared && shared.shareTarget
+            ? 'share'
+            : shared && shared.showPasscodeImport
+              ? 'passcode'
+              : shared && shared.showCatalog
+                ? 'catalog'
+                : null;
+    // 各 id の descriptor は元の使用箇所と一致させる（react-intl は同一 id で
+    // defaultMessage/description の不一致を許さない）。
+    const subViewMessages = {
+        create: {
+            defaultMessage: 'Create an assignment',
+            description: 'Button on the board to create a new assignment',
+            id: 'gui.classroom.board.create',
+        },
+        reuse: {
+            defaultMessage: 'Reuse an assignment',
+            description: 'Button on the board to reuse (duplicate) an existing assignment',
+            id: 'gui.classroom.board.reuse',
+        },
+        share: {
+            defaultMessage: 'Share this assignment',
+            description: 'Share step title',
+            id: 'gui.classroom.shared.shareStepTitle',
+        },
+        passcode: {
+            defaultMessage: 'Import by passcode',
+            description: 'Passcode import step title',
+            id: 'gui.classroom.shared.passcodeImportTitle',
+        },
+        catalog: {
+            defaultMessage: 'Find in みんなの課題',
+            description: 'Button that opens the shared assignment catalog',
+            id: 'gui.classroom.shared.openCatalog',
+        },
+    };
+    const handleBoardHome = useCallback(() => {
+        setShowInlineCreate(false);
+        setShowReuse(false);
+        if (shared) {
+            if (shared.shareTarget) shared.handleCloseShareForm();
+            if (shared.showPasscodeImport) shared.handleClosePasscodeImport();
+            if (shared.showCatalog) shared.handleCloseCatalog();
+        }
+    }, [shared]);
+
     return (
         <div className={styles.assignmentBoard} data-testid="classroom-board">
             <TeacherBreadcrumbs
@@ -402,18 +461,40 @@ const TeacherAssignmentBoard = ({
                         onClick: onShowClassList,
                         testId: 'classroom-breadcrumb-class-list',
                     },
-                    {
-                        label: intl.formatMessage({
-                            defaultMessage: 'Assignments',
-                            description: 'Breadcrumb label of the assignment board',
-                            id: 'gui.classroom.breadcrumbs.assignments',
-                        }),
-                    },
+                    // サブビュー中は「課題一覧」を戻るリンクにし、現在地の crumb を足す。
+                    subView
+                        ? {
+                              label: intl.formatMessage({
+                                  defaultMessage: 'Assignments',
+                                  description: 'Breadcrumb label of the assignment board',
+                                  id: 'gui.classroom.breadcrumbs.assignments',
+                              }),
+                              onClick: handleBoardHome,
+                              testId: 'classroom-breadcrumb-assignments',
+                          }
+                        : {
+                              label: intl.formatMessage({
+                                  defaultMessage: 'Assignments',
+                                  description: 'Breadcrumb label of the assignment board',
+                                  id: 'gui.classroom.breadcrumbs.assignments',
+                              }),
+                          },
+                    ...(subView ? [{ label: intl.formatMessage(subViewMessages[subView]) }] : []),
                 ]}
             />
-            {!(shared && (shared.shareTarget || shared.showPasscodeImport)) && (
+            {!subView && (
+            <React.Fragment>
+            {/* クラス名は独立行にして省略されないようにする（レビュー指摘）。
+                下に画面の説明、その下にアクションボタン行を置く。 */}
+            <h2 className={styles.boardTitle}>{formatClassLabel(group)}</h2>
+            <p className={styles.boardHint}>
+                <FormattedMessage
+                    defaultMessage="Create and organize this class's assignments here. Open an assignment to check submissions or grade."
+                    description="Short description of what the assignment board (課題一覧) is for"
+                    id="gui.classroom.board.hint"
+                />
+            </p>
             <div className={styles.boardHeader}>
-                <h2 className={styles.boardTitle}>{formatClassLabel(group)}</h2>
                 <button
                     className={styles.boardCreateButton}
                     data-testid="classroom-board-create"
@@ -440,25 +521,8 @@ const TeacherAssignmentBoard = ({
                         id="gui.classroom.board.reuse"
                     />
                 </button>
-                {onDownloadClassAll ? (
-                    <button
-                        className={styles.boardReuseButton}
-                        data-testid="classroom-board-download-class"
-                        disabled={isLoading || !!downloadProgress}
-                        type="button"
-                        onClick={handleDownloadClassAll}
-                    >
-                        {downloadProgress ? (
-                            `${downloadProgress.current}/${downloadProgress.total}`
-                        ) : (
-                            <FormattedMessage
-                                defaultMessage="Download all submissions"
-                                description="Button that downloads every assignment's submissions as one zip"
-                                id="gui.classroom.board.downloadClass"
-                            />
-                        )}
-                    </button>
-                ) : null}
+                {/* 並び順（レビュー指摘）: 作る → 再利用 → みんなの課題からさがす →
+                    合言葉で取り込み → 全課題の提出物をダウンロード。 */}
                 {shared ? (
                     <button
                         className={styles.boardReuseButton}
@@ -489,7 +553,27 @@ const TeacherAssignmentBoard = ({
                         />
                     </button>
                 ) : null}
+                {onDownloadClassAll ? (
+                    <button
+                        className={styles.boardReuseButton}
+                        data-testid="classroom-board-download-class"
+                        disabled={isLoading || !!downloadProgress}
+                        type="button"
+                        onClick={handleDownloadClassAll}
+                    >
+                        {downloadProgress ? (
+                            `${downloadProgress.current}/${downloadProgress.total}`
+                        ) : (
+                            <FormattedMessage
+                                defaultMessage="Download all submissions"
+                                description="Button that downloads every assignment's submissions as one zip"
+                                id="gui.classroom.board.downloadClass"
+                            />
+                        )}
+                    </button>
+                ) : null}
             </div>
+            </React.Fragment>
             )}
             <ErrorDisplay error={error} errorTitle={errorTitle} />
             {shared && shared.lastImported ? (
@@ -522,64 +606,91 @@ const TeacherAssignmentBoard = ({
                 />
             ) : shared && shared.showCatalog ? (
                 <SharedAssignmentCatalog group={group} isLoading={isLoading} shared={shared} />
-            ) : (
-                <React.Fragment>
-            {showInlineCreate ? (
+            ) : showInlineCreate ? (
+                // 課題を作る（#1108: popover → 画面遷移。フッター キャンセル左/作成右）
                 <form
-                    className={`${styles.boardPopover} ${styles.boardInlineCreate}`}
+                    className={styles.postAssignmentContainer}
+                    data-testid="classroom-board-create-view"
                     onSubmit={handleSubmitInlineCreate}
                 >
-                    <input
-                        autoFocus
-                        data-testid="classroom-board-create-name"
-                        disabled={isLoading}
-                        maxLength={50}
-                        placeholder={intl.formatMessage({
-                            defaultMessage: 'Assignment name (e.g. Move the cat)',
-                            description: 'Placeholder of the inline assignment name input',
-                            id: 'gui.classroom.board.createNamePlaceholder',
-                        })}
-                        type="text"
-                        value={newAssignmentName}
-                        onChange={handleNewAssignmentNameChange}
-                    />
-                    <button
-                        data-testid="classroom-board-create-submit"
-                        disabled={isLoading || newAssignmentName.trim().length === 0}
-                        type="submit"
-                    >
+                    <div className={styles.phaseTitle}>
                         <FormattedMessage
-                            defaultMessage="Create"
-                            description="Submit button of the inline assignment creation form"
-                            id="gui.classroom.board.createSubmit"
+                            defaultMessage="Create an assignment"
+                            description="Button on the board to create a new assignment"
+                            id="gui.classroom.board.create"
                         />
-                    </button>
-                    <button
-                        className={styles.popoverCancel}
-                        data-testid="classroom-board-create-cancel"
-                        type="button"
-                        onClick={handleToggleInlineCreate}
-                    >
-                        <FormattedMessage
-                            defaultMessage="Cancel"
-                            description="Cancel button of the inline assignment creation form"
-                            id="gui.classroom.board.createCancel"
+                    </div>
+                    <div className={styles.formGroup}>
+                        <label className={styles.label}>
+                            <FormattedMessage
+                                defaultMessage="Assignment name:"
+                                description="Label for the assignment name on the create screen"
+                                id="gui.classroom.board.createNameLabel"
+                            />
+                        </label>
+                        <input
+                            autoFocus
+                            className={styles.input}
+                            data-testid="classroom-board-create-name"
+                            disabled={isLoading}
+                            maxLength={50}
+                            placeholder={intl.formatMessage({
+                                defaultMessage: 'Assignment name (e.g. Move the cat)',
+                                description: 'Placeholder of the assignment name input',
+                                id: 'gui.classroom.board.createNamePlaceholder',
+                            })}
+                            type="text"
+                            value={newAssignmentName}
+                            onChange={handleNewAssignmentNameChange}
                         />
-                    </button>
+                    </div>
+                    <div className={styles.formFooter}>
+                        <button
+                            className={styles.secondaryButton}
+                            data-testid="classroom-board-create-cancel"
+                            type="button"
+                            onClick={handleToggleInlineCreate}
+                        >
+                            <FormattedMessage
+                                defaultMessage="Cancel"
+                                description="Cancel button of the assignment create screen"
+                                id="gui.classroom.board.createCancel"
+                            />
+                        </button>
+                        <button
+                            className={styles.primaryButton}
+                            data-testid="classroom-board-create-submit"
+                            disabled={isLoading || newAssignmentName.trim().length === 0}
+                            type="submit"
+                        >
+                            <FormattedMessage
+                                defaultMessage="Create"
+                                description="Submit button of the assignment create screen"
+                                id="gui.classroom.board.createSubmit"
+                            />
+                        </button>
+                    </div>
                 </form>
-            ) : null}
-            {showReuse ? (
-                <div
-                    className={`${styles.boardPopover} ${styles.boardSection}`}
-                    data-testid="classroom-board-reuse-view"
-                >
-                    <div className={styles.reuseFilter}>
+            ) : showReuse ? (
+                // 課題を再利用（#1108: popover → 画面遷移。コピーは候補ごと、キャンセル左）
+                <div className={styles.postAssignmentContainer} data-testid="classroom-board-reuse-view">
+                    <div className={styles.phaseTitle}>
+                        <FormattedMessage
+                            defaultMessage="Reuse an assignment"
+                            description="Button on the board to reuse (duplicate) an existing assignment"
+                            id="gui.classroom.board.reuse"
+                        />
+                    </div>
+                    <p className={styles.postAssignmentHint}>
                         <FormattedMessage
                             defaultMessage="Copy an existing assignment into this class:"
                             description="Explanation above the reuse picker"
                             id="gui.classroom.board.reuseHint"
                         />
+                    </p>
+                    <div className={styles.formGroup}>
                         <select
+                            className={styles.input}
                             data-testid="classroom-board-reuse-filter"
                             disabled={isLoading}
                             value={reuseFilterGroupId}
@@ -592,24 +703,12 @@ const TeacherAssignmentBoard = ({
                                     id: 'gui.classroom.board.reuseFilterAll',
                                 })}
                             </option>
-                            {(allGroups || []).map((g) => (
+                            {reuseGroups.map((g) => (
                                 <option key={g.groupId} value={g.groupId}>
                                     {formatClassLabel(g)}
                                 </option>
                             ))}
                         </select>
-                        <button
-                            className={styles.popoverCancel}
-                            data-testid="classroom-board-reuse-cancel"
-                            type="button"
-                            onClick={handleToggleReuse}
-                        >
-                            <FormattedMessage
-                                defaultMessage="Cancel"
-                                description="Close the reuse picker without copying"
-                                id="gui.classroom.board.reuseCancel"
-                            />
-                        </button>
                     </div>
                     <ul className={styles.boardRows}>
                         {reuseCandidates.map((c) => (
@@ -637,8 +736,24 @@ const TeacherAssignmentBoard = ({
                             </li>
                         ))}
                     </ul>
+                    <div className={styles.formFooter}>
+                        <button
+                            className={styles.secondaryButton}
+                            data-testid="classroom-board-reuse-cancel"
+                            type="button"
+                            onClick={handleToggleReuse}
+                        >
+                            <FormattedMessage
+                                defaultMessage="Cancel"
+                                description="Close the reuse picker without copying"
+                                id="gui.classroom.board.reuseCancel"
+                            />
+                        </button>
+                        <span />
+                    </div>
                 </div>
-            ) : null}
+            ) : (
+                <React.Fragment>
             <div className={styles.boardTopics}>
                 {topics.map((topic) => (
                     <TopicChip
diff --git a/packages/scratch-gui/src/components/classroom-modal/teacher-class-list.jsx b/packages/scratch-gui/src/components/classroom-modal/teacher-class-list.jsx
index 2edb8821fe6..548ab6da179 100644
--- a/packages/scratch-gui/src/components/classroom-modal/teacher-class-list.jsx
+++ b/packages/scratch-gui/src/components/classroom-modal/teacher-class-list.jsx
@@ -236,88 +236,107 @@ const ClassSettingsForm = ({ group, isLoading, onCancel, onUpdateGroup }) => {
                     />
                 </p>
             ) : null}
-            <div className={styles.classSettingsActions}>
-                <button
-                    data-testid="classroom-class-settings-archive"
-                    disabled={isLoading}
-                    type="button"
-                    onClick={handleToggleArchive}
-                >
-                    {group.status === 'archived' ? (
-                        <FormattedMessage
-                            defaultMessage="Unarchive"
-                            description="Button to unarchive a class"
-                            id="gui.classroom.classSettings.unarchive"
-                        />
-                    ) : confirmingArchive ? (
-                        <FormattedMessage
-                            defaultMessage="Yes, archive"
-                            description="Confirm button that actually archives the class"
-                            id="gui.classroom.classSettings.archiveConfirmYes"
-                        />
-                    ) : (
-                        <FormattedMessage
-                            defaultMessage="Archive"
-                            description="Button to archive a class"
-                            id="gui.classroom.classSettings.archive"
-                        />
-                    )}
-                </button>
+            {/* フッター（レビュー指摘）: 通常は キャンセル左 / アーカイブ・保存 右
+                （アーカイブは保存の左）。アーカイブ押下中は キャンセル・保存を隠し
+                「アーカイブしない / アーカイブする」のみ表示。 */}
+            <div className={styles.formFooter}>
                 {confirmingArchive ? (
-                    <button
-                        data-testid="classroom-class-settings-archive-cancel"
-                        disabled={isLoading}
-                        type="button"
-                        onClick={handleCancelArchive}
-                    >
-                        <FormattedMessage
-                            defaultMessage="Keep the class"
-                            description="Button that cancels archiving the class"
-                            id="gui.classroom.classSettings.archiveConfirmNo"
-                        />
-                    </button>
-                ) : null}
-                <span className={styles.classSettingsSpacer} />
-                <button
-                    data-testid="classroom-class-settings-cancel"
-                    disabled={isLoading}
-                    type="button"
-                    onClick={confirmingDecrease ? handleCancelDecrease : onCancel}
-                >
-                    {confirmingDecrease ? (
-                        <FormattedMessage
-                            defaultMessage="Keep the count"
-                            description="Button that cancels decreasing the student count"
-                            id="gui.classroom.classSettings.decreaseConfirmNo"
-                        />
-                    ) : (
-                        <FormattedMessage
-                            defaultMessage="Cancel"
-                            description="Cancel button of the class settings form"
-                            id="gui.classroom.classSettings.cancel"
-                        />
-                    )}
-                </button>
-                <button
-                    className={styles.classSettingsSave}
-                    data-testid="classroom-class-settings-save"
-                    disabled={!canSave || isLoading}
-                    type="submit"
-                >
-                    {confirmingDecrease ? (
-                        <FormattedMessage
-                            defaultMessage="Reduce and save"
-                            description="Confirm button that decreases the student count and saves"
-                            id="gui.classroom.classSettings.decreaseConfirmYes"
-                        />
-                    ) : (
-                        <FormattedMessage
-                            defaultMessage="Save"
-                            description="Save button of the class settings form"
-                            id="gui.classroom.classSettings.save"
-                        />
-                    )}
-                </button>
+                    <React.Fragment>
+                        <button
+                            className={styles.secondaryButton}
+                            data-testid="classroom-class-settings-archive-cancel"
+                            disabled={isLoading}
+                            type="button"
+                            onClick={handleCancelArchive}
+                        >
+                            <FormattedMessage
+                                defaultMessage="Keep the class"
+                                description="Button that cancels archiving the class"
+                                id="gui.classroom.classSettings.archiveConfirmNo"
+                            />
+                        </button>
+                        <button
+                            className={styles.dangerButton}
+                            data-testid="classroom-class-settings-archive"
+                            disabled={isLoading}
+                            type="button"
+                            onClick={handleToggleArchive}
+                        >
+                            <FormattedMessage
+                                defaultMessage="Yes, archive"
+                                description="Confirm button that actually archives the class"
+                                id="gui.classroom.classSettings.archiveConfirmYes"
+                            />
+                        </button>
+                    </React.Fragment>
+                ) : (
+                    <React.Fragment>
+                        <button
+                            className={styles.secondaryButton}
+                            data-testid="classroom-class-settings-cancel"
+                            disabled={isLoading}
+                            type="button"
+                            onClick={confirmingDecrease ? handleCancelDecrease : onCancel}
+                        >
+                            {confirmingDecrease ? (
+                                <FormattedMessage
+                                    defaultMessage="Keep the count"
+                                    description="Button that cancels decreasing the student count"
+                                    id="gui.classroom.classSettings.decreaseConfirmNo"
+                                />
+                            ) : (
+                                <FormattedMessage
+                                    defaultMessage="Cancel"
+                                    description="Cancel button of the class settings form"
+                                    id="gui.classroom.classSettings.cancel"
+                                />
+                            )}
+                        </button>
+                        <div className={styles.footerRightGroup}>
+                            <button
+                                className={styles.secondaryButton}
+                                data-testid="classroom-class-settings-archive"
+                                disabled={isLoading}
+                                type="button"
+                                onClick={handleToggleArchive}
+                            >
+                                {group.status === 'archived' ? (
+                                    <FormattedMessage
+                                        defaultMessage="Unarchive"
+                                        description="Button to unarchive a class"
+                                        id="gui.classroom.classSettings.unarchive"
+                                    />
+                                ) : (
+                                    <FormattedMessage
+                                        defaultMessage="Archive"
+                                        description="Button to archive a class"
+                                        id="gui.classroom.classSettings.archive"
+                                    />
+                                )}
+                            </button>
+                            <button
+                                className={styles.primaryButton}
+                                data-testid="classroom-class-settings-save"
+                                disabled={!canSave || isLoading}
+                                type="submit"
+                            >
+                                {confirmingDecrease ? (
+                                    <FormattedMessage
+                                        defaultMessage="Reduce and save"
+                                        description="Confirm button that decreases the student count and saves"
+                                        id="gui.classroom.classSettings.decreaseConfirmYes"
+                                    />
+                                ) : (
+                                    <FormattedMessage
+                                        defaultMessage="Save"
+                                        description="Save button of the class settings form"
+                                        id="gui.classroom.classSettings.save"
+                                    />
+                                )}
+                            </button>
+                        </div>
+                    </React.Fragment>
+                )}
             </div>
         </form>
     );
@@ -425,19 +444,22 @@ const ClassCard = ({
                     />
                 </button>
             )}
-            <button
-                className={styles.classCardEvaluate}
-                data-testid={`classroom-class-settings-open-${group.groupId}`}
-                disabled={isLoading}
-                type="button"
-                onClick={handleSettings}
-            >
-                <FormattedMessage
-                    defaultMessage="Settings"
-                    description="Button on a class card to open its settings"
-                    id="gui.classroom.classList.settings"
-                />
-            </button>
+            {/* アーカイブ済みは「元に戻す」だけ。設定ボタンは出さない（レビュー指摘）。 */}
+            {isArchived ? null : (
+                <button
+                    className={styles.classCardEvaluate}
+                    data-testid={`classroom-class-settings-open-${group.groupId}`}
+                    disabled={isLoading}
+                    type="button"
+                    onClick={handleSettings}
+                >
+                    <FormattedMessage
+                        defaultMessage="Settings"
+                        description="Button on a class card to open its settings"
+                        id="gui.classroom.classList.settings"
+                    />
+                </button>
+            )}
         </li>
     );
 };
@@ -522,68 +544,49 @@ const TeacherClassList = ({
     // migration failed). They must never be hidden — list them directly.
     const knownGroupIds = new Set(groups.map((g) => g.groupId));
     const ungrouped = classrooms.filter((c) => !c.groupId || !knownGroupIds.has(c.groupId));
+    const settingsGroup = groups.find((g) => g.groupId === settingsGroupId);
 
-    return (
-        <div className={styles.classList} data-testid="classroom-phase-teacher-class-list">
-            <TeacherBreadcrumbs
-                items={[
-                    {
-                        label: intl.formatMessage({
-                            defaultMessage: 'Class list',
-                            description: 'Breadcrumb label of the class list (current view)',
-                            id: 'gui.classroom.breadcrumbs.classList',
-                        }),
-                    },
-                ]}
-            />
-            <h2 className={styles.classListTitle}>
-                <FormattedMessage
-                    defaultMessage="Your classes"
-                    description="Title of the class list (post-login landing view)"
-                    id="gui.classroom.classList.title"
-                />
-            </h2>
-            <p className={styles.classListHint}>
-                <FormattedMessage
-                    defaultMessage="A class is one homeroom (e.g. Year 2 Class 1). Open a class to manage its assignments."
-                    description="Hint below the class list title"
-                    id="gui.classroom.classList.hint"
-                />
-            </p>
-            <ErrorDisplay error={error} errorTitle={errorTitle} />
-            <button
-                className={styles.classListCreateButton}
-                data-testid="classroom-class-create"
-                disabled={isLoading}
-                type="button"
-                onClick={handleToggleCreateForm}
-            >
-                <FormattedMessage
-                    defaultMessage="Create a class"
-                    description="Button that opens the combined class creation form"
-                    id="gui.classroom.classList.create"
+    const classListCrumb = {
+        label: intl.formatMessage({
+            defaultMessage: 'Class list',
+            description: 'Breadcrumb link back to the class list',
+            id: 'gui.classroom.breadcrumbs.classList',
+        }),
+        onClick: showCreateForm ? handleToggleCreateForm : handleCloseSettings,
+        testId: 'classroom-breadcrumb-class-list',
+    };
+
+    // クラスを作る（#1108: popover → 画面遷移。フッター キャンセル左/作成右）
+    if (showCreateForm) {
+        return (
+            <div className={styles.classList} data-testid="classroom-phase-teacher-class-list">
+                <TeacherBreadcrumbs
+                    items={[
+                        classListCrumb,
+                        {
+                            label: intl.formatMessage({
+                                defaultMessage: 'Create a class',
+                                description: 'Button that opens the combined class creation form',
+                                id: 'gui.classroom.classList.create',
+                            }),
+                        },
+                    ]}
                 />
-            </button>
-            {onShowGoogleCourses ? (
-                <button
-                    className={styles.classListImportButton}
-                    data-testid="classroom-class-import-gc"
-                    disabled={isLoading}
-                    type="button"
-                    onClick={onShowGoogleCourses}
-                >
-                    <FormattedMessage
-                        defaultMessage="Import from Google Classroom"
-                        description="Button on the class list to import a GC course as a class"
-                        id="gui.classroom.classList.importGc"
-                    />
-                </button>
-            ) : null}
-            {showCreateForm ? (
-                <form
-                    className={`${styles.boardPopover} ${styles.classListCreateForm}`}
-                    onSubmit={handleSubmit}
-                >
+                <ErrorDisplay error={error} errorTitle={errorTitle} />
+                <div className={styles.postAssignmentContainer}>
+                    {/* 設定画面と同じ枠付きフォーム（.class-settings-form）に揃える。 */}
+                    <div className={styles.phaseTitle}>
+                        <FormattedMessage
+                            defaultMessage="Create a class"
+                            description="Button that opens the combined class creation form"
+                            id="gui.classroom.classList.create"
+                        />
+                    </div>
+                    <form
+                        className={styles.classSettingsForm}
+                        data-testid="classroom-class-create-view"
+                        onSubmit={handleSubmit}
+                    >
                     <input
                         data-testid="classroom-class-create-name"
                         disabled={isLoading}
@@ -648,40 +651,140 @@ const TeacherClassList = ({
                         value={assignmentName}
                         onChange={handleAssignmentNameChange}
                     />
-                    <button
-                        data-testid="classroom-class-create-submit"
-                        disabled={!canSubmit || isLoading}
-                        type="submit"
-                    >
-                        {assignmentName.trim() ? (
-                            <FormattedMessage
-                                defaultMessage="Create class and assignment"
-                                description="Submit button when a first assignment is given"
-                                id="gui.classroom.classList.createSubmit"
-                            />
-                        ) : (
-                            <FormattedMessage
-                                defaultMessage="Create the class only"
-                                description="Submit button when no first assignment is given"
-                                id="gui.classroom.classList.createClassOnly"
-                            />
-                        )}
-                    </button>
-                    <button
-                        className={styles.popoverCancel}
-                        data-testid="classroom-class-create-cancel"
-                        type="button"
-                        onClick={handleToggleCreateForm}
-                    >
+                    <p className={styles.formHint}>
                         <FormattedMessage
-                            defaultMessage="Cancel"
-                            description="Cancel button of the class creation form"
-                            id="gui.classroom.classList.createCancel"
+                            defaultMessage="You can add co-teachers (fellow teachers who help manage this class) later in Settings."
+                            description="Hint on the create form that co-teachers can be added later in settings"
+                            id="gui.classroom.classList.createCoTeacherHint"
                         />
-                    </button>
-                </form>
+                    </p>
+                    <div className={styles.formFooter}>
+                        <button
+                            className={styles.secondaryButton}
+                            data-testid="classroom-class-create-cancel"
+                            type="button"
+                            onClick={handleToggleCreateForm}
+                        >
+                            <FormattedMessage
+                                defaultMessage="Cancel"
+                                description="Cancel button of the class creation form"
+                                id="gui.classroom.classList.createCancel"
+                            />
+                        </button>
+                        <button
+                            className={styles.primaryButton}
+                            data-testid="classroom-class-create-submit"
+                            disabled={!canSubmit || isLoading}
+                            type="submit"
+                        >
+                            {assignmentName.trim() ? (
+                                <FormattedMessage
+                                    defaultMessage="Create class and assignment"
+                                    description="Submit button when a first assignment is given"
+                                    id="gui.classroom.classList.createSubmit"
+                                />
+                            ) : (
+                                <FormattedMessage
+                                    defaultMessage="Create the class only"
+                                    description="Submit button when no first assignment is given"
+                                    id="gui.classroom.classList.createClassOnly"
+                                />
+                            )}
+                        </button>
+                    </div>
+                    </form>
+                </div>
+            </div>
+        );
+    }
+
+    // クラス設定（#1108: インラインカード → 画面遷移）
+    if (settingsGroup) {
+        return (
+            <div className={styles.classList} data-testid="classroom-phase-teacher-class-list">
+                <TeacherBreadcrumbs
+                    items={[
+                        classListCrumb,
+                        {
+                            label: intl.formatMessage({
+                                defaultMessage: 'Settings',
+                                description: 'Button on a class card to open its settings',
+                                id: 'gui.classroom.classList.settings',
+                            }),
+                        },
+                    ]}
+                />
+                <ErrorDisplay error={error} errorTitle={errorTitle} />
+                <div className={styles.postAssignmentContainer}>
+                    <div className={styles.phaseTitle}>{formatClassLabel(settingsGroup)}</div>
+                    <ClassSettingsForm
+                        group={settingsGroup}
+                        isLoading={isLoading}
+                        onCancel={handleCloseSettings}
+                        onUpdateGroup={onUpdateGroup}
+                    />
+                </div>
+            </div>
+        );
+    }
+
+    return (
+        <div className={styles.classList} data-testid="classroom-phase-teacher-class-list">
+            <TeacherBreadcrumbs
+                items={[
+                    {
+                        label: intl.formatMessage({
+                            defaultMessage: 'Class list',
+                            description: 'Breadcrumb label of the class list (current view)',
+                            id: 'gui.classroom.breadcrumbs.classList',
+                        }),
+                    },
+                ]}
+            />
+            <h2 className={styles.classListTitle}>
+                <FormattedMessage
+                    defaultMessage="Your classes"
+                    description="Title of the class list (post-login landing view)"
+                    id="gui.classroom.classList.title"
+                />
+            </h2>
+            <p className={styles.classListHint}>
+                <FormattedMessage
+                    defaultMessage="A class is one homeroom (e.g. Year 2 Class 1). Open a class to manage its assignments."
+                    description="Hint below the class list title"
+                    id="gui.classroom.classList.hint"
+                />
+            </p>
+            <ErrorDisplay error={error} errorTitle={errorTitle} />
+            <button
+                className={styles.classListCreateButton}
+                data-testid="classroom-class-create"
+                disabled={isLoading}
+                type="button"
+                onClick={handleToggleCreateForm}
+            >
+                <FormattedMessage
+                    defaultMessage="Create a class"
+                    description="Button that opens the combined class creation form"
+                    id="gui.classroom.classList.create"
+                />
+            </button>
+            {onShowGoogleCourses ? (
+                <button
+                    className={styles.classListImportButton}
+                    data-testid="classroom-class-import-gc"
+                    disabled={isLoading}
+                    type="button"
+                    onClick={onShowGoogleCourses}
+                >
+                    <FormattedMessage
+                        defaultMessage="Import from Google Classroom"
+                        description="Button on the class list to import a GC course as a class"
+                        id="gui.classroom.classList.importGc"
+                    />
+                </button>
             ) : null}
-            {activeGroups.length === 0 && !showCreateForm ? (
+            {activeGroups.length === 0 ? (
                 <p className={styles.classListEmpty} data-testid="classroom-class-list-empty">
                     <FormattedMessage
                         defaultMessage={'No classes yet. Press "Create a class" to get started.'}
@@ -721,28 +824,17 @@ const TeacherClassList = ({
                 </div>
             ) : null}
             <ul className={styles.classCards} data-testid="classroom-class-list">
-                {activeGroups.map((group) =>
-                    settingsGroupId === group.groupId ? (
-                        <li key={group.groupId} className={styles.classCard}>
-                            <ClassSettingsForm
-                                group={group}
-                                isLoading={isLoading}
-                                onCancel={handleCloseSettings}
-                                onUpdateGroup={onUpdateGroup}
-                            />
-                        </li>
-                    ) : (
-                        <ClassCard
-                            key={group.groupId}
-                            assignmentCount={countFor(group.groupId)}
-                            group={group}
-                            isLoading={isLoading}
-                            onSelectGroup={onSelectGroup}
-                            onShowEvaluation={onShowEvaluation}
-                            onShowSettings={handleShowSettings}
-                        />
-                    ),
-                )}
+                {activeGroups.map((group) => (
+                    <ClassCard
+                        key={group.groupId}
+                        assignmentCount={countFor(group.groupId)}
+                        group={group}
+                        isLoading={isLoading}
+                        onSelectGroup={onSelectGroup}
+                        onShowEvaluation={onShowEvaluation}
+                        onShowSettings={handleShowSettings}
+                    />
+                ))}
             </ul>
             {archivedGroups.length > 0 ? (
                 <div className={styles.archivedSection}>
@@ -764,29 +856,18 @@ const TeacherClassList = ({
                     </button>
                     {showArchived ? (
                         <ul className={styles.classCards} data-testid="classroom-archived-class-list">
-                            {archivedGroups.map((group) =>
-                                settingsGroupId === group.groupId ? (
-                                    <li key={group.groupId} className={styles.classCard}>
-                                        <ClassSettingsForm
-                                            group={group}
-                                            isLoading={isLoading}
-                                            onCancel={handleCloseSettings}
-                                            onUpdateGroup={onUpdateGroup}
-                                        />
-                                    </li>
-                                ) : (
-                                    <ClassCard
-                                        key={group.groupId}
-                                        assignmentCount={countFor(group.groupId)}
-                                        group={group}
-                                        isLoading={isLoading}
-                                        onRestoreGroup={handleRestoreGroup}
-                                        onSelectGroup={onSelectGroup}
-                                        onShowEvaluation={onShowEvaluation}
-                                        onShowSettings={handleShowSettings}
-                                    />
-                                ),
-                            )}
+                            {archivedGroups.map((group) => (
+                                <ClassCard
+                                    key={group.groupId}
+                                    assignmentCount={countFor(group.groupId)}
+                                    group={group}
+                                    isLoading={isLoading}
+                                    onRestoreGroup={handleRestoreGroup}
+                                    onSelectGroup={onSelectGroup}
+                                    onShowEvaluation={onShowEvaluation}
+                                    onShowSettings={handleShowSettings}
+                                />
+                            ))}
                         </ul>
                     ) : null}
                 </div>
diff --git a/packages/scratch-gui/src/components/classroom-modal/teacher-evaluation.jsx b/packages/scratch-gui/src/components/classroom-modal/teacher-evaluation.jsx
index 351d9dc8fda..7bcd634fbf2 100644
--- a/packages/scratch-gui/src/components/classroom-modal/teacher-evaluation.jsx
+++ b/packages/scratch-gui/src/components/classroom-modal/teacher-evaluation.jsx
@@ -353,8 +353,20 @@ const TeacherEvaluation = ({
                 </div>
             )}
 
-            {/* Actions */}
+            {/* Actions（左端にキャンセル、他ボタンは右寄せ。レビュー指摘で同一行に揃える） */}
             <div className={styles.buttonRow}>
+                <button
+                    className={classNames(styles.secondaryButton, styles.evalCancel)}
+                    data-testid="classroom-evaluation-cancel"
+                    type="button"
+                    onClick={onBack}
+                >
+                    <FormattedMessage
+                        defaultMessage="Cancel"
+                        description="Cancel button of the evaluation screen (returns to the class list)"
+                        id="gui.classroom.evaluation.cancel"
+                    />
+                </button>
                 <button
                     className={styles.primaryButton}
                     data-testid="classroom-eval-run-grade"
diff --git a/packages/scratch-gui/src/components/classroom-teacher-modal/classroom-teacher-modal.css b/packages/scratch-gui/src/components/classroom-teacher-modal/classroom-teacher-modal.css
index 9f818ae70fd..5353f7c6756 100644
--- a/packages/scratch-gui/src/components/classroom-teacher-modal/classroom-teacher-modal.css
+++ b/packages/scratch-gui/src/components/classroom-teacher-modal/classroom-teacher-modal.css
@@ -308,6 +308,34 @@
     text-align: right;
 }
 
+/* 基本ポリシーのフッター（#1108）: キャンセル左 / プライマリー右。 */
+.main-footer-split {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 0.5rem;
+    margin-top: 1rem;
+}
+
+.secondary-footer-button {
+    padding: 0.6rem 1.2rem;
+    border: 1px solid #d9d9d9;
+    border-radius: 4px;
+    background-color: white;
+    color: #575e75;
+    font-size: 0.9rem;
+    cursor: pointer;
+}
+
+.secondary-footer-button:hover:not(:disabled) {
+    background-color: #f2f2f2;
+}
+
+.secondary-footer-button:disabled {
+    opacity: 0.5;
+    cursor: default;
+}
+
 .auth-hint-overlay {
     position: absolute;
     top: 0;
diff --git a/packages/scratch-gui/src/components/classroom-teacher-modal/teacher-google-courses-phase.jsx b/packages/scratch-gui/src/components/classroom-teacher-modal/teacher-google-courses-phase.jsx
index eb53b4f90c6..851009ed40a 100644
--- a/packages/scratch-gui/src/components/classroom-teacher-modal/teacher-google-courses-phase.jsx
+++ b/packages/scratch-gui/src/components/classroom-teacher-modal/teacher-google-courses-phase.jsx
@@ -169,7 +169,21 @@ const TeacherGoogleCoursesPhase = ({
                     onSelect={onSelectGoogleCourse}
                 />
             )}
-            <div className={styles.mainFooter}>
+            {/* フッターを基本ポリシーに統一（#1108）: キャンセル左 / インポート右 */}
+            <div className={styles.mainFooterSplit}>
+                <button
+                    className={styles.secondaryFooterButton}
+                    data-testid="classroom-google-import-cancel"
+                    disabled={isLoading}
+                    type="button"
+                    onClick={onBack}
+                >
+                    <FormattedMessage
+                        defaultMessage="Cancel"
+                        description="Cancel the Google Classroom import and go back to the class list"
+                        id="gui.classroom.management.importCancel"
+                    />
+                </button>
                 <button
                     className={styles.loginButton}
                     data-testid="classroom-google-import-confirm"
diff --git a/packages/scratch-gui/src/locales/ja-Hira.js b/packages/scratch-gui/src/locales/ja-Hira.js
index d6bb7bf5c04..82068659ee6 100644
--- a/packages/scratch-gui/src/locales/ja-Hira.js
+++ b/packages/scratch-gui/src/locales/ja-Hira.js
@@ -209,6 +209,7 @@ export default {
     'gui.classroom.evaluation.exportCsv': 'ひょうかCSV',
     'gui.classroom.evaluation.exportAuditCsv': 'けんしょうようCSV',
     'gui.classroom.evaluation.returnComments': 'コメントをへんきゃく',
+    'gui.classroom.evaluation.cancel': 'キャンセル',
     'gui.classroom.teacherDetail.descriptionTab': 'せつめい',
     'gui.classroom.teacherDetail.previewTitle': 'せいとにみえるないよう（プレビュー）',
     'gui.classroom.breadcrumbs.evaluation': 'ひょうか',
@@ -221,6 +222,7 @@ export default {
     'gui.classroom.breadcrumbs.assignmentDetail': 'かだいしょうさい',
     'gui.classroom.breadcrumbs.shareGc': 'Google Classroom に きょうゆう',
     'gui.classroom.board.createNamePlaceholder': 'かだいめい（れい: ねこをうごかそう）',
+    'gui.classroom.board.createNameLabel': 'かだいめい:',
     'gui.classroom.board.createSubmit': 'つくる',
     'gui.classroom.board.reuse': 'かだいをさいりよう',
     'gui.classroom.board.reuseHint': 'つくったかだいをこのクラスにふくせい:',
@@ -228,6 +230,8 @@ export default {
     'gui.classroom.board.reuseCopy': 'このクラスにふくせい',
     'gui.classroom.board.yearLabel': '{year}ねんど',
     'gui.classroom.board.create': 'かだいをつくる',
+    'gui.classroom.board.hint':
+        'このクラスのかだいをさくせい・かんりします。かだいをひらくとていしゅつじょうきょうのかくにんやひょうかができます。',
     'gui.classroom.board.topicLabel': 'トピック',
     'gui.classroom.board.noTopic': '（トピックなし）',
     'gui.classroom.board.newTopicPlaceholder': 'あたらしいトピック',
@@ -239,6 +243,8 @@ export default {
     'gui.classroom.classList.ungroupedHint':
         'どのクラスにもはいっていないかだい（きょうどうかんりできょうゆうされたもの・みいこうのもの）:',
     'gui.classroom.classList.createCancel': 'キャンセル',
+    'gui.classroom.classList.createCoTeacherHint':
+        'きょうどうかんりしゃ（クラスをいっしょにかんりするせんせい）は、あとから「せってい」でついかできます。',
     'gui.classroom.classList.createClassOnly': 'クラスのみつくる',
     'gui.classroom.classList.settings': 'せってい',
     'gui.classroom.classSettings.namePlaceholder': 'クラスめい（ひっす・れい: ぎじゅつ）',
@@ -416,7 +422,7 @@ export default {
     'gui.classroom.shared.passcodeImportBtn': 'このクラスにとりこむ',
     'gui.classroom.shared.openCatalog': 'みんなのかだいからさがす',
     'gui.classroom.shared.catalogTitle': 'みんなのかだい — ぜんこくのせんせいがきょうゆうしたかだい',
-    'gui.classroom.shared.catalogClose': 'とじる',
+    'gui.classroom.shared.catalogClose': 'キャンセル',
     'gui.classroom.shared.tabAll': 'すべて',
     'gui.classroom.shared.tabMine': 'じぶんのとうこう',
     'gui.classroom.shared.filterAllLevels': 'すべてのがっこうしゅ',
@@ -470,6 +476,7 @@ export default {
     'gui.classroom.management.googleCoursesTitle': 'Google Classroomからインポート',
     'gui.classroom.management.noCourses': 'クラスがみつかりません',
     'gui.classroom.management.importButton': 'インポート',
+    'gui.classroom.management.importCancel': 'キャンセル',
     'gui.classroom.management.authHintTitle': 'Google Classroom からインポートするまえに',
     'gui.classroom.management.authHintGuide':
         'にんかのがめんがひょうじされたら、したのがぞうのようにすべてのチェックボックスにチェックをいれてください。',
diff --git a/packages/scratch-gui/src/locales/ja.js b/packages/scratch-gui/src/locales/ja.js
index dbed6fb8647..40e0fbde79c 100644
--- a/packages/scratch-gui/src/locales/ja.js
+++ b/packages/scratch-gui/src/locales/ja.js
@@ -205,6 +205,7 @@ export default {
     'gui.classroom.evaluation.exportCsv': '評価CSV',
     'gui.classroom.evaluation.exportAuditCsv': '検証用CSV',
     'gui.classroom.evaluation.returnComments': 'コメントを返却',
+    'gui.classroom.evaluation.cancel': 'キャンセル',
     'gui.classroom.teacherDetail.descriptionTab': '説明',
     'gui.classroom.teacherDetail.previewTitle': '生徒に見える内容（プレビュー）',
     'gui.classroom.breadcrumbs.evaluation': '評価',
@@ -217,6 +218,7 @@ export default {
     'gui.classroom.breadcrumbs.assignmentDetail': '課題詳細',
     'gui.classroom.breadcrumbs.shareGc': 'Google Classroom に共有',
     'gui.classroom.board.createNamePlaceholder': '課題名（例: ねこを動かそう）',
+    'gui.classroom.board.createNameLabel': '課題名:',
     'gui.classroom.board.createSubmit': '作成',
     'gui.classroom.board.reuse': '課題を再利用',
     'gui.classroom.board.reuseHint': '作成済みの課題をこのクラスに複製:',
@@ -224,6 +226,7 @@ export default {
     'gui.classroom.board.reuseCopy': 'このクラスに複製',
     'gui.classroom.board.yearLabel': '{year}年度',
     'gui.classroom.board.create': '課題を作る',
+    'gui.classroom.board.hint': 'このクラスの課題を作成・管理します。課題を開くと提出状況の確認や評価ができます。',
     'gui.classroom.board.topicLabel': 'トピック',
     'gui.classroom.board.noTopic': '（トピックなし）',
     'gui.classroom.board.newTopicPlaceholder': '新しいトピック',
@@ -235,6 +238,8 @@ export default {
     'gui.classroom.classList.ungroupedHint':
         'どのクラスにも入っていない課題（共同管理で共有されたもの・未移行のもの）:',
     'gui.classroom.classList.createCancel': 'キャンセル',
+    'gui.classroom.classList.createCoTeacherHint':
+        '共同管理者（クラスを一緒に管理する先生）は、あとから「設定」で追加できます。',
     'gui.classroom.classList.createClassOnly': 'クラスのみ作成',
     'gui.classroom.classList.settings': '設定',
     'gui.classroom.classSettings.namePlaceholder': 'クラス名（必須・例: 技術）',
@@ -408,7 +413,7 @@ export default {
     'gui.classroom.shared.passcodeImportBtn': 'このクラスに取り込む',
     'gui.classroom.shared.openCatalog': 'みんなの課題からさがす',
     'gui.classroom.shared.catalogTitle': 'みんなの課題 — 全国の先生が共有した課題',
-    'gui.classroom.shared.catalogClose': '閉じる',
+    'gui.classroom.shared.catalogClose': 'キャンセル',
     'gui.classroom.shared.tabAll': 'すべて',
     'gui.classroom.shared.tabMine': '自分の投稿',
     'gui.classroom.shared.filterAllLevels': 'すべての学校種',
@@ -458,6 +463,7 @@ export default {
     'gui.classroom.management.googleCoursesTitle': 'Google Classroomからインポート',
     'gui.classroom.management.noCourses': 'クラスが見つかりません',
     'gui.classroom.management.importButton': 'インポート',
+    'gui.classroom.management.importCancel': 'キャンセル',
     'gui.classroom.management.authHintTitle': 'Google Classroom からインポートする前に',
     'gui.classroom.management.authHintGuide':
         '認可の画面が表示されたら、下の画像のようにすべてのチェックボックスにチェックを入れてください。',
diff --git a/packages/scratch-gui/test/unit/components/teacher-assignment-board.test.jsx b/packages/scratch-gui/test/unit/components/teacher-assignment-board.test.jsx
index 93dc0a782ed..5d71610bf7c 100644
--- a/packages/scratch-gui/test/unit/components/teacher-assignment-board.test.jsx
+++ b/packages/scratch-gui/test/unit/components/teacher-assignment-board.test.jsx
@@ -199,3 +199,33 @@ describe('TeacherAssignmentBoard — retention notice (issue #1052)', () => {
         expect(byTestId('classroom-board-expiry-c1')).not.toBeInTheDocument();
     });
 });
+
+describe('TeacherAssignmentBoard — reuse excludes archived (review feedback)', () => {
+    test('reuse candidates and the class filter exclude archived classes and assignments', () => {
+        const allGroups = [
+            { groupId: 'g1', name: 'A', year: 2026, status: 'active', topics: [] },
+            { groupId: 'gArch', name: 'B', year: 2026, status: 'archived', topics: [] },
+        ];
+        const allClassrooms = [
+            { classroomId: 'active1', groupId: 'g1', assignmentName: 'A課題', status: 'active' },
+            { classroomId: 'archAssign', groupId: 'g1', assignmentName: 'アーカイブ課題', status: 'archived' },
+            { classroomId: 'inArchGroup', groupId: 'gArch', assignmentName: 'アーカイブ組の課題', status: 'active' },
+        ];
+        renderBoard({
+            group: { groupId: 'g1', name: 'A', year: 2026, topics: [] },
+            allGroups,
+            allClassrooms,
+        });
+        fireEvent.click(byTestId('classroom-board-reuse'));
+
+        // Only the active assignment of an active class is a candidate.
+        expect(byTestId('classroom-board-reuse-copy-active1')).toBeInTheDocument();
+        expect(byTestId('classroom-board-reuse-copy-archAssign')).not.toBeInTheDocument();
+        expect(byTestId('classroom-board-reuse-copy-inArchGroup')).not.toBeInTheDocument();
+
+        // The class filter lists only the active class.
+        const values = [...byTestId('classroom-board-reuse-filter').options].map((o) => o.value);
+        expect(values).toContain('g1');
+        expect(values).not.toContain('gArch');
+    });
+});
diff --git a/packages/scratch-gui/test/unit/components/teacher-class-list.test.jsx b/packages/scratch-gui/test/unit/components/teacher-class-list.test.jsx
index 0fb8de979e4..ddf1bcf1c8b 100644
--- a/packages/scratch-gui/test/unit/components/teacher-class-list.test.jsx
+++ b/packages/scratch-gui/test/unit/components/teacher-class-list.test.jsx
@@ -249,17 +249,29 @@ describe('TeacherClassList — archived classes section (issue #1051)', () => {
         expect(byTestId('classroom-class-settings-archive-confirm-message')).not.toBeInTheDocument();
     });
 
-    test('unarchiving from settings stays immediate (no confirmation)', () => {
-        const onUpdateGroup = jest.fn();
-        renderList({
-            groups: [group({ groupId: 'g2', status: 'archived' })],
-            onUpdateGroup,
-        });
+    test('pressing Archive hides cancel/save and shows only archive yes/no (review feedback)', () => {
+        renderList();
+        fireEvent.click(byTestId('classroom-class-settings-open-g1'));
+        expect(byTestId('classroom-class-settings-cancel')).toBeInTheDocument();
+        expect(byTestId('classroom-class-settings-save')).toBeInTheDocument();
 
-        fireEvent.click(byTestId('classroom-show-archived'));
-        fireEvent.click(byTestId('classroom-class-settings-open-g2'));
         fireEvent.click(byTestId('classroom-class-settings-archive'));
+        // Only the archive yes/no buttons remain.
+        expect(byTestId('classroom-class-settings-cancel')).not.toBeInTheDocument();
+        expect(byTestId('classroom-class-settings-save')).not.toBeInTheDocument();
+        expect(byTestId('classroom-class-settings-archive-cancel')).toBeInTheDocument();
+        expect(byTestId('classroom-class-settings-archive')).toBeInTheDocument();
 
-        expect(onUpdateGroup).toHaveBeenCalledWith('g2', { status: 'active' });
+        // "Keep the class" restores cancel/save.
+        fireEvent.click(byTestId('classroom-class-settings-archive-cancel'));
+        expect(byTestId('classroom-class-settings-cancel')).toBeInTheDocument();
+        expect(byTestId('classroom-class-settings-save')).toBeInTheDocument();
+    });
+
+    test('archived classes have no settings button — only restore (review feedback)', () => {
+        renderList({ groups: [group({ groupId: 'g2', status: 'archived' })] });
+        fireEvent.click(byTestId('classroom-show-archived'));
+        expect(byTestId('classroom-class-settings-open-g2')).not.toBeInTheDocument();
+        expect(byTestId('classroom-class-restore-g2')).toBeInTheDocument();
     });
 });