diff --git a/app/javascript/components/Bookmarks.jsx b/app/javascript/components/Bookmarks.jsx
index 4b4dd43758a..6403f278f2b 100644
--- a/app/javascript/components/Bookmarks.jsx
+++ b/app/javascript/components/Bookmarks.jsx
@@ -32,40 +32,69 @@ export default function Bookmarks() {
   } else {
     return (
       <>
-        <Pagination
-          sum={data.totalPages * per}
-          per={per}
-          neighbours={neighbours}
-          page={page}
-          onChange={(e) => handlePaginate(e.page)}
-        />
-        <div className="card-list-tools">
-          <div className="form-item is-inline">
-            <EditButton editable={editable} setEditable={setEditable} />
+        <div className="page-main">
+          <div className="page-main-header">
+            <div className="container">
+              <div className="page-main-header__inner">
+                <div className="page-main-header__start">
+                  <h1 className="page-main-header__title">ブックマーク</h1>
+                </div>
+                <div className="page-main-header__end">
+                  <div className="page-header-actions">
+                    <div className="page-header-actions__items">
+                      <div className="page-header-actions__item">
+                        <div className="form-item is-inline">
+                          <EditButton
+                            editable={editable}
+                            setEditable={setEditable}
+                          />
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
           </div>
-        </div>
-        <div className="card-list a-card">
-          <div className="card-list__items">
-            {data.bookmarks.map((bookmark) => {
-              return (
-                <Bookmark
-                  key={bookmark.id}
-                  bookmark={bookmark}
-                  editable={editable}
-                  setEditable={setEditable}
-                  bookmarksUrl={bookmarksUrl}
-                />
-              )
-            })}
+          {/* .page-main-header */}
+          <hr className="a-border"></hr>
+          <div className="page-body">
+            <div className="container is-md">
+              <Pagination
+                sum={data.totalPages * per}
+                per={per}
+                neighbours={neighbours}
+                page={page}
+                onChange={(e) => handlePaginate(e.page)}
+              />
+              <div className="card-list a-card">
+                <div className="card-list__items">
+                  {data.bookmarks.map((bookmark) => {
+                    return (
+                      <Bookmark
+                        key={bookmark.id}
+                        bookmark={bookmark}
+                        editable={editable}
+                        setEditable={setEditable}
+                        bookmarksUrl={bookmarksUrl}
+                      />
+                    )
+                  })}
+                </div>
+              </div>
+              <Pagination
+                sum={data.totalPages * per}
+                per={per}
+                neighbours={neighbours}
+                page={page}
+                onChange={(e) => handlePaginate(e.page)}
+              />
+            </div>
+            {/* .container */}
           </div>
+          {/* .page-body */}
         </div>
-        <Pagination
-          sum={data.totalPages * per}
-          per={per}
-          neighbours={neighbours}
-          page={page}
-          onChange={(e) => handlePaginate(e.page)}
-        />
+        {/* .page-main */}
       </>
     )
   }
@@ -73,10 +102,27 @@ export default function Bookmarks() {
 
 const NoBookmarks = () => {
   return (
-    <div className="o-empty-message">
-      <div className="o-empty-message__icon">
-        <i className="fa-regular fa-face-sad-tear" />
-        <p className="o-empty-message__text">ブックマークはまだありません。</p>
+    <div className="page-main">
+      <div className="page-main-header">
+        <div className="container">
+          <div className="page-main-header__inner">
+            <div className="page-main-header__start">
+              <h1 className="page-main-header__title">ブックマーク</h1>
+            </div>
+          </div>
+        </div>
+      </div>
+      {/* .page-main-header */}
+      <hr className="a-border"></hr>
+      <div className="page-body">
+        <div className="o-empty-message">
+          <div className="o-empty-message__icon">
+            <i className="fa-regular fa-face-sad-tear" />
+            <p className="o-empty-message__text">
+              ブックマークはまだありません。
+            </p>
+          </div>
+        </div>
       </div>
     </div>
   )
diff --git a/app/javascript/components/reports.vue b/app/javascript/components/reports.vue
deleted file mode 100644
index e0b575c62b9..00000000000
--- a/app/javascript/components/reports.vue
+++ /dev/null
@@ -1,166 +0,0 @@
-<template lang="pug">
-.card-list.a-card(v-if='limit')
-  .card-header.is-sm
-    h2.card-header__title
-      | 直近の日報
-  hr.a-border
-  .card-list__items(v-if='reports && reports.length > 0')
-    report(
-      v-for='report in reports',
-      :key='report.id',
-      :report='report',
-      :current-user-id='currentUserId',
-      :display-user-icon='displayUserIcon')
-  .card-body(v-else)
-    .card__description
-      .o-empty-message
-        .o-empty-message__icon
-          i.fa-regular.fa-sad-tear
-        .o-empty-message__text
-          | 日報はまだありません。
-.page-content.reports(v-else)
-  nav.pagination(v-if='totalPages > 1')
-    pager(v-bind='pagerProps')
-  .reports.is-md(v-if='reports === null')
-    loadingListPlaceholder
-  .card-list.a-card(v-else-if='reports.length > 0')
-    .card-list__items
-      report(
-        v-for='report in reports',
-        :key='report.id',
-        :report='report',
-        :current-user-id='currentUserId',
-        :display-user-icon='displayUserIcon')
-    unconfirmed-link(v-if='isUncheckedReportsPage', label='未チェックの日報を一括で開く')
-  .o-empty-message(v-else-if='reports.length === 0 && isUncheckedReportsPage')
-    .o-empty-message__icon
-      i.fa-regular.fa-smile
-    p.o-empty-message__text
-      | 未チェックの日報はありません
-  .o-empty-message(v-else)
-    .o-empty-message__icon
-      i.fa-regular.fa-sad-tear
-    .o-empty-message__text
-      | 日報はまだありません。
-  nav.pagination(v-if='totalPages > 1')
-    pager(v-bind='pagerProps')
-</template>
-<script>
-import Report from 'components/report.vue'
-import UnconfirmedLink from 'unconfirmed_link.vue'
-import LoadingListPlaceholder from 'loading-list-placeholder.vue'
-import Pager from 'pager.vue'
-
-export default {
-  name: 'Reports',
-  components: {
-    report: Report,
-    'unconfirmed-link': UnconfirmedLink,
-    loadingListPlaceholder: LoadingListPlaceholder,
-    pager: Pager
-  },
-  props: {
-    userId: {
-      type: Number,
-      default: null
-    },
-    companyId: {
-      type: Number,
-      default: null
-    },
-    practiceId: {
-      type: Number,
-      default: null
-    },
-    limit: {
-      type: String,
-      default: null
-    },
-    displayUserIcon: {
-      type: Boolean,
-      default: true
-    }
-  },
-  data() {
-    return {
-      reports: null,
-      currentPage: this.pageParam(),
-      totalPages: null,
-      currentUserId: null
-    }
-  },
-  computed: {
-    isUncheckedReportsPage() {
-      return location.pathname.includes('unchecked')
-    },
-    newParams() {
-      const params = new URL(location.href).searchParams
-      params.set('page', this.currentPage)
-      if (this.userId) {
-        params.set('user_id', this.userId)
-      }
-      if (this.companyId) {
-        params.set('company_id', this.companyId)
-      }
-      if (this.practiceId) {
-        params.set('practice_id', this.practiceId)
-      }
-      if (this.limit) {
-        params.set('limit', this.limit)
-      }
-      return params
-    },
-    newURL() {
-      return `${location.pathname}?${this.newParams}`
-    },
-    reportsAPI() {
-      const params = this.newParams
-      if (this.isUncheckedReportsPage) {
-        return `/api/reports/unchecked.json?${params}`
-      } else {
-        return `/api/reports.json?${params}`
-      }
-    },
-    pagerProps() {
-      return {
-        initialPageNumber: this.currentPage,
-        pageCount: this.totalPages,
-        pageRange: 9,
-        clickHandle: this.clickCallback
-      }
-    }
-  },
-  created() {
-    window.onpopstate = () => {
-      this.currentPage = this.pageParam()
-      this.getReports()
-    }
-    this.getReports()
-  },
-  methods: {
-    pageParam() {
-      const url = new URL(location.href)
-      const page = url.searchParams.get('page')
-      return parseInt(page || 1)
-    },
-    clickCallback(pageNum) {
-      this.currentPage = pageNum
-      history.pushState(null, null, this.newURL)
-      this.getReports()
-      window.scrollTo(0, 0)
-    },
-    async getReports() {
-      const response = await fetch(this.reportsAPI, {
-        method: 'GET',
-        headers: { 'X-Requested-With': 'XMLHttpRequest' },
-        credentials: 'same-origin',
-        redirect: 'manual'
-      }).catch((error) => console.warn(error))
-      const json = await response.json().catch((error) => console.warn(error))
-      this.reports = json.reports
-      this.currentUserId = json.currentUserId
-      this.totalPages = parseInt(json.totalPages)
-    }
-  }
-}
-</script>
diff --git a/app/javascript/components/user-sns.vue b/app/javascript/components/user-sns.vue
index 3192585295e..bd294f104ce 100644
--- a/app/javascript/components/user-sns.vue
+++ b/app/javascript/components/user-sns.vue
@@ -12,9 +12,9 @@
       a.sns-links__item-link.a-button.is-sm.is-secondary.is-icon(
         v-if='user.twitter_account',
         :href='twitterUrl')
-        i.fa-brands.fa-twitter
+        i.fa-brands.fa-x-twitter
       .sns-links__item-link.a-button.is-sm.is-disabled.is-icon(v-else)
-        i.fa-brands.fa-twitter
+        i.fa-brands.fa-x-twitter
     li.sns-links__item
       a.sns-links__item-link.a-button.is-sm.is-secondary.is-icon(
         v-if='user.facebook_url',
diff --git a/app/javascript/components/watches.vue b/app/javascript/components/watches.vue
index de2f206f951..9ee648dd25e 100644
--- a/app/javascript/components/watches.vue
+++ b/app/javascript/components/watches.vue
@@ -1,36 +1,47 @@
 <template lang="pug">
-.page-body
-  .container.is-md(v-if='!loaded')
-    loadingListPlaceholder
-  .container.is-md(v-else)
-    .o-empty-message(v-if='watches.length === 0')
-      .o-empty-message__icon
-        i.fa-regular.fa-sad-tear
-      p.o-empty-message__text
-        | Watchしているものはまだありません。
-    div(v-else)
-      nav.pagination(v-if='totalPages > 1')
-        pager(v-bind='pagerProps')
-      .card-list-tools(v-if='watches.length')
-        .form-item.is-inline
-          label.a-form-label(for='card-list-tools__action')
-            | 編集
-          label.a-on-off-checkbox.is-sm
-            input#card-list-tools__action(
-              type='checkbox',
-              name='card-list-tools__action',
-              v-model='checked')
-            span#spec-edit-mode
-      .card-list.a-card
-        .card-list__items
-          watch(
-            v-for='watch in watches',
-            :key='watch.id',
-            :watch='watch',
-            :checked='checked',
-            @updateIndex='updateIndex')
-      nav.pagination(v-if='totalPages > 1')
-        pager(v-bind='pagerProps')
+.page-main
+  .page-main-header
+    .container
+      .page-main-header__inner
+        .page-main-header__start
+          h1.page-main-header__title
+            | Watch中
+        .page-main-header__end
+          .page-header-actions
+            .page-header-actions__items
+              .page-header-actions__item(v-if='watches.length')
+                .form-item.is-inline
+                  label.a-form-label(for='card-list-tools__action')
+                    | 編集
+                  label.a-on-off-checkbox.is-sm
+                    input#card-list-tools__action(
+                      type='checkbox',
+                      name='card-list-tools__action',
+                      v-model='checked')
+                    span#spec-edit-mode
+  hr.a-border
+  .page-body
+    .container.is-md(v-if='!loaded')
+      loadingListPlaceholder
+    .container.is-md(v-else)
+      .o-empty-message(v-if='watches.length === 0')
+        .o-empty-message__icon
+          i.fa-regular.fa-sad-tear
+        p.o-empty-message__text
+          | Watchしているものはまだありません。
+      div(v-else)
+        nav.pagination(v-if='totalPages > 1')
+          pager(v-bind='pagerProps')
+        .card-list.a-card
+          .card-list__items
+            watch(
+              v-for='watch in watches',
+              :key='watch.id',
+              :watch='watch',
+              :checked='checked',
+              @updateIndex='updateIndex')
+        nav.pagination(v-if='totalPages > 1')
+          pager(v-bind='pagerProps')
 </template>
 
 <script>
diff --git a/app/javascript/grass.vue b/app/javascript/grass.vue
index ec2e0056114..31ecfdf6658 100644
--- a/app/javascript/grass.vue
+++ b/app/javascript/grass.vue
@@ -6,7 +6,7 @@
     .card-header__action(
       v-if='currentUser.primary_role === "graduate" && isDashboard')
       | <button @click='hideGrass' class='a-button is-xs is-muted-borderd'>非表示</button>
-  hr.a-border
+  hr.a-border-tint
   .user-grass
     .user-grass-nav
       .user-grass-nav__previous(@click='onPrevYearMonth')
diff --git a/app/javascript/niconico_calendar.vue b/app/javascript/niconico_calendar.vue
index 7829d4e7f53..b8a914a2b19 100644
--- a/app/javascript/niconico_calendar.vue
+++ b/app/javascript/niconico_calendar.vue
@@ -3,7 +3,7 @@
   header.card-header.is-sm
     h2.card-header__title
       | ニコニコカレンダー
-  hr.a-border
+  hr.a-border-tint
   .card-body(v-if='!loaded')
     .card__description
       | ロード中
diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index ca7783d457d..06e9f2278d9 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -68,7 +68,6 @@ import ExternalEntries from '../components/external-entries.vue'
 import Pages from '../components/pages.vue'
 import Questions from '../components/questions.vue'
 import WorriedUsers from '../components/worried-users.vue'
-import Reports from '../components/reports.vue'
 import RegularEvents from '../components/regular-events.vue'
 import Users from '../components/users.vue'
 import UsersAnswers from '../components/users-answers.vue'
@@ -94,7 +93,6 @@ mounter.addComponent(ExternalEntries)
 mounter.addComponent(Pages)
 mounter.addComponent(Questions)
 mounter.addComponent(WorriedUsers)
-mounter.addComponent(Reports)
 mounter.addComponent(RegularEvents)
 mounter.addComponent(Users)
 mounter.addComponent(UsersAnswers)
diff --git a/app/javascript/stylesheets/config/variables/_colors.sass b/app/javascript/stylesheets/config/variables/_colors.sass
index 4b028abe4c5..b11d8a510db 100644
--- a/app/javascript/stylesheets/config/variables/_colors.sass
+++ b/app/javascript/stylesheets/config/variables/_colors.sass
@@ -1,17 +1,17 @@
-$main: hsl(248, 51%, 48%)
+$main: hsl(242, 51%, 51%)
 $accent: hsl(44, 96%, 54%)
 $base: white
-$background: hsl(248, 33%, 97%)
+$background: hsl(242, 33%, 97%)
 
 // completion
 $completion: hsl(197deg 83% 49%)
 $completion-dark: rgb(0 0 0 / 20%)
 
 // background
-$background-shade: hsl(248, 11%, 85%)
-$background-semi-shade: hsl(248, 24%, 92%)
-$background-tint: hsl(248, 9%, 93%)
-$background-more-tint: hsl(248, 8%, 98.5%)
+$background-shade: hsl(242, 11%, 85%)
+$background-semi-shade: hsl(242, 24%, 92%)
+$background-tint: hsl(242, 9%, 93%)
+$background-more-tint: hsl(242, 8%, 98.5%)
 
 // nikoniko
 $happy-background: #ffecdf
@@ -24,21 +24,21 @@ $silver: #898888
 $bronze: #dc7e61
 
 // text
-$default-text: hsl(248, 12%, 35%)
+$default-text: hsl(242, 12%, 35%)
 $reversal-text: white
-$muted-text: hsl(248, 5%, 64%)
-$semi-muted-text: hsl(248, 7%, 57%)
-$link-text: hsl(248, 62%, 33%)
+$muted-text: hsl(242, 5%, 64%)
+$semi-muted-text: hsl(242, 7%, 57%)
+$link-text: hsl(242, 62%, 33%)
 $hover-text: hsl(215, 78%, 50%)
 
 // placeholder
 $placeholder: rgba(black, .075)
-$placeholder-text: hsl(248, 0%, 73%)
+$placeholder-text: hsl(242, 0%, 73%)
 
 // border
-$border: hsl(248, 7%, 89%)
-$border-tint: hsl(248, 33%, 97%)
-$border-shade: hsl(248, 7%, 84%)
+$border: hsl(242, 7%, 89%)
+$border-tint: hsl(242, 33%, 97%)
+$border-shade: hsl(242, 7%, 84%)
 
 // Welcome Colors
 $welcome-blue: hsl(210, 100%, 55%)
@@ -49,7 +49,7 @@ $welcome-pink: hsl(344, 80%, 66%)
 
 // UI colors
 $primary: hsl(211, 67%, 52%)
-$secondary: hsl(248, 1%, 100%)
+$secondary: hsl(242, 1%, 100%)
 $success: hsl(150, 39%, 49%)
 $info: hsl(190, 73%, 48%)
 $warning: $accent
@@ -121,7 +121,7 @@ $input-focus-shadow: rgba($primary, .4) 0 0 1px 2px
   &:link
     color: var(--reversal-text)
   &:visited
-    color: hsl(248, 62%, 74%)
+    color: hsl(242, 62%, 74%)
   &:hover
     color: hsl(210, 100%, 80%)
   &:active
diff --git a/app/models/product.rb b/app/models/product.rb
index 3a61e029e23..bf99e783363 100644
--- a/app/models/product.rb
+++ b/app/models/product.rb
@@ -196,4 +196,14 @@ def delete_last_commented_at
   def delete_commented_at
     update_commented_at(comments.last)
   end
+
+  def notification_type
+    updated_after_submission? ? :product_update : :submitted
+  end
+
+  def updated_after_submission?
+    return false if saved_change_to_attribute?('published_at', from: nil)
+
+    created_at != updated_at
+  end
 end
diff --git a/app/models/product_notifier_for_colleague.rb b/app/models/product_notifier_for_colleague.rb
index d56a8ce4207..3e1975c4ba4 100644
--- a/app/models/product_notifier_for_colleague.rb
+++ b/app/models/product_notifier_for_colleague.rb
@@ -25,7 +25,7 @@ def notify_advisers(product)
 
   def send_notification(product:, receivers:)
     receivers.each do |receiver|
-      ActivityDelivery.with(product: product, receiver: receiver).notify(:submitted)
+      ActivityDelivery.with(product: product, receiver: receiver).notify(product.notification_type)
     end
   end
 end
diff --git a/app/models/product_notifier_for_practice_watcher.rb b/app/models/product_notifier_for_practice_watcher.rb
index d286f32ff83..ade0182ad30 100644
--- a/app/models/product_notifier_for_practice_watcher.rb
+++ b/app/models/product_notifier_for_practice_watcher.rb
@@ -17,7 +17,7 @@ def call(product)
 
   def send_notification(product:, receivers:)
     receivers.each do |receiver|
-      ActivityDelivery.with(product: product, receiver: receiver).notify(:submitted)
+      ActivityDelivery.with(product: product, receiver: receiver).notify(product.notification_type)
     end
   end
 end
diff --git a/app/views/application/_required_field.html.slim b/app/views/application/_required_field.html.slim
index f9712f836db..253fff300ed 100644
--- a/app/views/application/_required_field.html.slim
+++ b/app/views/application/_required_field.html.slim
@@ -3,7 +3,7 @@
     header.card-header.is-sm
       h2.card-header__title
         | 未入力の項目
-    hr.a-border
+    hr.a-border-tint
     .card-list.is-reauired
       .card-list__deacription
         .card-list__notice
diff --git a/app/views/categories/practices/index.html.slim b/app/views/categories/practices/index.html.slim
index 7cd57de0c06..4d963bfb3bb 100644
--- a/app/views/categories/practices/index.html.slim
+++ b/app/views/categories/practices/index.html.slim
@@ -3,23 +3,38 @@
 header.page-header
   .container
     .page-header__inner
-      .page-header__start
-        h2.page-header__title
-          = title
-hr.a-border
-.page-body
-  .container.is-lg
-    .admin-table.is-grab
-      table.admin-table__table
-        thead.admin-table__header
-          tr.admin-table__labels
-            th.admin-table__label 名前
-            th.admin-table__label.handle 並び順
-        tbody.admin-table__items#js-practice-sortable
-          - @categories_practices.each do |categories_practice|
-            tr.admin-table__item(data-categories_practice_id="#{categories_practice.id}")
-              td.admin-table__item-value
-                = categories_practice.practice.title
-              td.admin-table__item-value.is-text-align-center.is-grab
-                span.js-grab.a-grab
-                  i.fa-solid.fa-align-justify
+      .page-header__title
+        | メンターページ
+
+= render 'mentor/mentor_page_tabs'
+
+.page-main
+  header.page-main-header
+    .container
+      .page-main-header__inner
+        .page-main-header__start
+          h1.page-main-header__title
+            | #{@category.name}カテゴリーのプラクティス並び替え
+        .page-main-header__end
+          .page-header-actions
+            .page-header-actions__items
+              .page-header-actions__item
+                = link_to mentor_categories_path, class: 'a-button is-md is-secondary is-block is-back' do
+                  | カテゴリー一覧
+  hr.a-border
+  .page-body
+    .container.is-lg
+      .admin-table.is-grab
+        table.admin-table__table
+          thead.admin-table__header
+            tr.admin-table__labels
+              th.admin-table__label 名前
+              th.admin-table__label.handle 並び順
+          tbody.admin-table__items#js-practice-sortable
+            - @categories_practices.each do |categories_practice|
+              tr.admin-table__item(data-categories_practice_id="#{categories_practice.id}")
+                td.admin-table__item-value
+                  = categories_practice.practice.title
+                td.admin-table__item-value.is-text-align-center.is-grab
+                  span.js-grab.a-grab
+                    i.fa-solid.fa-align-justify
diff --git a/app/views/companies/reports/index.html.slim b/app/views/companies/reports/index.html.slim
index 10ebfa3d9af..95ddb2f9831 100644
--- a/app/views/companies/reports/index.html.slim
+++ b/app/views/companies/reports/index.html.slim
@@ -16,5 +16,4 @@ header.page-header
 
 .page-body
   .container.is-md
-    div(data-vue="Reports" data-vue-company-id:number="#{@company.id}")
     = react_component('Reports', companyId: @company.id)
diff --git a/app/views/courses/_course.html.slim b/app/views/courses/_course.html.slim
index 3963b12b806..b136b841a2e 100644
--- a/app/views/courses/_course.html.slim
+++ b/app/views/courses/_course.html.slim
@@ -12,7 +12,7 @@
       .courses-item__description
         = simple_format(course.description)
       - if mentor_login?
-        hr.a-border
+        hr.a-border-tint
         footer.card-footer
           .card-main-actions
             ul.card-main-actions__items
diff --git a/app/views/courses/categories/index.html.slim b/app/views/courses/categories/index.html.slim
index 0bf3c557c3f..4aafd8678d8 100644
--- a/app/views/courses/categories/index.html.slim
+++ b/app/views/courses/categories/index.html.slim
@@ -3,29 +3,38 @@
 header.page-header
   .container
     .page-header__inner
-      .page-header__start
-        h2.page-header__title
-          = title
-      .page-header-actions
-        ul.page-header-actions__items
-          li.page-header-actions__item
-            = link_to 'コース一覧',
-              courses_path,
-              class: 'a-button is-md is-secondary is-block is-back'
-hr.a-border
-.page-body
-  .container.is-lg
-    .admin-table.is-grab
-      table.admin-table__table
-        thead.admin-table__header
-          tr.admin-table__labels
-            th.admin-table__label 名前
-            th.admin-table__label.handle 並び順
-        tbody.admin-table__items#js-category-sortable
-          - @courses_categories.each do |courses_category|
-            tr.admin-table__item(data-courses_category_id="#{courses_category.id}")
-              td.admin-table__item-value
-                = courses_category.category.name
-              td.admin-table__item-value.is-text-align-center.is-grab
-                span.js-grab.a-grab
-                  i.fa-solid.fa-align-justify
+      .page-header__title
+        | メンターページ
+
+= render 'mentor/mentor_page_tabs'
+
+.page-main
+  header.page-main-header
+    .container
+      .page-main-header__inner
+        .page-main-header__start
+          h1.page-main-header__title
+            | #{@course.title}コースのカテゴリー並び替え
+        .page-main-header__end
+          .page-header-actions
+            .page-header-actions__items
+              .page-header-actions__item
+                = link_to mentor_courses_path, class: 'a-button is-md is-secondary is-block is-back' do
+                  | コース一覧
+  hr.a-border
+  .page-body
+    .container.is-lg
+      .admin-table.is-grab
+        table.admin-table__table
+          thead.admin-table__header
+            tr.admin-table__labels
+              th.admin-table__label 名前
+              th.admin-table__label.handle 並び順
+          tbody.admin-table__items#js-category-sortable
+            - @courses_categories.each do |courses_category|
+              tr.admin-table__item(data-courses_category_id="#{courses_category.id}")
+                td.admin-table__item-value
+                  = courses_category.category.name
+                td.admin-table__item-value.is-text-align-center.is-grab
+                  span.js-grab.a-grab
+                    i.fa-solid.fa-align-justify
diff --git a/app/views/courses/practices/index.html.slim b/app/views/courses/practices/index.html.slim
index 5c46436474c..2ab8c647fe5 100644
--- a/app/views/courses/practices/index.html.slim
+++ b/app/views/courses/practices/index.html.slim
@@ -31,11 +31,6 @@ header.page-header
               label.a-on-off-checkbox.is-sm(for='display-progress')
                 input.js-users-visibility__trigger#display-progress(type = 'checkbox' checked = 'checked')
                 span#checkbox-progress
-          - if current_user.mentor?
-            li.page-header-actions__item.is-only-mentor
-              = link_to new_practice_path(course_id: @course), class: 'a-button is-md is-secondary is-block' do
-                i.fa-regular.fa-plus
-                | プラクティス作成
           li.page-header-actions__item
             = link_to courses_path, class: 'a-button is-md is-secondary is-block is-back' do
               | コース一覧
diff --git a/app/views/current_user/bookmarks/index.html.slim b/app/views/current_user/bookmarks/index.html.slim
index 151e61f9ece..b3dc8ca4f68 100644
--- a/app/views/current_user/bookmarks/index.html.slim
+++ b/app/views/current_user/bookmarks/index.html.slim
@@ -4,6 +4,4 @@
 = render 'home/page_header'
 = render 'home/page_tabs', user: @user
 
-.page-body
-  .container.is-md
-    = react_component 'Bookmarks'
+= react_component 'Bookmarks'
diff --git a/app/views/current_user/reports/index.html.slim b/app/views/current_user/reports/index.html.slim
index f57ee42760a..a587e9fb6c7 100644
--- a/app/views/current_user/reports/index.html.slim
+++ b/app/views/current_user/reports/index.html.slim
@@ -1,16 +1,23 @@
-- title 'ダッシュボード 自分の日報'
+- title '自分の日報'
 - set_meta_tags description: '自分の日報一覧ページです。'
 
 = render 'home/page_header'
 = render 'home/page_tabs', user: @user
 
-.page-body
-  .container.is-md
-    = react_component('Reports', userId: current_user.id)
-    - if current_user.reports.present?
-      .form-actions
-        ul.form-actions__items
-          li.form-actions__item.is-main
-            = link_to user_reports_path(@user, format: :md), class: 'a-button is-md is-primary is-block' do
-              i.fa-solid.fa-cloud-download-alt
-              | 日報一括ダウンロード
+.page-main
+  .page-main-header
+    .container
+      .page-main-header__inner
+        .page-main-header__start
+          h1.page-main-header__title
+            | 自分の日報（#{@user.reports.length}）
+        - if current_user.reports.present?
+          .page-main-header__end
+            .page-header-actions
+              .page-header-actions__items
+                .page-header-actions__item
+                  = link_to user_reports_path(@user, format: :md), class: 'a-button is-md is-primary is-block' do
+                    | 日報一括ダウンロード
+
+hr.a-border
+= react_component('Reports', userId: current_user.id)
diff --git a/app/views/home/_bookmarks.html.slim b/app/views/home/_bookmarks.html.slim
index 438cbb24684..c3abc48e0c8 100644
--- a/app/views/home/_bookmarks.html.slim
+++ b/app/views/home/_bookmarks.html.slim
@@ -8,7 +8,7 @@
       label.a-on-off-checkbox.is-sm.spec-bookmark-edit
         input#bookmark_edit(type='checkbox')
         span
-  hr.a-border
+  hr.a-border-tint
   .card-list
     = render partial: 'bookmark', collection: @bookmarks
   footer.card-footer
diff --git a/app/views/mentor/categories/edit.html.slim b/app/views/mentor/categories/edit.html.slim
index 7fddf46c036..0e13dfb3b6e 100644
--- a/app/views/mentor/categories/edit.html.slim
+++ b/app/views/mentor/categories/edit.html.slim
@@ -3,15 +3,8 @@
 header.page-header
   .container
     .page-header__inner
-      h1.page-header__title
-        = title
-      .page-header-actions
-        - if current_user.mentor?
-          .page-header-actions__items
-            .page-header-actions__item
-              = link_to new_mentor_category_path, class: 'a-button is-md is-secondary is-block' do
-                i.fa-regular.fa-plus
-                | カテゴリー作成
+      .page-header__title
+        | メンターページ
 
 = render 'mentor/mentor_page_tabs'
 
@@ -21,7 +14,7 @@ header.page-header
       .page-main-header__inner
         .page-main-header__start
           h1.page-main-header__title
-            | カテゴリー
+            = title
         .page-main-header__end
           .page-header-actions
             .page-header-actions__items
diff --git a/app/views/mentor/categories/new.html.slim b/app/views/mentor/categories/new.html.slim
index 5cc0c59975e..ba5c6c82113 100644
--- a/app/views/mentor/categories/new.html.slim
+++ b/app/views/mentor/categories/new.html.slim
@@ -13,7 +13,7 @@ header.page-header
       .page-main-header__inner
         .page-main-header__start
           h1.page-main-header__title
-            | カテゴリー
+            | カテゴリー作成
         .page-main-header__end
           .page-header-actions
             .page-header-actions__items
diff --git a/app/views/mentor/courses/edit.html.slim b/app/views/mentor/courses/edit.html.slim
index 4dc34b34c67..3670ff6a3ad 100644
--- a/app/views/mentor/courses/edit.html.slim
+++ b/app/views/mentor/courses/edit.html.slim
@@ -1,16 +1,27 @@
 - title 'コース編集'
 
-.page-header
+header.page-header
   .container
     .page-header__inner
-      h1.page-header__title
-        = title
-      .page-header-actions
-        ul.page-header-actions__items
-          li.page-header-actions__item
-            = link_to mentor_courses_path, class: 'a-button is-md is-secondary is-block' do
-              | コース一覧
-hr.a-border
-.page-body
-  .container.is-xl
-    = render 'form', course: @course
+      .page-header__title
+        | メンターページ
+
+= render 'mentor/mentor_page_tabs'
+
+main.page-main
+  header.page-main-header
+    .container
+      .page-main-header__inner
+        .page-main-header__start
+          h1.page-main-header__title
+            = title
+        .page-main-header__end
+          .page-header-actions
+            .page-header-actions__items
+              .page-header-actions__item
+                = link_to mentor_courses_path, class: 'a-button is-md is-secondary is-block is-back' do
+                  | コース一覧
+  hr.a-border
+  .page-body
+    .container.is-xl
+      = render 'form', course: @course
diff --git a/app/views/mentor/courses/index.html.slim b/app/views/mentor/courses/index.html.slim
index ec8a632d03b..bc386fe96f8 100644
--- a/app/views/mentor/courses/index.html.slim
+++ b/app/views/mentor/courses/index.html.slim
@@ -2,16 +2,26 @@
 header.page-header
   .container
     .page-header__inner
-      h2.page-header__title = title
-      .page-header-actions
-        ul.page-header-actions__items
-          li.page-header-actions__item
-            = link_to new_mentor_course_path, class: 'a-button is-md is-secondary is-block' do
-              i.fa-regular.fa-plus
-              | コース作成
+      .page-header__title
+        = title
 
 = render 'mentor/mentor_page_tabs'
 
-.page-body
-  .container.is-lg
-    = react_component 'MentorCourses'
+.page-main
+  header.page-main-header
+    .container
+      .page-main-header__inner
+        .page-main-header__start
+          h1.page-main-header__title
+            | コース
+        .page-main-header__end
+          .page-header-actions
+            .page-header-actions__items
+              .page-header-actions__item
+                = link_to new_mentor_course_path, class: 'a-button is-md is-secondary is-block' do
+                  i.fa-regular.fa-plus
+                  | コース作成
+  hr.a-border
+  .page-body
+    .container.is-lg
+      = react_component 'MentorCourses'
diff --git a/app/views/mentor/courses/new.html.slim b/app/views/mentor/courses/new.html.slim
index 28df788884e..f7218d9f91a 100644
--- a/app/views/mentor/courses/new.html.slim
+++ b/app/views/mentor/courses/new.html.slim
@@ -3,14 +3,25 @@
 header.page-header
   .container
     .page-header__inner
-      h2.page-header__title
-        = title
-      .page-header-actions
-        ul.page-header-actions__items
-          li.page-header-actions__item
-            = link_to mentor_courses_path, class: 'a-button is-md is-secondary is-block' do
-              | コース一覧
-hr.a-border
-.page-body
-  .container
-    = render 'form', course: @course
+      .page-header__title
+        | メンターページ
+
+= render 'mentor/mentor_page_tabs'
+
+main.page-main
+  header.page-main-header
+    .container
+      .page-main-header__inner
+        .page-main-header__start
+          h1.page-main-header__title
+            = title
+        .page-main-header__end
+          .page-header-actions
+            .page-header-actions__items
+              .page-header-actions__item
+                = link_to mentor_courses_path, class: 'a-button is-md is-secondary is-block is-back' do
+                  | コース一覧
+  hr.a-border
+  .page-body
+    .container.is-xl
+      = render 'form', course: @course
diff --git a/app/views/mentor/practices/index.html.slim b/app/views/mentor/practices/index.html.slim
index 6c1efd5c870..b9c49ffa1d7 100644
--- a/app/views/mentor/practices/index.html.slim
+++ b/app/views/mentor/practices/index.html.slim
@@ -1,12 +1,10 @@
-- title 'メンターページ'
+- title 'プラクティス'
 
 header.page-header
   .container
     .page-header__inner
-      h1.page-header__title = title
-      .page-header-actions
-        .page-header-actions__items
-          .page-header-actions__item
+      h1.page-header__title
+        | メンターページ
 
 = render 'mentor/mentor_page_tabs'
 
@@ -16,11 +14,15 @@ main.page-main
       .page-main-header__inner
         .page-main-header__start
           h1.page-main-header__title
-            | プラクティス
+            = title
         .page-main-header__end
           .page-header-actions
             .page-header-actions__items
               .page-header-actions__item
+                = link_to new_practice_path, class: 'a-button is-md is-secondary is-block' do
+                  i.fa-regular.fa-plus
+                  | プラクティス作成
+
   hr.a-border
   .page-body
     .container.is-lg
diff --git a/app/views/practices/edit.html.slim b/app/views/practices/edit.html.slim
index 5d1e8b0e076..80de2d2acf2 100644
--- a/app/views/practices/edit.html.slim
+++ b/app/views/practices/edit.html.slim
@@ -1,11 +1,28 @@
 - title 'プラクティス編集'
 - set_meta_tags description: 'プラクティス編集ページです。'
 
-.page-header
+header.page-header
   .container
     .page-header__inner
-      h1.page-header__title = title
-hr.a-border
-.page-body
-  .container.is-xxl
-    = render 'form', practice: @practice
+      .page-header__title
+        | メンターページ
+
+= render 'mentor/mentor_page_tabs'
+
+main.page-main
+  header.page-main-header
+    .container
+      .page-main-header__inner
+        .page-main-header__start
+          h1.page-main-header__title
+            = title
+        .page-main-header__end
+          .page-header-actions
+            .page-header-actions__items
+              .page-header-actions__item
+                = link_to mentor_practices_path, class: 'a-button is-md is-secondary is-block is-back' do
+                  | プラクティス一覧
+  hr.a-border
+  .page-body
+    .container.is-xxl
+      = render 'form', practice: @practice
diff --git a/app/views/practices/new.html.slim b/app/views/practices/new.html.slim
index 00f92f2acfb..09bde8f6ae6 100644
--- a/app/views/practices/new.html.slim
+++ b/app/views/practices/new.html.slim
@@ -4,9 +4,26 @@
 header.page-header
   .container
     .page-header__inner
-      h2.page-header__title
-        = title
-hr.a-border
-.page-body
-  .container.is-xxl
-    = render 'form', practice: @practice
+      .page-header__title
+        | メンターページ
+
+= render 'mentor/mentor_page_tabs'
+
+main.page-main
+  header.page-main-header
+    .container
+      .page-main-header__inner
+        .page-main-header__start
+          h1.page-main-header__title
+            = title
+        .page-main-header__end
+          .page-header-actions
+            .page-header-actions__items
+              .page-header-actions__item
+                = link_to mentor_practices_path, class: 'a-button is-md is-secondary is-block is-back' do
+                  | プラクティス一覧
+
+  hr.a-border
+  .page-body
+    .container.is-xxl
+      = render 'form', practice: @practice
diff --git a/app/views/users/_sns.html.slim b/app/views/users/_sns.html.slim
index 6353efe2a9e..a4a25770758 100644
--- a/app/views/users/_sns.html.slim
+++ b/app/views/users/_sns.html.slim
@@ -10,10 +10,10 @@
     li.sns-links__item
       - if user.twitter_account?
         = link_to user.twitter_url, class: 'sns-links__item-link a-button is-sm is-secondary is-icon' do
-          i.fa-brands.fa-twitter
+          i.fa-brands.fa-x-twitter
       - else
         .sns-links__item-link.a-button.is-sm.is-disabled.is-icon
-          i.fa-brands.fa-twitter
+          i.fa-brands.fa-x-twitter
     li.sns-links__item
       - if user.facebook_url?
         = link_to user.facebook_url, class: 'sns-links__item-link a-button is-sm is-secondary is-icon' do
diff --git a/app/views/users/practices/_active_practices.html.slim b/app/views/users/practices/_active_practices.html.slim
index e9233a21535..83f000ac3dc 100644
--- a/app/views/users/practices/_active_practices.html.slim
+++ b/app/views/users/practices/_active_practices.html.slim
@@ -2,7 +2,7 @@
   header.card-header.is-sm
     h2.card-header__title
       | 進行中のプラクティス
-  hr.a-border
+  hr.a-border-tint
   .card-list
     - user.active_practices.each do |practice|
       .card-list-item
diff --git a/app/views/users/practices/_completed_practices.html.slim b/app/views/users/practices/_completed_practices.html.slim
index 92fee64445b..baccc15b1f8 100644
--- a/app/views/users/practices/_completed_practices.html.slim
+++ b/app/views/users/practices/_completed_practices.html.slim
@@ -3,6 +3,6 @@
     h2.card-header__title 修了したプラクティス
     .card-header__sub-title
       = render 'users/learning_status', user: user
-  hr.a-border
+  hr.a-border-tint
   = render 'users/practices/completed_practices_progress', user: user
   = render 'users/practices/completed_practices_list', user: user, completed_learnings: completed_learnings
diff --git a/app/views/welcome/_mentor.html.slim b/app/views/welcome/_mentor.html.slim
index 35881736164..5c3366e537a 100644
--- a/app/views/welcome/_mentor.html.slim
+++ b/app/views/welcome/_mentor.html.slim
@@ -28,7 +28,7 @@ section.welcome-member.a-card(class="is-#{page}")
           - if mentor.twitter_account.present?
             li.welcome-member__sns-item
               = link_to "https://twitter.com/#{mentor.twitter_account}", class: 'welcome-member__sns-item-link' do
-                i.fa-brands.fa-twitter
+                i.fa-brands.fa-x-twitter
           - if mentor.facebook_url.present?
             li.welcome-member__sns-item
               = link_to mentor.facebook_url, class: 'welcome-member__sns-item-link' do
diff --git a/test/models/product_test.rb b/test/models/product_test.rb
index 4a314d48367..74356277c63 100644
--- a/test/models/product_test.rb
+++ b/test/models/product_test.rb
@@ -159,4 +159,44 @@ class ProductTest < ActiveSupport::TestCase
     product_id_list = Product.self_assigned_no_replied_products(mentor.id).pluck(:id)
     assert_not_includes product_id_list, no_replied_wip_product.id
   end
+
+  test '#notification_type' do
+    product = Product.create!(
+      body: 'first saved as WIP',
+      user: users(:kimura),
+      practice: practices(:practice5),
+      checker_id: nil,
+      wip: true
+    )
+
+    product.update!(body: 'product is submitted.', wip: false, published_at: Time.current)
+    assert_equal :submitted, product.notification_type
+
+    product.update!(body: 'product is saved as WIP after submission.', wip: true)
+
+    product.update!(body: 'product is updated.', wip: false, published_at: Time.current)
+    assert_equal :product_update, product.notification_type
+  end
+
+  test '#updated_after_submission?' do
+    product = Product.create!(
+      body: 'product is submitted.',
+      user: users(:kimura),
+      practice: practices(:practice5),
+      checker_id: nil
+    )
+    assert_not product.updated_after_submission?
+    product.update!(body: 'product is updated.')
+    assert product.updated_after_submission?
+
+    wip_product = Product.create!(
+      body: 'first saved as wip.',
+      user: users(:kimura),
+      practice: practices(:practice7),
+      checker_id: nil,
+      wip: true
+    )
+    wip_product.update!(body: 'product is updated.', wip: false, published_at: Time.current)
+    assert_not wip_product.updated_after_submission?
+  end
 end
diff --git a/test/system/current_user/reports_test.rb b/test/system/current_user/reports_test.rb
index f657f440ec9..ceda0e406ba 100644
--- a/test/system/current_user/reports_test.rb
+++ b/test/system/current_user/reports_test.rb
@@ -5,7 +5,7 @@
 class CurrentUser::ReportsTest < ApplicationSystemTestCase
   test 'show current_user reports when current_user is student' do
     visit_with_auth '/current_user/reports', 'hatsuno'
-    assert_equal 'ダッシュボード 自分の日報 | FBC', title
+    assert_equal '自分の日報 | FBC', title
   end
 
   test 'show reports download button when reports exist' do
diff --git a/test/system/mentor/practices_test.rb b/test/system/mentor/practices_test.rb
index 7308bf2e766..1762d7be7d2 100644
--- a/test/system/mentor/practices_test.rb
+++ b/test/system/mentor/practices_test.rb
@@ -5,7 +5,7 @@
 class Mentor::PracticesTest < ApplicationSystemTestCase
   test 'show listing practices' do
     visit_with_auth mentor_practices_path, 'mentormentaro'
-    assert_equal 'メンターページ | FBC', title
+    assert_equal 'プラクティス | FBC', title
   end
 
   test 'show practice page' do